From 8554b4755d3638db9b93014568aa93a0e9ec5379 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Fri, 15 Jul 2022 19:06:16 +0200 Subject: [PATCH 01/44] Update translation --- Android/app/release/output-metadata.json | 4 ++-- Website/src/activitys/SettingsActivity.tsx | 7 +++++-- Website/src/components/ExploreModule.tsx | 7 ++++++- Website/src/language/de.json | 7 ++++--- Website/src/language/en.json | 3 ++- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Android/app/release/output-metadata.json b/Android/app/release/output-metadata.json index e4e85ac6c..81b205396 100644 --- a/Android/app/release/output-metadata.json +++ b/Android/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 140, - "versionName": "1.4.0@alpha-3", + "versionCode": 141, + "versionName": "1.4.1", "outputFile": "app-release.apk" } ], diff --git a/Website/src/activitys/SettingsActivity.tsx b/Website/src/activitys/SettingsActivity.tsx index 689ba4db9..3905e7bb3 100644 --- a/Website/src/activitys/SettingsActivity.tsx +++ b/Website/src/activitys/SettingsActivity.tsx @@ -157,6 +157,9 @@ class SettingsActivity extends AppCompatActivity { }, { title: "Utils", + style: { + display: os.isAndroid ? "none" : "", + }, content: [ { type: "", @@ -184,7 +187,7 @@ class SettingsActivity extends AppCompatActivity { { type: "", icon: , - text: "Acknowledgements", + text: string.acknowledgements, onClick: (key, pushPage) => { pushPage({ key: "acknowledgements", @@ -195,7 +198,7 @@ class SettingsActivity extends AppCompatActivity { { type: "", icon: , - text: "Issues", + text: string.issues, onClick: (key, pushPage) => { window.open("https://github.com/DerGoogler/DG-Repo/issues", "_blank"); }, diff --git a/Website/src/components/ExploreModule.tsx b/Website/src/components/ExploreModule.tsx index e4e099bfe..dab27c04f 100644 --- a/Website/src/components/ExploreModule.tsx +++ b/Website/src/components/ExploreModule.tsx @@ -9,6 +9,7 @@ import { os } from "@Native/os"; import { isTablet } from "react-device-detect"; import { dom, link } from "googlers-tools"; import { ViewX, ViewXRenderData } from "react-onsenuix"; +import { string } from "@Strings"; interface Props { notesUrl?: string; @@ -214,7 +215,11 @@ class ExploreModule extends ViewX { {props.version} ({props.versionCode}) / {props.author} {props.description} - Last update: {this.formatDate(new Date(last_update))} + + {string.formatString(string.last_updated, { + date: this.formatDate(new Date(last_update)), + })} + diff --git a/Website/src/language/de.json b/Website/src/language/de.json index 22b249268..efe9f0652 100644 --- a/Website/src/language/de.json +++ b/Website/src/language/de.json @@ -5,14 +5,14 @@ "custom_repository": "Eigene repository", "appearance": "Aussehen", "language": "Sprache", - "dark_theme": "Dunkles Design", + "dark_theme": "Dunkles Thema", "bottom_navigation": { "text": "Navigation unten", "subtext": "Bewegt Tabs an den unteren Bildschirmrand." }, "not_supported_in_web_version": "In der Web-Version nicht unterstuetzt", "source_code": "Quellcode", - "acknowledgements": "Acknowledgements", + "acknowledgements": "Danksagungen/Lizenzen", "issues": "Issues", "module_verified": "Dieses Modul ist verifiziert und vertrauenswürdig", "download": "Herunterladen", @@ -22,5 +22,6 @@ "remove": "Entfernen", "restore": "Wiederherstellen", "module_enabled_LOG": "{module} wurde aktiviert", - "module_disabled_LOG": "{module} wurde deaktiviert" + "module_disabled_LOG": "{module} wurde deaktiviert", + "last_updated": "Letztes Update: {date}" } diff --git a/Website/src/language/en.json b/Website/src/language/en.json index 727f954cb..8de6ef6e9 100644 --- a/Website/src/language/en.json +++ b/Website/src/language/en.json @@ -22,5 +22,6 @@ "remove": "Remove", "restore": "Restore", "module_enabled_LOG": "{module} has been enabled", - "module_disabled_LOG": "{module} has been disabled" + "module_disabled_LOG": "{module} has been disabled", + "last_updated": "Last update: {date}" } From a55ac592e87053ab667ab9f961ff9aa24bd4ad07 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Fri, 15 Jul 2022 19:12:23 +0200 Subject: [PATCH 02/44] remove encoding in AcknowledgementsActivity --- Website/license.ts | 10 +- .../activitys/AcknowledgementsActivity.tsx | 14 +- Website/src/utils/licenses.json | 300 +++++++++--------- 3 files changed, 160 insertions(+), 164 deletions(-) diff --git a/Website/license.ts b/Website/license.ts index ee18d885b..a368cd76e 100644 --- a/Website/license.ts +++ b/Website/license.ts @@ -8,9 +8,9 @@ let outputArray: any = []; function getObject(name?: any, fallback?: any, options?: any) { const checkLink = (link?: any) => { if (options?.isLink) { - return Bota64.encode(link.replace("git+", "")); + return link.replace("git+", ""); } else { - return Bota64.encode(link); + return link; } }; @@ -23,9 +23,9 @@ function getObject(name?: any, fallback?: any, options?: any) { function getInnerObject(name?: any, rightName?: any) { if (typeof name == "object") { - return Bota64.encode(rightName); + return rightName; } else { - return Bota64.encode(name); + return name; } } @@ -39,7 +39,7 @@ dep.forEach((element?: any) => { name: getObject(name, "Unknown Module"), description: getObject(description, "There is no description"), // Fallback doesn't work here. - author: typeof author == "undefined" ? Bota64.encode("null") : typeof author == "object" ? Bota64.encode(author.name) : Bota64.encode(author), //getObject(getInnerObject(author, author.name), "Unknown"), + author: typeof author == "undefined" ? "null" : typeof author == "object" ? author.name : author, //getObject(getInnerObject(author, author.name), "Unknown"), version: getObject(version, "null"), license: getObject(license, "null"), repository: getObject(getInnerObject(repository, repository.url), "empty", { isLink: true }), diff --git a/Website/src/activitys/AcknowledgementsActivity.tsx b/Website/src/activitys/AcknowledgementsActivity.tsx index bd613c830..b342e2411 100644 --- a/Website/src/activitys/AcknowledgementsActivity.tsx +++ b/Website/src/activitys/AcknowledgementsActivity.tsx @@ -2,7 +2,6 @@ import Toolbar from "@Builders/ToolbarBuilder"; import { ActivityXRenderData, Card } from "react-onsenuix"; import dep from "./../utils/licenses.json"; import AppCompatActivity from "./AppCompatActivity"; -import { Bota64Class, IBota64 } from "bota64"; interface Props { popPage: any; @@ -13,14 +12,11 @@ interface States { } class AcknowledgementsActivity extends AppCompatActivity { - private b: IBota64; public constructor(props: Props | Readonly) { super(props); this.state = { libs: [], }; - - this.b = new Bota64Class(); } public componentDidMount = () => { @@ -53,15 +49,15 @@ class AcknowledgementsActivity extends AppCompatActivity { > - {this.b.decode(item.name)} - {this.b.decode(item.author)} + {item.name} + {item.author} - {this.b.decode(item.description)} + {item.description}
- {this.b.decode(item.version)} - {this.b.decode(item.license)} + {item.version} + {item.license} diff --git a/Website/src/utils/licenses.json b/Website/src/utils/licenses.json index ca6c8665b..4a3943e04 100644 --- a/Website/src/utils/licenses.json +++ b/Website/src/utils/licenses.json @@ -1,170 +1,170 @@ [ { - "name": "œ€æ≠│3µ∑│24≥┌βæ┤±3œ=", - "description": "æ€┤α┌β÷├─¢«├│β8├¿€æ↓±3š∑┌Ÿµ∑│24=", - "author": "µÆ1≥┐€α≥│┬↕⁄│250┌βα┬┐¢µ≥┌γ«=", - "version": "«×‰≤¥¶4↓", - "license": "×÷α÷", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√שβ┤œž↓1↓±•«α¿├↔7¥∫¿│/€÷4Δœ∫9§αš→←5æœ+→6│€∑«α±┼↔«±0┬┬→≈µ1┼↔÷→Æ↓≥6®∫┬├+→•→¶↑§™«9" + "name": "@emotion/react", + "description": "There is no description", + "author": "Emotion Contributors", + "version": "11.9.3", + "license": "MIT", + "repository": "https://github.com/emotion-js/emotion/tree/main/packages/react" }, - { - "name": "œ€æ≠│3µ∑│24≥┌3µ5│€æ┼", - "description": "┌3µ5│€æ┼ž‰™œ¶¶↕β│3ž├¿Æ1≥┐€α≥│├==", - "author": "│γæ≈│↔==", - "version": "«×‰≤¥¶4↓", - "license": "×÷α÷", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√שβ┤œž↓1↓±•«α¿├↔7¥∫¿│/€÷4Δœ∫9§αš→←5æœ+→6│€∑«α±┼↔«±0┬┬→≈µ1┼↔÷→Æ↓≥6®∫┬├←↓≠æΔ•∫œ≈8" + { + "name": "@emotion/styled", + "description": "styled API for emotion", + "author": "null", + "version": "11.9.3", + "license": "MIT", + "repository": "https://github.com/emotion-js/emotion/tree/main/packages/styled" }, - { - "name": "œ€∑↓©γ↕→│3↕α┌γµ∑¿¢«≥┌Ÿš≥┌€æ→┐€αα┌←==", - "description": "¶β™2±æ§┴┌βα←┐•↔≤┌Ÿš≥┌€æ→┐€αα┌→↕←±¢š↓¿¢ž├±Æ5┼žŸ§0┌βα≤¿2αβ─Ææ→", - "author": "┌€™≈│Ÿ┤∫ž⁄↑γ─¢µΔ┐Æš↔┌€™≈│Ÿ┤∫©β§≥│×4=", - "version": "«•41©┴œ=", - "license": "×÷α÷", - "repository": "↔7¥γ≠œ+→Æ∑•/Δ2‰←↔«│β┼6┼↓≠∫┌•æš┬↑⁄7¥1‰│+┬√↓0=" + { + "name": "@js.properties/properties", + "description": "JavaScript .properties parser and stringifier", + "author": "pallxk ", + "version": "0.5.4", + "license": "MIT", + "repository": "jsproperties/properties" }, - { - "name": "œ€11─¶9∑±29≤┌→1≠±¢µα┌βα┤│↔==", - "description": "×Æ™0¿¢š∑±Æ←├µ€æ↓─Æ┐≤ž€α┴│25↓ž€µ∑┌3µ→─Æš1┐€æ┼ž€™↓ž™§Æµ→↕¶¿Æ™┴┐•↕┴│21←│25α│γµ↓©├==", - "author": "×ææšž™µα±Æ0=", - "version": "§¶44©┴œ=", - "license": "×÷α÷", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√מ↑æ├•2Æ2•↑Δ∫┬↑⁄7Æ↑¶¶ž┬«æ±↔≠┴┬↓↔®§×Øœ==" + { + "name": "@mui/icons-material", + "description": "Material Design icons distributed as SVG React components.", + "author": "MUI Team", + "version": "5.8.4", + "license": "MIT", + "repository": "https://github.com/mui/material-ui.git" }, - { - "name": "œ€11─¶9≠±¢µα┌βα┤│↔==", - "description": "÷βæ┤±3œ├±29≠┌€9≤¿Æ50┌→↕0─€™0ž€α≠┌€↑α│Ææ≤┐•↕Ÿ│29γ│€÷γ┌→↕§±¢µα┌βα┤│•↕‰¿¢§∑¿24≤", - "author": "×ææšž™µα±Æ0=", - "version": "§¶44©┴┌=", - "license": "×÷α÷", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√מ↑æ├•2Æ2•↑Δ∫┬↑⁄7Æ↑¶¶ž┬«æ±↔≠┴┬↓↔®§×Øœ==" + { + "name": "@mui/material", + "description": "React components that implement Google's Material Design.", + "author": "MUI Team", + "version": "5.8.7", + "license": "MIT", + "repository": "https://github.com/mui/material-ui.git" }, - { - "name": "±¢┤∑│3«=", - "description": "÷Ÿš≥│Æα↓¿¶↕┬±¢§α¿•↕žæ™µœž€§≈─Ææ≤┐•↕β│3ž├┐€┤αž€š→│3┐↓¿¢ž├±Æ5┼ž€5≥¿€÷≤─γ«=", - "author": "×Æ™0┐•↕─±Æš→─¢§∫─Æ÷=", - "version": "«•4→§→4→", - "license": "×÷α÷", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√æ«┬Æœ⁄€Æ∑¥∑÷→ž0↔«±5┼6→→«┴±œα⁄09" + { + "name": "axios", + "description": "Promise based HTTP client for the browser and node.js", + "author": "Matt Zabriskie", + "version": "0.27.2", + "license": "MIT", + "repository": "https://github.com/axios/axios.git" }, - { - "name": "±β90±×±0", - "description": "¶¢œγ┌→↕≠└¶↕β─¢š↓┐•↕┴┐¢§0│20├¿Æ5┴│2µ∑│β┌├¥┬├=", - "author": "µ€æ→¢0┐≥│2┐≈¿¢ž├ØŸ§1┌Ÿ↕≥┌γµ↔¿€æ→¿29≥¿2↑α┌┬5┴│20+", - "version": "«¶4←©┴┌=", - "license": "×÷α÷", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√ו11┴‰8«ΔΔ•æ↓šž≥6§+¿α─→¥×•↑17‰←" + { + "name": "bota64", + "description": "It's my first custom encoding :(", + "author": "Der_Googler ", + "version": "1.0.7", + "license": "MIT", + "repository": "https://github.com/DerGoogler/Bota64" }, - { - "name": "¿29≥¿2↑α┌γ«≠┐€9≥│Ÿ«=", - "description": "×¢┼├│3┐≤žŸµ≥│2↑↓ž•8├┌2§→─¢↕0┌→↕0─€™0ž€┼├┐¢§α©├==", - "author": "µ€æ→¢0┐≥│2┐≈¿¢ž├Ø€∑∑│Æ15±β9α─€1↔¿€æ→¿29≥¿2↑α┌┬5┴│20+", - "version": "«¶4→©┴÷=", - "license": "µ1↕«©×«≤«↔==", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√ו11┴‰8«ΔΔ•æ↓šž≥6§+¿│8→Æ2Æ/÷5¶↑⁄7¥∫┤ו≈Æ4Δ•└®≈9" - }, - { - "name": "─γ§↓", - "description": "œ¶↕≈─Æž├¿β9→ž€┐α│βæ→±¢µ∑│β┌├÷3µ5│€÷├÷2┤α¿¢µ↓žŸ┐∑┐€├├¶β™2±æ§┴┌βα←┐•4=", - "author": "¶α§×ž™µα±Æ0=", - "version": "«×↔≤¥¶4←", - "license": "×÷α÷", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√×®γ≤↔←→04┼↔≈81α↔7¥γ←==" - }, - { - "name": "─γ§↓©¢↕→¿¢§α┐•1┼¿Æ¿┤┐Æ↑0", - "description": "µ€æβ±¢æ≈┐•↕←┌βæ↓¿¢œ├¿β9→ž‰∑×÷→↕3─¢µΔžŸ§α│€æ┴┐€æ┼žŸ↕≈┐Æ┐∑│γ«≤", - "author": "¶α§×ž™µα±Æ0=", - "version": "«×↔≤¥¶4←", - "license": "×÷α÷", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√×®γ≤↔←→04┼↔≈81α↔7¥γ←==" - }, - { - "name": "│€9┴±Æ↑∑└βæ┼©¢§0┌βα≤¿3«=", - "description": "÷2α≠┌€↑αž€1≥¿Ÿæ≈¿¶↕0│→↕≈│2§┤│€α6¿¶↕0─€÷├┌3µ→─Æ5γ┌→↕≥¿┬↕┤│γ┼├¶α«├±β™↓¿Æœ├┌Ÿš≥¿3š┤│¶↕1┌2α≤¿→↕0─€÷├┌2™≠¿¶↕↓└Æ50±¢├├┐¢§α¿•↕∑│┬↕0─€÷├÷βæ┤±3µ«│2§┤│€α6±¢µ∑│24├±Æ5┼ž™šα±Æ§0×β™0─¢¿α×€9┴±Æ↑∑└β™0─Æ9≤ž€1≥¿Ÿæ≈¿¶←├┐¢§αž•┐≤┌€0├┌γæ≤ž€š1─Æ↑┼š→↕┬¿Æ¿≥┌β÷├┌Ÿæ┬│€α↓─€α≤¿←==", - "author": "÷3µα¿β™≤│→↕€±Æ↑┼±¶↔8┌3µα¿β™≤│→5β±Æ↑┼±÷↕γ│Æ™∑│•5┴│20+ž•┤Δ┐Ÿµ←¥┬8≥┐3┐3©βš┤±βα↓│2¿0©β§≥│¶┼=", - "version": "«•4→©┴œ=", - "license": "×÷α÷", - "repository": "≥↓Æ↑«®4→š™÷œβ│─×→┬←4¿│8→≈æ÷↔└œ≈≈∫©®γ┬├®2Æ∫├œ∫¥β→≈└└µØ©€2Æ20•«≈←┼ž√+↑§∫/€┐±÷««9─¶↔«±12•2¶¥§├↔Δ1«9" - }, - { - "name": "│Æ™→─2æ┼©¢šα±Æ§0", - "description": "÷βæ≤¿€æ→ž‰1┤┌β≠┼│3┐≤ž€™↓ž™šα±Æ§0ž€§≥│¢↕≥│βæ≤┐Ÿ«=", - "author": "┌2α┬─¢š┤─┬1↓", - "version": "«¶4↑©┴ž=", - "license": "×÷α÷", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√×¥γ‰│¶→0∑®↑→│¿├©¿ž5±©€┬├→≤/↑3æ├⁄7©βš©‰↓┐ƶ/§│‰←" - }, - { - "name": "│Æ™0¿¢š∑±Æ←≠─Ƨ≥│γ«=", - "description": "×€™0¿¢§0ž€α┴│24├¿β9≤┐Ÿ«├±Æ5┼ž‰§×÷→↕β│3ž├┌2æ≈¿┬1Δ│3§0─Æ5γž€1┤┐€æ→─Æ™≈ž€µα┌2αγ│┬↕∑±29≤┌→4=", - "author": "│γæ≈│↔==", - "version": "«¶4↑«¶40", - "license": "œ¢↕┤±2┤α©×ž≤«↔==", - "repository": "≥↓Æ↑«®4→š™÷œβ│─×→┬←4¿│8→≈æ÷↔└œ≈≈∫©®γ┬├®2Æ2•↑Δ2¶↑ž≈2µš®┼→æ┼┼œ∫œ└¶↔¥┌┬¶®γ€1α┼•«α─×∫§┌œ§┴€÷Ø×0=" + { + "name": "googlers-tools", + "description": "My own tools / scripts that i use.", + "author": "Der_Googler ", + "version": "1.2.5", + "license": "GPL-3.0", + "repository": "https://github.com/DerGoogler/googlers-tools" + }, + { + "name": "jss", + "description": "A lib for generating Style Sheets with JavaScript.", + "author": "JSS Team", + "version": "10.9.0", + "license": "MIT", + "repository": "https://github.com/cssinjs/jss" + }, + { + "name": "jss-preset-default", + "description": "Default preset for JSS with selected plugins.", + "author": "JSS Team", + "version": "10.9.0", + "license": "MIT", + "repository": "https://github.com/cssinjs/jss" + }, + { + "name": "localized-strings", + "description": "Simple module to localize the strings of any JS based program using the same syntax used in the ReactLocalization and ReactNativeLocalization module, use 'npm run build' before publishing", + "author": "Stefano Falda (http://www.babisoft.com)", + "version": "0.2.4", + "license": "MIT", + "repository": "https://github.com/stefalda/localized-strings.git" + }, + { + "name": "marked-react", + "description": "Render Markdown as React components", + "author": "sibiraj-s", + "version": "1.1.2", + "license": "MIT", + "repository": "https://github.com/sibiraj-s/marked-react.git" + }, + { + "name": "material-icons", + "description": "Latest icon fonts and CSS for self-hosting material design icons.", + "author": "null", + "version": "1.11.4", + "license": "Apache-2.0", + "repository": "https://github.com/marella/material-icons.git" }, { - "name": "│2š√¿Æ§0©Æ™↓┌2αγ│├==", - "description": "µæ«→«⁄‰1ž€↕رβ∑α±3œ≤±¢§↓─Æ┐≤®•α├žŸ↕≥│γαβ─Æ↑≈", - "author": "÷2α≤¿Ÿšαž™§≥┌β┤1┌←==", - "version": "§•4↑©┴‰=", - "license": "×÷α÷", - "repository": "⁄⁄Æ↑¿«↕4¿§±««α√¶↔¢┴β┼6┼→¢α‰↔≈←≈0«•ž↑¶œ←↓→µ€/«┴œ9" - }, + "name": "object-assign", + "description": "ES2015 `Object.assign()` ponyfill", + "author": "Sindre Sorhus", + "version": "4.1.1", + "license": "MIT", + "repository": "sindresorhus/object-assign" + }, { - "name": "│25↓¿Æ51─œ==", - "description": "¶™µ§×⁄÷├×Æ9┬─Æ↑αž‰¿→±Æ1α┐29→─→↔βž™æšž‰§≥│¢↕≥│βæ≤┐Ÿ«=", - "author": "│γæ≈│↔==", - "version": "«┬4↑«┬4↑", - "license": "œ¢↕┤±2┤α©×ž≤«↔==", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√×↔5┬œ←→•€×βŸ™5α1↓ž1┼7/€§└─2÷↓09" - }, + "name": "onsenui", + "description": "HTML5 Mobile Framework & UI Components", + "author": "null", + "version": "2.12.1", + "license": "Apache-2.0", + "repository": "https://github.com/OnsenUI/OnsenUI" + }, { - "name": "┌βæ┤±3œ=", - "description": "÷βæ┤±3œ├─¢«├±¶↕®±¢¿┤÷2§→─¢↕0ž€↑∑±γš┤┌γ┼├¿β9→ž€š1─Æ↑┼─Æ5γžŸæ↓¿¢ž├─Æ50¿¢šβ±Æ§α┌→4=", - "author": "│γæ≈│↔==", - "version": "«×├≤«┬4←", - "license": "×÷α÷", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√×®/š©‰→•1‰•«α≈∫√×µ┤≈│Ÿ€∑↓•∑1↓žµ«¿œ9Øœ==" - }, + "name": "react", + "description": "React is a JavaScript library for building user interfaces.", + "author": "null", + "version": "18.2.0", + "license": "MIT", + "repository": "https://github.com/facebook/react.git" + }, { - "name": "┌βæ┤±3œ≠¿€æ2─Ƨα©Æµα┐€æ┴┐↔==", - "description": "µ€æ0¿Æ§0ž€µα┐βα┴¿¶↕0└¢↕αž€™≤¿•↕→¿Æ5┼¿¢ž├└Æ91┌┬↕┴│21←│25α│γœ├±Æ§┴│3š┼─Æ5γžŸµ≥ž€α0", - "author": "×Æα┴─€™α│•↕«±Æ≠0─Æ9≤│3±=", - "version": "«┬4→©┴ž=", - "license": "×÷α÷", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√×®1æ├←→├β0•÷0┌8√×µ┤≈│Ÿ€∑↓•∑↑∫┬↑‰7Æ↑§©+2æ┴→/Δ∫┬↑≈׵ל==" - }, + "name": "react-device-detect", + "description": "Detect device type and render your component according to it", + "author": "Michael Laktionov", + "version": "2.2.2", + "license": "MIT", + "repository": "https://github.com/duskload/react-device-detect/" + }, { - "name": "┌βæ┤±3œ≠¿€9≠", - "description": "÷βæ┤±3œ├┌€™┴─2™γ¿¶↕β│3ž├┐29→─2α≤¿→↕3─¢µΔžŸµΔ¿¶↕‰×00≤", - "author": "│γæ≈│↔==", - "version": "«×├≤«┬4←", - "license": "×÷α÷", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√×®/š©‰→•1‰•«α≈∫√×µ┤≈│Ÿ€∑↓•∑1↓žµ«¿œ9Øœ==" - }, + "name": "react-dom", + "description": "React package for working with the DOM.", + "author": "null", + "version": "18.2.0", + "license": "MIT", + "repository": "https://github.com/facebook/react.git" + }, { - "name": "┌βæ┤±3œ≠│25↓¿Æ51─œ==", - "description": "×25↓¿Æ4├æ÷┼├©¶↕¶¿Æ™┴┐•↕⁄│21←│25α│γµ↓ž€¿≥┌┬↕ž└Æš→─Æœ├œ29→¿€92±¶9œ─€9≤¿÷┐┤┌•↕↕┌Ÿ↕↓žŸ┐∑┐€├├×Æ™0¿¢š∑±Æ←├µ€æ↓─Æ┐≤ž€™≤¿•↕∑×1«├æ÷┼├±29≠┌€9≤¿Æ50┌←==", - "author": "×25↓¿Æ4├æ÷┼├æ€æ┤│¶↔8┐€æ┤│÷↕≠│25┤±2‰≤─Æ8+", - "version": "«¶4↑«┬4←", - "license": "œ¢↕┤±2┤α©×ž≤«↔==", - "repository": "≥↓Æ↑«®4→š™÷œβ│─×→┬←4¿│8→≈æ÷↔└œ≈≈∫©®γ┬├®2¥┘0•≈6√↑↕│Ÿβ±─┼←Æ4┼««←┤┼5↑←8¿©8→×↔=" - }, + "name": "react-onsenui", + "description": "Onsen UI - React Components for Hybrid Cordova/PhoneGap Apps with Material Design and iOS UI components", + "author": "Onsen UI Team ", + "version": "1.12.0", + "license": "Apache-2.0", + "repository": "https://github.com/OnsenUI/OnsenUI.git" + }, { - "name": "┌βæ┤±3œ≠│25↓¿Æ51─¢├=", - "description": "×25↓¿Æ4├æ÷┼├©¶↕¶¿Æ™┴┐•↕⁄│21←│25α│γµ↓ž€¿≥┌┬↕ž└Æš→─Æœ├œ29→¿€92±¶9œ─€9≤¿÷┐┤┌•↕↕┌Ÿ↕↓žŸ┐∑┐€├├×Æ™0¿¢š∑±Æ←├µ€æ↓─Æ┐≤ž€™≤¿•↕∑×1«├æ÷┼├±29≠┌€9≤¿Æ50┌←==", - "author": "µ€æ→¢0┐≥│2┐≈¿¢ž├Ø€∑∑│Æ15±β9α─€1↔¿€æ→¿29≥¿2↑α┌┬5┴│20+", - "version": "«¶4←©┴÷=", - "license": "│γæ≈│↔==", - "repository": "↔¢┬1æœ14√↓─∑┼┴→↓↔®®1≤µ⁄€Δ€¶↑«α≠├√ו11┴‰8«ΔΔ•æ↓šž≥6§+┬├+→•→¶↑§Ÿæ├↔┴ž1┼7/€§æ±↔↑↑←9" - }, + "name": "react-onsenuix", + "description": "Onsen UI - React Components for Hybrid Cordova/PhoneGap Apps with Material Design and iOS UI components", + "author": "Der_Googler ", + "version": "1.0.5", + "license": "null", + "repository": "https://github.com/DerGoogler/react-onsenuix" + }, { - "name": "┌βæ┤±3œ≠┌3α≤┐€™4©Æ┤∑¿2┤≈─Æ┐Δ┐€æ→", - "description": "┌3α≤┐€™4ž€┤∑¿2┤≈─Æ┐Δ┐€α≤¿→↕┴│21←│25α│γœ├¿β9→žŸšα±Æ§0žŸ┐∑┐€├├┌Ÿš∑┌21√┌→↕≥┌┬↕Δ─Æ┐Δ│€αγ─Ÿµ√┌→↕┤┌3œ├┐¢§∑│β┌├─Æ5≈─Æ5αžŸ§0└Æ↑α┌←==", - "author": "œ29≤│3ž├¶€™↓┐€α≤¿3«=", - "version": "«×÷≤§¶4←", - "license": "×÷α÷", - "repository": "≥↓Æ↑«®4→š™÷œβ│─×→┬←4¿│8→≈æ÷↔└œ≈≈∫©®γ┬├®2Æ∑®/50┌0«•ž↑≤↕×€§×•↑↑↓5├ž®+↑2••≈≈↑€/æ→œ←≥6§+┬├+→•→¶↑§Ÿæ├⁄⁄─↑┬ו≈ž┴¶∑60±µ≥1┌┼│œ⁄€‰7┼œ∫œ└¶∫§┌œ§┴€÷Ø×0=" + "name": "react-syntax-highlighter", + "description": "syntax highlighting component for react with prismjs or highlightjs ast using inline styles", + "author": "Conor Hastings", + "version": "15.5.0", + "license": "MIT", + "repository": "https://github.com/react-syntax-highlighter/react-syntax-highlighter.git" } ] From 94fd94b1ea8d033ffe85e25ac9a7a1f6cf297ae4 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Fri, 15 Jul 2022 19:48:09 +0200 Subject: [PATCH 03/44] Bring back DAPI --- Website/bun.lockb | Bin 204301 -> 204604 bytes Website/package.json | 1 + .../activitys/AcknowledgementsActivity.tsx | 3 +- Website/src/activitys/ViewModuleActivity.tsx | 2 +- Website/src/components/HighlightMarkdown.tsx | 33 +++++++++- Website/src/components/dapi/Anchor.tsx | 44 +++++++++++++ Website/src/components/dapi/DiscordWidget.tsx | 37 +++++++++++ Website/src/components/dapi/Video.tsx | 61 ++++++++++++++++++ Website/src/components/icons/Checkmark.tsx | 39 +++++++++++ Website/src/components/icons/Dangermark.tsx | 39 +++++++++++ Website/src/utils/licenses.json | 8 +++ 11 files changed, 263 insertions(+), 4 deletions(-) create mode 100644 Website/src/components/dapi/Anchor.tsx create mode 100644 Website/src/components/dapi/DiscordWidget.tsx create mode 100644 Website/src/components/dapi/Video.tsx create mode 100644 Website/src/components/icons/Checkmark.tsx create mode 100644 Website/src/components/icons/Dangermark.tsx diff --git a/Website/bun.lockb b/Website/bun.lockb index 463a6446447822fab092cafa6211a7db42decaee..d09cd5b133741d52a6a065569b8943f60e5f2938 100755 GIT binary patch delta 60371 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ⓈQv&mE2gKbDxWO#A9niWP;DW$SrcF1% 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 Jb6cB{`Y*G~ojw2n delta 60170 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
?ONryZGj`QGnSaA-<_ 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 NwpuGPcWGYZeglh42k8I+ diff --git a/Website/package.json b/Website/package.json index 2b33b6fd2..54b0d90b3 100644 --- a/Website/package.json +++ b/Website/package.json @@ -25,6 +25,7 @@ "jss": "^10.9.0", "jss-preset-default": "^10.9.0", "localized-strings": "^0.2.4", + "markdown-to-jsx": "^7.1.7", "marked-react": "^1.1.2", "material-icons": "^1.10.8", "object-assign": "^4.1.1", diff --git a/Website/src/activitys/AcknowledgementsActivity.tsx b/Website/src/activitys/AcknowledgementsActivity.tsx index b342e2411..1d8776b05 100644 --- a/Website/src/activitys/AcknowledgementsActivity.tsx +++ b/Website/src/activitys/AcknowledgementsActivity.tsx @@ -1,4 +1,5 @@ import Toolbar from "@Builders/ToolbarBuilder"; +import { string } from "@Strings"; import { ActivityXRenderData, Card } from "react-onsenuix"; import dep from "./../utils/licenses.json"; import AppCompatActivity from "./AppCompatActivity"; @@ -26,7 +27,7 @@ class AcknowledgementsActivity extends AppCompatActivity { public onCreateToolbar(): Toolbar.Props { return { - title: "Acknowledgements", + title: string.acknowledgements, onBackButton: this.props.popPage, }; } diff --git a/Website/src/activitys/ViewModuleActivity.tsx b/Website/src/activitys/ViewModuleActivity.tsx index ab59d71df..d8d443c6d 100644 --- a/Website/src/activitys/ViewModuleActivity.tsx +++ b/Website/src/activitys/ViewModuleActivity.tsx @@ -44,7 +44,7 @@ class ViewModuleActivity extends AppCompatActivity { .catch((error) => { if (error.response.status === 404) { this.setState({ - notes: `# 404: Not Found\n\n The author doesn't have created or uploaded an \`README.md\`, please try again later.\n\n\n## About Readme's\n\n- ❌ readme.md\n- ✅ README.md`, + notes: `# 404: Not Found\n\n The author doesn't have created or uploaded an \`README.md\`, please try again later.\n\n\n## About Readme's\n\n- readme.md\n- README.md`, }); } }) diff --git a/Website/src/components/HighlightMarkdown.tsx b/Website/src/components/HighlightMarkdown.tsx index ac77e649d..ffc8104bf 100644 --- a/Website/src/components/HighlightMarkdown.tsx +++ b/Website/src/components/HighlightMarkdown.tsx @@ -1,7 +1,12 @@ -import Markdown from "marked-react"; +import Markdown from "markdown-to-jsx"; import { LightAsync as SyntaxHighlighter } from "react-syntax-highlighter"; import { github } from "react-syntax-highlighter/dist/cjs/styles/hljs"; import { ViewX, ViewXRenderData } from "react-onsenuix"; +import Anchor from "./dapi/Anchor"; +import Video from "./dapi/Video"; +import DiscordWidget from "./dapi/DiscordWidget"; +import Checkmark from "./icons/Checkmark"; +import Dangermark from "./icons/Dangermark"; interface IProps { children: string; @@ -21,7 +26,31 @@ class HighlightedMarkdown extends ViewX { }, }; - return ; + return ( + + ); } private codeblock({ diff --git a/Website/src/components/dapi/Anchor.tsx b/Website/src/components/dapi/Anchor.tsx new file mode 100644 index 000000000..69d2abf37 --- /dev/null +++ b/Website/src/components/dapi/Anchor.tsx @@ -0,0 +1,44 @@ +import SharedPreferences from "@Native/SharedPreferences"; +import { os } from "@Native/os"; +import { ViewX, ViewXRenderData } from "react-onsenuix"; +import { util } from "googlers-tools"; + +interface AnchorProps { + download?: any; + href: string; + hrefLang?: string | undefined; + media?: string | undefined; + ping?: string | undefined; + rel?: string | undefined; + target?: string | undefined; + type?: string | undefined; + children: React.ReactNode | undefined; +} + +class Anchor extends ViewX { + public createView(data: ViewXRenderData): JSX.Element { + const { download, href, hrefLang, media, ping, rel, target, type, children } = data.p; + return ( + <> + { + os.open(href); + }} + style={{ cursor: "pointer", color: SharedPreferences.getBoolean("enableDarkmode_switch", false) ? "#bb86fc" : "#4a148c" }} + > + {children} + + + ); + } +} + +export default Anchor; diff --git a/Website/src/components/dapi/DiscordWidget.tsx b/Website/src/components/dapi/DiscordWidget.tsx new file mode 100644 index 000000000..40fb89aef --- /dev/null +++ b/Website/src/components/dapi/DiscordWidget.tsx @@ -0,0 +1,37 @@ +import { util } from "googlers-tools"; +import { ViewX, ViewXRenderData } from "react-onsenuix"; + +type Theme = "light" | "dark"; + +interface DiscordWidgetProps { + token?: string | number | undefined; + width?: string | number | undefined; + height?: string | number | undefined; + theme?: Theme | undefined; +} + +class DiscordWidget extends ViewX { + public createView(data: ViewXRenderData): JSX.Element { + const { token, width, height, theme } = data.p; + return ( + <> + + + ); + } +} + +export default DiscordWidget; diff --git a/Website/src/components/dapi/Video.tsx b/Website/src/components/dapi/Video.tsx new file mode 100644 index 000000000..13eefc660 --- /dev/null +++ b/Website/src/components/dapi/Video.tsx @@ -0,0 +1,61 @@ +import { util } from "googlers-tools"; +import { CSSProperties } from "react"; +import { isDesktop } from "react-device-detect"; +import { ViewX, ViewXRenderData } from "react-onsenuix"; + +declare type Type = `video/${string}`; + +interface VideoProps { + src: string; + type: Type; + controls?: boolean; + poster?: string; + noSupportText?: string; + style?: CSSProperties | string | undefined; +} + +interface State {} + +type E = HTMLVideoElement | HTMLIFrameElement; + +class Video extends ViewX { + public createView(data: ViewXRenderData): JSX.Element { + const { src, type, controls, noSupportText, style, poster } = data.p; + const Style = { + width: "100%", + height: isDesktop ? "445px" : "181.500px", + padding: "0px", + margin: "0px", + }; + + switch (type) { + case "video/youtube": + return ( + <> + + + ); + + default: + return ( + <> + + + ); + } + } +} + +export default Video; diff --git a/Website/src/components/icons/Checkmark.tsx b/Website/src/components/icons/Checkmark.tsx new file mode 100644 index 000000000..0623142e1 --- /dev/null +++ b/Website/src/components/icons/Checkmark.tsx @@ -0,0 +1,39 @@ +import { SVGAttributes } from "react"; +import { ViewX } from "react-onsenuix"; + +interface Props { + size: string | int; + color: `#${string}`; + className?: SVGAttributes; +} + +class Checkmark extends ViewX { + public static defaultProps: Props; + + public createView() { + const { color, size, className } = this.props; + return ( + + ); + } +} + +Checkmark.defaultProps = { + size: "14", + color: "#1a7f37", +}; + +export default Checkmark; diff --git a/Website/src/components/icons/Dangermark.tsx b/Website/src/components/icons/Dangermark.tsx new file mode 100644 index 000000000..130cd872c --- /dev/null +++ b/Website/src/components/icons/Dangermark.tsx @@ -0,0 +1,39 @@ +import { SVGAttributes } from "react"; +import { ViewX } from "react-onsenuix"; + +interface Props { + size: string | int; + color: `#${string}`; + className?: SVGAttributes; +} + +class Dankermark extends ViewX { + public static defaultProps: Props; + + public createView() { + const { color, size, className } = this.props; + return ( + + ); + } +} + +Dankermark.defaultProps = { + size: "14", + color: "#cf222e", +}; + +export default Dankermark; diff --git a/Website/src/utils/licenses.json b/Website/src/utils/licenses.json index 4a3943e04..47dffb04b 100644 --- a/Website/src/utils/licenses.json +++ b/Website/src/utils/licenses.json @@ -87,6 +87,14 @@ "license": "MIT", "repository": "https://github.com/stefalda/localized-strings.git" }, + { + "name": "markdown-to-jsx", + "description": "Convert markdown to JSX with ease for React and React-like projects. Super lightweight and highly configurable.", + "author": "Evan Jacobs ", + "version": "7.1.7", + "license": "MIT", + "repository": "probablyup/markdown-to-jsx" + }, { "name": "marked-react", "description": "Render Markdown as React components", From a3a2a6491535850def46be34aa5d7cd591171b0c Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Fri, 15 Jul 2022 20:00:21 +0200 Subject: [PATCH 04/44] Fix marks style an position --- Website/src/components/HighlightMarkdown.tsx | 4 ++ Website/src/components/icons/Checkmark.tsx | 3 ++ Website/src/components/icons/Dangermark.tsx | 3 ++ Website/src/components/icons/Warnmark.tsx | 43 ++++++++++++++++++++ 4 files changed, 53 insertions(+) create mode 100644 Website/src/components/icons/Warnmark.tsx diff --git a/Website/src/components/HighlightMarkdown.tsx b/Website/src/components/HighlightMarkdown.tsx index ffc8104bf..893796f75 100644 --- a/Website/src/components/HighlightMarkdown.tsx +++ b/Website/src/components/HighlightMarkdown.tsx @@ -7,6 +7,7 @@ import Video from "./dapi/Video"; import DiscordWidget from "./dapi/DiscordWidget"; import Checkmark from "./icons/Checkmark"; import Dangermark from "./icons/Dangermark"; +import Warnmark from "./icons/Warnmark"; interface IProps { children: string; @@ -46,6 +47,9 @@ class HighlightedMarkdown extends ViewX { dangermark: { component: Dangermark, }, + warnmark: { + component: Warnmark, + }, }, }} children={data.p.children} diff --git a/Website/src/components/icons/Checkmark.tsx b/Website/src/components/icons/Checkmark.tsx index 0623142e1..0663c8d38 100644 --- a/Website/src/components/icons/Checkmark.tsx +++ b/Website/src/components/icons/Checkmark.tsx @@ -20,6 +20,9 @@ class Checkmark extends ViewX { height={size} aria-hidden="true" className={"octicon octicon-check color-fg-success ml-n3 v-align-middle " + className} + style={{ + verticalAlign: "baseline", + }} > { height={size} aria-hidden="true" className={"octicon octicon-x color-fg-danger ml-n3 v-align-middle " + className} + style={{ + verticalAlign: "baseline", + }} > ; +} + +class Warnmark extends ViewX { + public static defaultProps: Props; + + public createView() { + const { color, size, className } = this.props; + return ( + + ); + } +} + +Warnmark.defaultProps = { + size: "14", + color: "#d29922", +}; + +export default Warnmark; From 90dfca2bbd7e3650172b9780b8fdd67e7d8e03ca Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Fri, 15 Jul 2022 20:52:50 +0200 Subject: [PATCH 05/44] . --- Website/bun.lockb | Bin 204604 -> 204860 bytes Website/package.json | 1 + Website/src/components/ErrorBoundary.tsx | 25 +++-- Website/src/components/HighlightMarkdown.tsx | 96 ++++++++----------- Website/src/utils/licenses.json | 8 ++ 5 files changed, 60 insertions(+), 70 deletions(-) diff --git a/Website/bun.lockb b/Website/bun.lockb index d09cd5b133741d52a6a065569b8943f60e5f2938..e7969b97bbf6b51e93cf327d52ea50fab4d96146 100755 GIT binary patch delta 45614 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 diff --git a/Website/package.json b/Website/package.json index 54b0d90b3..798ee3c4a 100644 --- a/Website/package.json +++ b/Website/package.json @@ -22,6 +22,7 @@ "axios": "^0.27.2", "bota64": "^1.0.7", "googlers-tools": "^1.2.5", + "highlight.js": "^11.6.0", "jss": "^10.9.0", "jss-preset-default": "^10.9.0", "localized-strings": "^0.2.4", diff --git a/Website/src/components/ErrorBoundary.tsx b/Website/src/components/ErrorBoundary.tsx index 0e2e5f698..056f7fa47 100644 --- a/Website/src/components/ErrorBoundary.tsx +++ b/Website/src/components/ErrorBoundary.tsx @@ -1,6 +1,6 @@ import Log from "@Native/Log"; import { ErrorInfo, ReactNode } from "react"; -import { ViewX, ViewXRenderData } from "react-onsenuix"; +import { Page, Toolbar, ViewX, ViewXRenderData } from "react-onsenuix"; interface Props { children: ReactNode; @@ -10,7 +10,7 @@ interface Props { interface States { hasError: boolean; error: Error | string | null; - errorInfo: ErrorInfo | string | null; + errorInfo: ErrorInfo | null; } class ErrorBoundary extends ViewX { @@ -50,18 +50,15 @@ class ErrorBoundary extends ViewX { public createView(data: ViewXRenderData): JSX.Element { if (data.s.hasError) { return ( -
-

Something went wrong.

-
- {data.s.hasError && data.s.hasError.toString()} -
- - { - // @ts-ignore - data.s.errorInfo?.componentStack - } -
-
+ ( + + Something went wrong + + )} + > +

{data.s.errorInfo?.componentStack}

+ ); } return data.p.children as any; diff --git a/Website/src/components/HighlightMarkdown.tsx b/Website/src/components/HighlightMarkdown.tsx index 893796f75..b7e2d22ce 100644 --- a/Website/src/components/HighlightMarkdown.tsx +++ b/Website/src/components/HighlightMarkdown.tsx @@ -1,6 +1,5 @@ import Markdown from "markdown-to-jsx"; -import { LightAsync as SyntaxHighlighter } from "react-syntax-highlighter"; -import { github } from "react-syntax-highlighter/dist/cjs/styles/hljs"; +import { createRef, RefObject } from "react"; import { ViewX, ViewXRenderData } from "react-onsenuix"; import Anchor from "./dapi/Anchor"; import Video from "./dapi/Video"; @@ -8,74 +7,59 @@ import DiscordWidget from "./dapi/DiscordWidget"; import Checkmark from "./icons/Checkmark"; import Dangermark from "./icons/Dangermark"; import Warnmark from "./icons/Warnmark"; +import hljs from "highlight.js"; +import { dom } from "googlers-tools"; interface IProps { children: string; } class HighlightedMarkdown extends ViewX { + private ref: RefObject; public constructor(props: any) { super(props); + + this.ref = createRef(); } - public componentDidMount() {} + public componentDidMount() { + dom.findBy(this.ref, (ref: HTMLDivElement) => { + ref.querySelectorAll("pre code").forEach((block: any) => { + hljs.highlightBlock(block); + }); + }); + } public createView(data: ViewXRenderData): JSX.Element { - const renderer = { - code(snippet: any, lang: any) { - return ; - }, - }; - return ( - + - ); - } - - private codeblock({ - code, - lang, - className, - children, - ...props - }: { - code: any; - lang: any; - className: string | undefined; - children: React.ReactNode & React.ReactNode[]; - }) { - const match = /language-(\w+)/.exec(className || ""); - return !lang && match ? ( - - ) : ( - - {children} - + }} + children={data.p.children} + /> + ); } } diff --git a/Website/src/utils/licenses.json b/Website/src/utils/licenses.json index 47dffb04b..c56d5e912 100644 --- a/Website/src/utils/licenses.json +++ b/Website/src/utils/licenses.json @@ -63,6 +63,14 @@ "license": "GPL-3.0", "repository": "https://github.com/DerGoogler/googlers-tools" }, + { + "name": "highlight.js", + "description": "Syntax highlighting with language autodetection.", + "author": "Josh Goebel ", + "version": "11.6.0", + "license": "BSD-3-Clause", + "repository": "git://github.com/highlightjs/highlight.js.git" + }, { "name": "jss", "description": "A lib for generating Style Sheets with JavaScript.", From 2e8cc3b13c8fdfd432c2494bc9d5b5ca9827700b Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sat, 16 Jul 2022 13:35:30 +0200 Subject: [PATCH 06/44] ViewModule and more has been updated --- Website/src/activitys/AppCompatActivity.tsx | 4 +- Website/src/activitys/MainApplication.tsx | 58 +++++++++++++++++-- Website/src/activitys/ViewModuleActivity.tsx | 6 +- .../fragments/ExploreModuleFragment.tsx | 4 +- Website/src/builders/ToolbarBuilder.tsx | 5 +- Website/src/components/HighlightMarkdown.tsx | 1 + 6 files changed, 63 insertions(+), 15 deletions(-) diff --git a/Website/src/activitys/AppCompatActivity.tsx b/Website/src/activitys/AppCompatActivity.tsx index 72c7e7f4a..0c5126a1b 100644 --- a/Website/src/activitys/AppCompatActivity.tsx +++ b/Website/src/activitys/AppCompatActivity.tsx @@ -88,9 +88,7 @@ class AppCompatActivity

extends ActivityX { return ; }} > - - - + diff --git a/Website/src/activitys/MainApplication.tsx b/Website/src/activitys/MainApplication.tsx index 13ab9b13a..009e51e69 100644 --- a/Website/src/activitys/MainApplication.tsx +++ b/Website/src/activitys/MainApplication.tsx @@ -4,8 +4,9 @@ import { os } from "@Native/os"; import SharedPreferences from "@Native/SharedPreferences"; import Toast from "@Native/Toast"; import { string } from "@Strings"; +import { createRef, RefObject } from "react"; import { Tab, Tabbar, TabbarRenderTab, ToolbarButton } from "react-onsenui"; -import { ActivityXRenderData } from "react-onsenuix"; +import { ActivityXRenderData, Page } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; import DeviceModuleFragment from "./fragments/DeviceModuleFragment"; import ExploreModuleFragment from "./fragments/ExploreModuleFragment"; @@ -29,18 +30,42 @@ interface Props { pushPage: any; } -class MainApplication extends AppCompatActivity { +interface States { + isHeaderTitleVisible: boolean; + isHeaderBGVisible: boolean; +} + +class MainApplication extends AppCompatActivity { + private headerTitleRef: RefObject; + private headerTtileObserver: IntersectionObserver; + private headerBgObserver: IntersectionObserver; + private headerBgRef: RefObject; + public constructor(props: Props | Readonly) { super(props); - this.state = {}; + this.state = { + isHeaderTitleVisible: false, + isHeaderBGVisible: false, + }; this.openSettings = this.openSettings.bind(this); this.renderTabs = this.renderTabs.bind(this); + + this.headerTitleRef = createRef(); + this.headerBgRef = createRef(); + + this.headerTtileObserver = new IntersectionObserver(([entry]) => { + this.setState({ isHeaderTitleVisible: entry.isIntersecting }); + }); + this.headerBgObserver = new IntersectionObserver(([entry]) => { + this.setState({ isHeaderBGVisible: entry.isIntersecting }); + }); } public onCreateToolbar(): Toolbar.Props { return { - title: "Magisk Module Repo Loader", + title: !this.state.isHeaderTitleVisible ? "Magisk Module Repo Loader" : "", + modifier: this.state.isHeaderBGVisible ? "noshadow" : "", addToolbarButtonPosition: "right", addToolbarButton: ( @@ -52,6 +77,13 @@ class MainApplication extends AppCompatActivity { public componentDidMount() { super.componentDidMount; + this.headerTtileObserver.observe(this.headerTitleRef.current as any); + this.headerBgObserver.observe(this.headerBgRef.current as any); + } + + public componentWillUnmount() { + this.headerTtileObserver.disconnect(); + this.headerBgObserver.disconnect(); } public componentDidUpdate() { @@ -88,7 +120,23 @@ class MainApplication extends AppCompatActivity { renderTabs={this.renderTabs} /> ) : ( - + <> +

+ Magisk Module Repo Loader +
+ + )} ); diff --git a/Website/src/activitys/ViewModuleActivity.tsx b/Website/src/activitys/ViewModuleActivity.tsx index d8d443c6d..06bab6429 100644 --- a/Website/src/activitys/ViewModuleActivity.tsx +++ b/Website/src/activitys/ViewModuleActivity.tsx @@ -62,7 +62,7 @@ class ViewModuleActivity extends AppCompatActivity { <> {(minMagisk || minApi || maxApi || needRamdisk || changeBoot) != (null || undefined) ? (
- +
@@ -104,13 +104,13 @@ class ViewModuleActivity extends AppCompatActivity { } })() } - + -
{ } return ( - + <>
{ )}
- + ); }; diff --git a/Website/src/builders/ToolbarBuilder.tsx b/Website/src/builders/ToolbarBuilder.tsx index e6e0757c9..d24c99729 100644 --- a/Website/src/builders/ToolbarBuilder.tsx +++ b/Website/src/builders/ToolbarBuilder.tsx @@ -15,13 +15,14 @@ namespace Toolbar { onBackButton?: boolean; addToolbarButton?: React.ReactNode; addToolbarButtonPosition?: "left" | "right"; + modifier?: string; } export class Builder extends Component { public render() { - const { title, onBackButton, addToolbarButton, addToolbarButtonPosition } = this.props; + const { title, onBackButton, addToolbarButton, addToolbarButtonPosition, modifier } = this.props; return ( - +
{/** // @ts-ignore */} diff --git a/Website/src/components/HighlightMarkdown.tsx b/Website/src/components/HighlightMarkdown.tsx index b7e2d22ce..80b564b3a 100644 --- a/Website/src/components/HighlightMarkdown.tsx +++ b/Website/src/components/HighlightMarkdown.tsx @@ -34,6 +34,7 @@ class HighlightedMarkdown extends ViewX { return (
Date: Sat, 16 Jul 2022 13:44:09 +0200 Subject: [PATCH 07/44] Use TabWrapper for tabs --- Website/src/activitys/MainApplication.tsx | 7 ++++--- .../fragments/DeviceModuleFragment.tsx | 4 ++-- Website/src/components/TabWrapper.tsx | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 Website/src/components/TabWrapper.tsx diff --git a/Website/src/activitys/MainApplication.tsx b/Website/src/activitys/MainApplication.tsx index 009e51e69..ee90031b1 100644 --- a/Website/src/activitys/MainApplication.tsx +++ b/Website/src/activitys/MainApplication.tsx @@ -1,4 +1,5 @@ import Toolbar from "@Builders/ToolbarBuilder"; +import { TabWrapper } from "@Components/TabWrapper"; import { SettingsRounded } from "@mui/icons-material"; import { os } from "@Native/os"; import SharedPreferences from "@Native/SharedPreferences"; @@ -100,11 +101,11 @@ class MainApplication extends AppCompatActivity { private renderTabs(): TabbarRenderTab[] { return [ { - content: , + content: } />, tab: , }, { - content: , + content: } />, tab: , }, ]; @@ -127,7 +128,7 @@ class MainApplication extends AppCompatActivity { padding: "50px", paddingTop: "6px", textAlign: "center", - backgroundColor: SharedPreferences.getBoolean("enableDarkmode_switch", false) ? "rgb(31, 31, 31)" : "#4a148c" , + backgroundColor: SharedPreferences.getBoolean("enableDarkmode_switch", false) ? "rgb(31, 31, 31)" : "#4a148c", color: "white", fontSize: "30px", boxShadow: "rgba(0, 0, 0, 0.3) 0px 1px 5px", diff --git a/Website/src/activitys/fragments/DeviceModuleFragment.tsx b/Website/src/activitys/fragments/DeviceModuleFragment.tsx index 6779bd35b..c6d09120c 100644 --- a/Website/src/activitys/fragments/DeviceModuleFragment.tsx +++ b/Website/src/activitys/fragments/DeviceModuleFragment.tsx @@ -29,7 +29,7 @@ class DeviceModuleFragment extends Component { return ; }); return ( - + <>
{ > {moduels}
- + ); }; } diff --git a/Website/src/components/TabWrapper.tsx b/Website/src/components/TabWrapper.tsx new file mode 100644 index 000000000..f75be80b0 --- /dev/null +++ b/Website/src/components/TabWrapper.tsx @@ -0,0 +1,17 @@ +import { Page, ViewX, ViewXRenderData } from "react-onsenuix"; + +interface Props { + element: JSX.Element; +} + +class TabWrapper extends ViewX { + public constructor(props: Props | Readonly) { + super(props); + } + + public createView(data: ViewXRenderData): JSX.Element { + return {data.p.element}; + } +} + +export { TabWrapper }; From 991fdb8a2aa522d2dd0cff18820b71cc5f1101c5 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sat, 16 Jul 2022 22:10:58 +0200 Subject: [PATCH 08/44] Initial support for mutiple repositories --- Website/src/activitys/RepoActivity.tsx | 195 ++++++++++++++++++ Website/src/activitys/SettingsActivity.tsx | 42 +--- .../fragments/ExploreModuleFragment.tsx | 60 ++++-- Website/src/builders/ListViewBuilder.tsx | 1 + Website/src/native/SharedPreferences.ts | 6 +- Website/src/styles/addtional.scss | 58 ++++++ Website/src/styles/light_theme.ts | 6 +- Website/src/typings/declaration.d.ts | 2 + 8 files changed, 312 insertions(+), 58 deletions(-) create mode 100644 Website/src/activitys/RepoActivity.tsx diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx new file mode 100644 index 000000000..9df78258d --- /dev/null +++ b/Website/src/activitys/RepoActivity.tsx @@ -0,0 +1,195 @@ +import { ActivityXRenderData, List, Toolbar } from "react-onsenuix"; +import AppCompatActivity from "./AppCompatActivity"; +import { string } from "@Strings"; +import SharedPreferences, { ISharedPreferences } from "@Native/SharedPreferences"; +import { Add, AddCircle, DeleteRounded, Remove } from "@mui/icons-material"; +import { link } from "googlers-tools"; +import ons from "onsenui"; +import Icon from "@Components/Icon"; +import { AlertDialog, Input } from "react-onsenui"; +import Toast from "@Native/Toast"; +import Constants from "@Native/Constants"; + +interface Props { + pushPage: any; + popPage: any; +} + +interface States { + repos: Array; + alertDialogShown: boolean; + repoName: string; + repoLink: string; +} + +class RepoActivity extends AppCompatActivity { + private pref: ISharedPreferences; + + public constructor(props: Props | Readonly) { + super(props); + + this.pref = new SharedPreferences(); + + this.state = { + repos: JSON.parse(this.pref.getString("repos", "[]")), + alertDialogShown: false, + repoName: "", + repoLink: "", + }; + + this.addRepo = this.addRepo.bind(this); + this.removeRepo = this.removeRepo.bind(this); + this.onCreateToolbar = this.onCreateToolbar.bind(this); + + this.hideAlertDialog = this.hideAlertDialog.bind(this); + this.showAlertDialog = this.showAlertDialog.bind(this); + this.handleRepoLinkChange = this.handleRepoLinkChange.bind(this); + this.handleRepoNameChange = this.handleRepoNameChange.bind(this); + } + + public static getReadOnlyRepos(): Array { + return [ + { + name: "Magisk Modules Alternative Repository", + link: "https://raw.githubusercontent.com/Magisk-Modules-Alt-Repo/json/main/modules.json", + readonly: true, + }, + ]; + } + + private getRepos(): Array { + return JSON.parse(this.pref.getString("repos", "[]")); + } + + private removeRepo(item: any) { + let array = this.getRepos(); + + var index = array.indexOf(item); + array.splice(index, 1); + + this.pref.setString("repos", JSON.stringify(array)); + this.setState({ repos: this.getRepos() }); + } + + private addRepo() { + const { repoName, repoLink } = this.state; + + if (repoName != "") { + if (link.validURL(repoLink)) { + this.pref.setString( + "repos", + JSON.stringify([ + ...JSON.parse(this.pref.getString("repos", "[]")), + { + name: repoName, + link: repoLink, + readonly: false, + }, + ]) + ); + this.setState({ repos: this.getRepos(), repoName: "", repoLink: "" }); + this.hideAlertDialog(); + } else { + Toast.makeText("The given link isn't valid.", Toast.LENGTH_SHORT).show(); + } + } else { + Toast.makeText("Can't add nameless repo.", Toast.LENGTH_SHORT).show(); + } + } + + public onCreateToolbar() { + return { + title: "Repos", + onBackButton: this.props.popPage, + addToolbarButtonPosition: "right", + addToolbarButton: ( + + + + + + ), + }; + } + + private showAlertDialog() { + this.setState({ alertDialogShown: true }); + } + + private hideAlertDialog() { + this.setState({ alertDialogShown: false }); + } + + private handleRepoNameChange(e: any) { + this.setState({ repoName: e.target.value }); + } + private handleRepoLinkChange(e: any) { + this.setState({ repoLink: e.target.value }); + } + + public onCreate(data: ActivityXRenderData): JSX.Element { + return ( + <> + + {RepoActivity.getReadOnlyRepos() + .concat(data.s.repos) + .map((repo: any) => ( + + {repo.readonly ? ( +
+ {repo.name} + Read-Only Repository +
+ ) : ( +
{repo.name}
+ )} + + {!repo.readonly ? ( +
+
{ + ons.notification.confirm(`Are you sure to remove ${repo.name} repository?`).then((g) => { + if (g) { + this.removeRepo({ + name: repo.name, + link: repo.link, + readonly: false, + }); + } + }); + }} + > + +
+
+ ) : null} + + ))} + + <> + +
Add repo
+
+

+ +

+

+ +

+
+
+ + +
+ + + + ); + } +} + +export default RepoActivity; diff --git a/Website/src/activitys/SettingsActivity.tsx b/Website/src/activitys/SettingsActivity.tsx index 3905e7bb3..0e6b0c275 100644 --- a/Website/src/activitys/SettingsActivity.tsx +++ b/Website/src/activitys/SettingsActivity.tsx @@ -22,6 +22,7 @@ import Icon from "@Components/Icon"; import Magisk from "@Native/Magisk"; import Toolbar from "@Builders/ToolbarBuilder"; import RepoGeneratorActivity from "./RepoGeneratorActivity"; +import RepoActivity from "./RepoActivity"; interface Props { pushPage: any; @@ -67,41 +68,14 @@ class SettingsActivity extends AppCompatActivity { content: [ { type: "", + text: "Repositories", icon: , - text: string.custom_repository, - helper: { - text: "Test", - }, - onClick: (key) => { - new AlertDialog.Builder() - .setTitle(string.custom_repository) - .setMessage("Only URLs are valid") - .setPositiveButton("Apply", (input: string) => { - if (input != null) { - if (input.startsWith(">")) { - switch (input) { - case ">gmr": - this.pref.setString("repo", "https://repo.dergoogler.com/modules.json"); - break; - case ">mmar": - this.pref.setString( - "repo", - "https://raw.githubusercontent.com/Magisk-Modules-Alt-Repo/json/main/modules.json" - ); - break; - } - } else { - if (link.validURL(input)) { - this.pref.setString("repo", input); - ons.notification.alert("Repo changed, please refresh the app"); - } else { - ons.notification.alert("Invalid input"); - } - } - } - }) - .setNegativeButtom("Cancel", () => {}) - .showPrompt(); + + onClick(key, pushPage) { + pushPage({ + key: "repoactivity", + activity: RepoActivity, + }); }, }, ], diff --git a/Website/src/activitys/fragments/ExploreModuleFragment.tsx b/Website/src/activitys/fragments/ExploreModuleFragment.tsx index c79f618d1..000ad371a 100644 --- a/Website/src/activitys/fragments/ExploreModuleFragment.tsx +++ b/Website/src/activitys/fragments/ExploreModuleFragment.tsx @@ -10,13 +10,14 @@ import { os } from "@Native/os"; import ons from "onsenui"; import { string } from "@Strings"; import { isTablet } from "react-device-detect"; +import RepoActivity from "@Activitys/RepoActivity"; interface Props { pushPage(...arg: any): PushProps; } interface States { - modulesIndex: any[any]; + modulesIndex: Array; currentSerachText: string; search: string; moduleOptions: any[any]; @@ -49,7 +50,28 @@ class ExploreModuleFragment extends Component { this.setState({ loading: false }); }, 2000); - axios + RepoActivity.getReadOnlyRepos() + .concat(JSON.parse(SharedPreferences.getString("repos", "[]"))) + .map((repo: any) => { + axios + .get(repo.link) + .then((response) => { + const modules = response.data.modules; + this.setState((state, props) => ({ + modulesIndex: state.modulesIndex.concat(modules), + })); + }) + .catch((error) => { + this.setState({ + modulesIndex: [], + }); + }) + .then(() => { + // always executed + }); + }); + + /* axios .get(this.prefManager.getString("repo", "https://raw.githubusercontent.com/Magisk-Modules-Alt-Repo/json/main/modules.json")) .then((response) => { const modules = response.data.modules; @@ -64,7 +86,7 @@ class ExploreModuleFragment extends Component { }) .then(() => { // always executed - }); + });*/ axios.get("https://dergoogler.com/repo/moduleOptions.json").then((response) => { this.setState({ @@ -177,21 +199,23 @@ class ExploreModuleFragment extends Component { }; private cardRender(map: Array) { - return map.map((item: any) => { - return ( - - ); - }); + return map + .sort((a, b) => (a.id > b.id ? 1 : -1)) + .map((item: any) => { + return ( + + ); + }); } } diff --git a/Website/src/builders/ListViewBuilder.tsx b/Website/src/builders/ListViewBuilder.tsx index f15abded6..a2b0cf3e2 100644 --- a/Website/src/builders/ListViewBuilder.tsx +++ b/Website/src/builders/ListViewBuilder.tsx @@ -163,6 +163,7 @@ class ListViewBuilder extends Component { keepDefaultFuntion(); } }} + modifier="material3" > ); case "select": diff --git a/Website/src/native/SharedPreferences.ts b/Website/src/native/SharedPreferences.ts index 276905155..11cf5e1a8 100644 --- a/Website/src/native/SharedPreferences.ts +++ b/Website/src/native/SharedPreferences.ts @@ -175,7 +175,7 @@ class SharedPreferences implements ISharedPreferences { * * @throws ClassCastException */ - public static getString(key: string, defValue: string): string | String { + public static getString(key: string, defValue: string): string { return this.s.getString(key, defValue); } @@ -191,7 +191,7 @@ class SharedPreferences implements ISharedPreferences { * * @throws ClassCastException */ - public static getBoolean(key: string, defValue: bool): boolean | Boolean { + public static getBoolean(key: string, defValue: bool): boolean { return this.s.getBoolean(key, defValue); } @@ -205,7 +205,7 @@ class SharedPreferences implements ISharedPreferences { * * @throws ClassCastException */ - public static getInt(key: string, defValue: int): number | Number { + public static getInt(key: string, defValue: int): number { return this.s.getInt(key, defValue); } diff --git a/Website/src/styles/addtional.scss b/Website/src/styles/addtional.scss index 27657688f..5cfffeaff 100644 --- a/Website/src/styles/addtional.scss +++ b/Website/src/styles/addtional.scss @@ -123,3 +123,61 @@ license-card-wrapper { } } } + +// Custom Material 3 Switch and FAB + +.switch--material { + width: 36px; + height: 24px; + padding: 0 10px; + min-width: 36px; +} + +.switch--material__input { + position: absolute; + right: 0; + top: 0; + left: 0; + bottom: 0; + padding: 0; + border: 0; + background-color: transparent; + vertical-align: top; + outline: none; + width: 100%; + height: 100%; + margin: 0; + -webkit-appearance: none; + appearance: none; + z-index: 0; +} + +.switch--material__toggle { + background-color: #b0afaf; + background-color: var(--material-switch-inactive-background-color); + margin-top: 5px; + height: 20px; + box-shadow: none; +} + +.switch--material__handle { + background-color: #f1f1f1; + background-color: var(--material-switch-inactive-thumb-color); + left: 0; + margin-top: 0.3px; + width: 15px; + height: 15px; + box-shadow: none; + margin-left: 3px; +} + +:checked + .switch--material__toggle > .switch--material__handle { + left: 15px; + background-color: #37474f; + background-color: var(--material-switch-active-thumb-color); + box-shadow: none; +} + +ons-fab.fab--material { + border-radius: 30%; +} diff --git a/Website/src/styles/light_theme.ts b/Website/src/styles/light_theme.ts index 255e78fbe..8362513eb 100644 --- a/Website/src/styles/light_theme.ts +++ b/Website/src/styles/light_theme.ts @@ -4340,11 +4340,11 @@ const light_theme: any = { ], }, ".alert-dialog--material": { - borderRadius: "8px", + borderRadius: "25px", backgroundColor: "#ffffff", }, ".alert-dialog-container--material": { - borderRadius: "8px", + borderRadius: "25px", padding: "22px 0 0 0", boxShadow: "0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12),\r\n 0 8px 10px -5px rgba(0, 0, 0, 0.4)", @@ -4770,7 +4770,7 @@ const light_theme: any = { verticalAlign: "middle", textAlign: "center", backgroundColor: "#4a148c", - borderRadius: "50%", + borderRadius: "30%", overflow: "hidden", boxShadow: "0 3px 6px rgba(0, 0, 0, 0.12)", transition: "all 0.1s linear", diff --git a/Website/src/typings/declaration.d.ts b/Website/src/typings/declaration.d.ts index 2b4679bcf..c0099c812 100644 --- a/Website/src/typings/declaration.d.ts +++ b/Website/src/typings/declaration.d.ts @@ -244,6 +244,7 @@ declare module "react-onsenui" { /*** AlertDialog ***/ export class AlertDialog extends Component< { + children: React.ReactNode onCancel?(): void; isOpen?: boolean | undefined; isCancelable?: boolean | undefined; @@ -629,6 +630,7 @@ declare module "react-onsenui" { /** Pull-to-refresh hook. */ export class PullHook extends Component< { + children: string; onChange?(e: PullHookChangeEvent): void; onLoad?(done: () => void): void; onPull?(): void; From 399cfc6cb53350fcaf6a94a4d845e494ca1996bc Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sat, 16 Jul 2022 23:32:05 +0200 Subject: [PATCH 09/44] Improve custom repos --- Website/src/activitys/RepoActivity.tsx | 175 +++++++++++++----- .../fragments/ExploreModuleFragment.tsx | 2 +- 2 files changed, 132 insertions(+), 45 deletions(-) diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx index 9df78258d..2e7af250b 100644 --- a/Website/src/activitys/RepoActivity.tsx +++ b/Website/src/activitys/RepoActivity.tsx @@ -2,13 +2,26 @@ import { ActivityXRenderData, List, Toolbar } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; import { string } from "@Strings"; import SharedPreferences, { ISharedPreferences } from "@Native/SharedPreferences"; -import { Add, AddCircle, DeleteRounded, Remove } from "@mui/icons-material"; +import { + Add, + AddCircle, + DeleteRounded, + LanguageRounded, + Remove, + SupportRounded, + UploadFileRounded, + VolunteerActivismRounded, +} from "@mui/icons-material"; import { link } from "googlers-tools"; import ons from "onsenui"; import Icon from "@Components/Icon"; import { AlertDialog, Input } from "react-onsenui"; import Toast from "@Native/Toast"; import Constants from "@Native/Constants"; +import { os } from "@Native/os"; +import { OverridableComponent } from "@mui/material/OverridableComponent"; +import { SvgIconTypeMap } from "@mui/material/SvgIcon/SvgIcon"; +import axios from "axios"; interface Props { pushPage: any; @@ -22,6 +35,13 @@ interface States { repoLink: string; } +interface ListItemProps { + part: any; + text: string; + icon: OverridableComponent>; + onClick: () => void; +} + class RepoActivity extends AppCompatActivity { private pref: ISharedPreferences; @@ -47,11 +67,17 @@ class RepoActivity extends AppCompatActivity { this.handleRepoNameChange = this.handleRepoNameChange.bind(this); } + // Contact @Der_Googler on Telegram to request changes public static getReadOnlyRepos(): Array { return [ { name: "Magisk Modules Alternative Repository", - link: "https://raw.githubusercontent.com/Magisk-Modules-Alt-Repo/json/main/modules.json", + website: "https://github.com/Magisk-Modules-Alt-Repo", + support: undefined, + donate: undefined, + submitModule: "https://github.com/Magisk-Modules-Alt-Repo/submission", + last_update: undefined, + modules: "https://raw.githubusercontent.com/Magisk-Modules-Alt-Repo/json/main/modules.json", readonly: true, }, ]; @@ -76,19 +102,36 @@ class RepoActivity extends AppCompatActivity { if (repoName != "") { if (link.validURL(repoLink)) { - this.pref.setString( - "repos", - JSON.stringify([ - ...JSON.parse(this.pref.getString("repos", "[]")), - { - name: repoName, - link: repoLink, - readonly: false, - }, - ]) - ); - this.setState({ repos: this.getRepos(), repoName: "", repoLink: "" }); - this.hideAlertDialog(); + axios + .get(repoLink) + .then((response) => { + const data = response.data; + this.pref.setString( + "repos", + JSON.stringify([ + ...JSON.parse(this.pref.getString("repos", "[]")), + { + name: repoName, + website: data.website ? data.website : null, + support: data.support ? data.support : null, + donate: data.donate ? data.donate : null, + submitModule: data.submitModule ? data.submitModule : null, + last_update: data.last_update ? data.last_update : null, + modules: repoLink, + readonly: false, + }, + ]) + ); + + this.hideAlertDialog(); + }) + .catch((error) => { + Toast.makeText(error, Toast.LENGTH_SHORT).show(); + this.hideAlertDialog(); + }) + .then(() => { + this.setState({ repos: this.getRepos(), repoName: "", repoLink: "" }); + }); } else { Toast.makeText("The given link isn't valid.", Toast.LENGTH_SHORT).show(); } @@ -127,43 +170,87 @@ class RepoActivity extends AppCompatActivity { this.setState({ repoLink: e.target.value }); } + // Some layout atr inspired from @Fox2Code public onCreate(data: ActivityXRenderData): JSX.Element { + const ListItem = (props: ListItemProps) => { + return ( + <> + {props.part ? ( + +
+ +
+ +
{props.text}
+ + ) : null} + + ); + }; + return ( <> {RepoActivity.getReadOnlyRepos() .concat(data.s.repos) .map((repo: any) => ( - - {repo.readonly ? ( -
- {repo.name} - Read-Only Repository -
- ) : ( -
{repo.name}
- )} - - {!repo.readonly ? ( -
-
{ - ons.notification.confirm(`Are you sure to remove ${repo.name} repository?`).then((g) => { - if (g) { - this.removeRepo({ - name: repo.name, - link: repo.link, - readonly: false, - }); - } + <> + + {repo.name} + {repo.readonly ? " (Read-Only)" : ""} + + { + os.open(repo.website); + }} + /> + { + os.open(repo.support); + }} + /> + { + os.open(repo.donate); + }} + /> + { + os.open(repo.submitModule); + }} + /> + { + ons.notification.confirm(`Are you sure to remove ${repo.name} repository?`).then((g) => { + if (g) { + this.removeRepo({ + name: repo.name, + modules: repo.link, + readonly: false, }); - }} - > - -
-
- ) : null} - + } + }); + }} + /> + ))} <> diff --git a/Website/src/activitys/fragments/ExploreModuleFragment.tsx b/Website/src/activitys/fragments/ExploreModuleFragment.tsx index 000ad371a..a4e2314a5 100644 --- a/Website/src/activitys/fragments/ExploreModuleFragment.tsx +++ b/Website/src/activitys/fragments/ExploreModuleFragment.tsx @@ -54,7 +54,7 @@ class ExploreModuleFragment extends Component { .concat(JSON.parse(SharedPreferences.getString("repos", "[]"))) .map((repo: any) => { axios - .get(repo.link) + .get(repo.modules) .then((response) => { const modules = response.data.modules; this.setState((state, props) => ({ From 360631e198b9125146ddcc7db6be1537eda0149d Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 00:38:37 +0200 Subject: [PATCH 10/44] Add native dispatcher --- .../com/dergoogler/component/ModuleView.java | 8 ++- .../com/dergoogler/mmrl/MainActivity.java | 6 +- Website/src/activitys/AppCompatActivity.tsx | 10 +++- Website/src/activitys/MainApplication.tsx | 57 ++----------------- Website/src/activitys/SettingsActivity.tsx | 5 ++ Website/src/native/os.ts | 14 +++++ Website/src/typings/global.d.ts | 1 + 7 files changed, 42 insertions(+), 59 deletions(-) diff --git a/Android/app/src/main/java/com/dergoogler/component/ModuleView.java b/Android/app/src/main/java/com/dergoogler/component/ModuleView.java index 66745d0a5..8fd0c6132 100644 --- a/Android/app/src/main/java/com/dergoogler/component/ModuleView.java +++ b/Android/app/src/main/java/com/dergoogler/component/ModuleView.java @@ -128,7 +128,13 @@ public void postUrl(@NonNull String url, @NonNull byte[] postData) { @Override public void evaluateJavascript(@NonNull String script, @Nullable ValueCallback resultCallback) { - throw new RuntimeException("Stub!"); + super.evaluateJavascript(script, resultCallback); + } + + public void eventDispatcher(@NonNull String event) { + super.evaluateJavascript( + "(function() { window.dispatchEvent(" + event + "); })();" + , null); } public void loadJavascript(String javascript) { diff --git a/Android/app/src/main/java/com/dergoogler/mmrl/MainActivity.java b/Android/app/src/main/java/com/dergoogler/mmrl/MainActivity.java index 406deb474..074fa81d7 100755 --- a/Android/app/src/main/java/com/dergoogler/mmrl/MainActivity.java +++ b/Android/app/src/main/java/com/dergoogler/mmrl/MainActivity.java @@ -62,10 +62,6 @@ protected void onCreate(Bundle savedInstanceState) { @Override public void onBackPressed() { - if (view.canGoBack()) { - view.goBack(); - } else { - super.onBackPressed(); - } + view.eventDispatcher("onBackButton"); } } diff --git a/Website/src/activitys/AppCompatActivity.tsx b/Website/src/activitys/AppCompatActivity.tsx index 0c5126a1b..500c26934 100644 --- a/Website/src/activitys/AppCompatActivity.tsx +++ b/Website/src/activitys/AppCompatActivity.tsx @@ -1,5 +1,4 @@ import Toolbar from "@Builders/ToolbarBuilder"; -import ContentBody from "@Components/ContentBody"; import ErrorBoundary from "@Components/ErrorBoundary"; import Constants from "@Native/Constants"; import { os } from "@Native/os"; @@ -21,10 +20,14 @@ class AppCompatActivity

extends ActivityX { super(props); this.onlyAndroid(); + window["onBackButton"] = new Event("onBackButton"); + this.onCreate = this.onCreate.bind(this); this.onCreateToolbar = this.onCreateToolbar.bind(this); } + public onBackButton(): void {} + private onlyAndroid(): void { os.setStatusBarColor(this.setStatusbarColor(), false); if (SharedPreferences.getBoolean("enableBottomTabs_switch", false)) { @@ -42,6 +45,7 @@ class AppCompatActivity

extends ActivityX { public style: CSSProperties = {}; public componentDidMount(): void { + os.addNativeEventListener("onBackButton", this.onBackButton); this.onlyAndroid(); } @@ -49,7 +53,9 @@ class AppCompatActivity

extends ActivityX { this.onlyAndroid(); } - public componentWillUnmount(): void {} + public componentWillUnmount(): void { + os.removeNativeEventListener("onBackButton", this.onBackButton); + } /** * Sets an custom status bar color for the activity diff --git a/Website/src/activitys/MainApplication.tsx b/Website/src/activitys/MainApplication.tsx index ee90031b1..69bc80d76 100644 --- a/Website/src/activitys/MainApplication.tsx +++ b/Website/src/activitys/MainApplication.tsx @@ -31,42 +31,20 @@ interface Props { pushPage: any; } -interface States { - isHeaderTitleVisible: boolean; - isHeaderBGVisible: boolean; -} +interface States {} class MainApplication extends AppCompatActivity { - private headerTitleRef: RefObject; - private headerTtileObserver: IntersectionObserver; - private headerBgObserver: IntersectionObserver; - private headerBgRef: RefObject; - public constructor(props: Props | Readonly) { super(props); - this.state = { - isHeaderTitleVisible: false, - isHeaderBGVisible: false, - }; + this.state = {}; this.openSettings = this.openSettings.bind(this); this.renderTabs = this.renderTabs.bind(this); - - this.headerTitleRef = createRef(); - this.headerBgRef = createRef(); - - this.headerTtileObserver = new IntersectionObserver(([entry]) => { - this.setState({ isHeaderTitleVisible: entry.isIntersecting }); - }); - this.headerBgObserver = new IntersectionObserver(([entry]) => { - this.setState({ isHeaderBGVisible: entry.isIntersecting }); - }); } public onCreateToolbar(): Toolbar.Props { return { - title: !this.state.isHeaderTitleVisible ? "Magisk Module Repo Loader" : "", - modifier: this.state.isHeaderBGVisible ? "noshadow" : "", + title: "Magisk Module Repo Loader", addToolbarButtonPosition: "right", addToolbarButton: ( @@ -76,15 +54,8 @@ class MainApplication extends AppCompatActivity { }; } - public componentDidMount() { - super.componentDidMount; - this.headerTtileObserver.observe(this.headerTitleRef.current as any); - this.headerBgObserver.observe(this.headerBgRef.current as any); - } - - public componentWillUnmount() { - this.headerTtileObserver.disconnect(); - this.headerBgObserver.disconnect(); + public onBackButton(): void { + os.close(); } public componentDidUpdate() { @@ -121,23 +92,7 @@ class MainApplication extends AppCompatActivity { renderTabs={this.renderTabs} /> ) : ( - <> -

- Magisk Module Repo Loader -
- - + )} ); diff --git a/Website/src/activitys/SettingsActivity.tsx b/Website/src/activitys/SettingsActivity.tsx index 0e6b0c275..032a35dfb 100644 --- a/Website/src/activitys/SettingsActivity.tsx +++ b/Website/src/activitys/SettingsActivity.tsx @@ -44,8 +44,13 @@ class SettingsActivity extends AppCompatActivity { this.pref = new SharedPreferences(); } + public onBackButton(): void { + this.props.popPage(); + } + public componentDidMount = () => { super.componentDidMount; + this.setState({ libs: Object.keys(pkg.dependencies) }); }; diff --git a/Website/src/native/os.ts b/Website/src/native/os.ts index a93352edb..37023588a 100644 --- a/Website/src/native/os.ts +++ b/Website/src/native/os.ts @@ -105,6 +105,20 @@ class os { name; } } + + public static addNativeEventListener(event: any, callback: any) { + // @ts-ignore + window[event] = new Event(event.toLowerCase()); + + window.addEventListener(event.toLowerCase(), callback, false); + } + + public static removeNativeEventListener(event: any, callback: any) { + // @ts-ignore + window[event] = new Event(event.toLowerCase()); + + window.removeEventListener(event.toLowerCase(), callback, false); + } } export { os }; diff --git a/Website/src/typings/global.d.ts b/Website/src/typings/global.d.ts index e601b694a..ea7a7929e 100644 --- a/Website/src/typings/global.d.ts +++ b/Website/src/typings/global.d.ts @@ -16,6 +16,7 @@ declare global { } interface Window { + [x: string]: any; nshell: NShell; nos: NOS; nversion: NBuildConfig; From fa73634bba9e571965845235272aaabe5b11cc3d Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 01:19:14 +0200 Subject: [PATCH 11/44] Add message to new repo screen --- Website/src/activitys/MainApplication.tsx | 4 +- Website/src/activitys/RepoActivity.tsx | 45 +++++++++++++++-------- Website/src/native/Toast.ts | 7 ++++ 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/Website/src/activitys/MainApplication.tsx b/Website/src/activitys/MainApplication.tsx index 69bc80d76..758ae0934 100644 --- a/Website/src/activitys/MainApplication.tsx +++ b/Website/src/activitys/MainApplication.tsx @@ -3,11 +3,9 @@ import { TabWrapper } from "@Components/TabWrapper"; import { SettingsRounded } from "@mui/icons-material"; import { os } from "@Native/os"; import SharedPreferences from "@Native/SharedPreferences"; -import Toast from "@Native/Toast"; import { string } from "@Strings"; -import { createRef, RefObject } from "react"; import { Tab, Tabbar, TabbarRenderTab, ToolbarButton } from "react-onsenui"; -import { ActivityXRenderData, Page } from "react-onsenuix"; +import { ActivityXRenderData } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; import DeviceModuleFragment from "./fragments/DeviceModuleFragment"; import ExploreModuleFragment from "./fragments/ExploreModuleFragment"; diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx index 2e7af250b..427929a38 100644 --- a/Website/src/activitys/RepoActivity.tsx +++ b/Website/src/activitys/RepoActivity.tsx @@ -1,23 +1,12 @@ -import { ActivityXRenderData, List, Toolbar } from "react-onsenuix"; +import { ActivityXRenderData, AlertDialog, List, Toolbar } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; -import { string } from "@Strings"; import SharedPreferences, { ISharedPreferences } from "@Native/SharedPreferences"; -import { - Add, - AddCircle, - DeleteRounded, - LanguageRounded, - Remove, - SupportRounded, - UploadFileRounded, - VolunteerActivismRounded, -} from "@mui/icons-material"; +import { Add, DeleteRounded, LanguageRounded, SupportRounded, UploadFileRounded, VolunteerActivismRounded } from "@mui/icons-material"; import { link } from "googlers-tools"; import ons from "onsenui"; import Icon from "@Components/Icon"; -import { AlertDialog, Input } from "react-onsenui"; +import { AlertDialog as Dialog, Input } from "react-onsenui"; import Toast from "@Native/Toast"; -import Constants from "@Native/Constants"; import { os } from "@Native/os"; import { OverridableComponent } from "@mui/material/OverridableComponent"; import { SvgIconTypeMap } from "@mui/material/SvgIcon/SvgIcon"; @@ -83,6 +72,30 @@ class RepoActivity extends AppCompatActivity { ]; } + public componentDidMount(): void { + const _: string = "userAcceptNewRepos"; + const userAcceptNewRepos = SharedPreferences.getBoolean(_, false); + + if (!userAcceptNewRepos) { + const builder = new AlertDialog.Builder(); + builder.setTitle("Custom repositories!"); + builder.setMessage( +
+ MMRL introduces new repositories system with 1.4.2. Now can you load every repo into MMRL (This can slow + down the app if to much repo at once are enabled) + + Magisk Modules Alternative Repository is an read-only repo and can't be removed. + +
+ ); + builder.setPositiveButton("Oaky!", () => { + SharedPreferences.setBoolean(_, true); + }); + builder.setCancelable(true); + builder.showAlert(); + } + } + private getRepos(): Array { return JSON.parse(this.pref.getString("repos", "[]")); } @@ -254,7 +267,7 @@ class RepoActivity extends AppCompatActivity { ))} <> - +
Add repo

@@ -272,7 +285,7 @@ class RepoActivity extends AppCompatActivity { Add

- + ); diff --git a/Website/src/native/Toast.ts b/Website/src/native/Toast.ts index 65906fcdb..7c14f8b8e 100644 --- a/Website/src/native/Toast.ts +++ b/Website/src/native/Toast.ts @@ -3,7 +3,14 @@ import ons from "onsenui"; import { os } from "./os"; class Toast { + /** + * Show the view or text notification for a short period of time. + */ public static readonly LENGTH_LONG: int = os.isAndroid ? 1 : 5000; + + /** + * Show the view or text notification for a long period of time. + */ public static readonly LENGTH_SHORT: int = os.isAndroid ? 0 : 2000; private static duration: int; private static text: string; From 46083342f5cd29a4c303cc44a937673944ead812 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 01:30:53 +0200 Subject: [PATCH 12/44] Update translations --- Website/src/activitys/RepoActivity.tsx | 39 +++++++++++++++----------- Website/src/language/de.json | 10 ++++++- Website/src/language/en.json | 10 ++++++- 3 files changed, 41 insertions(+), 18 deletions(-) diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx index 427929a38..8c7526e67 100644 --- a/Website/src/activitys/RepoActivity.tsx +++ b/Website/src/activitys/RepoActivity.tsx @@ -11,6 +11,7 @@ import { os } from "@Native/os"; import { OverridableComponent } from "@mui/material/OverridableComponent"; import { SvgIconTypeMap } from "@mui/material/SvgIcon/SvgIcon"; import axios from "axios"; +import { string } from "@Strings"; interface Props { pushPage: any; @@ -218,7 +219,7 @@ class RepoActivity extends AppCompatActivity { { os.open(repo.website); }} @@ -226,7 +227,7 @@ class RepoActivity extends AppCompatActivity { { os.open(repo.support); }} @@ -234,7 +235,7 @@ class RepoActivity extends AppCompatActivity { { os.open(repo.donate); }} @@ -242,7 +243,7 @@ class RepoActivity extends AppCompatActivity { { os.open(repo.submitModule); }} @@ -250,17 +251,23 @@ class RepoActivity extends AppCompatActivity { { - ons.notification.confirm(`Are you sure to remove ${repo.name} repository?`).then((g) => { - if (g) { - this.removeRepo({ + ons.notification + .confirm( + string.formatString(string.confirm_repo_delete, { name: repo.name, - modules: repo.link, - readonly: false, - }); - } - }); + }) as string + ) + .then((g) => { + if (g) { + this.removeRepo({ + name: repo.name, + modules: repo.link, + readonly: false, + }); + } + }); }} /> @@ -268,7 +275,7 @@ class RepoActivity extends AppCompatActivity { <> -
Add repo
+
{string.add_repo}

@@ -279,10 +286,10 @@ class RepoActivity extends AppCompatActivity {

diff --git a/Website/src/language/de.json b/Website/src/language/de.json index efe9f0652..17e5f7cff 100644 --- a/Website/src/language/de.json +++ b/Website/src/language/de.json @@ -23,5 +23,13 @@ "restore": "Wiederherstellen", "module_enabled_LOG": "{module} wurde aktiviert", "module_disabled_LOG": "{module} wurde deaktiviert", - "last_updated": "Letztes Update: {date}" + "last_updated": "Letztes Update: {date}", + "add": "Hinzufügen", + "cancel": "Abbrechen", + "add_repo": "Repository hinzufügen", + "confirm_repo_delete": "Möchten Sie das {name}-Repository wirklich entfernen?", + "submit_module": "Ein Module einreichen", + "donate": "Spenden", + "support": "Support", + "website": "Webseite" } diff --git a/Website/src/language/en.json b/Website/src/language/en.json index 8de6ef6e9..18c3e9286 100644 --- a/Website/src/language/en.json +++ b/Website/src/language/en.json @@ -23,5 +23,13 @@ "restore": "Restore", "module_enabled_LOG": "{module} has been enabled", "module_disabled_LOG": "{module} has been disabled", - "last_updated": "Last update: {date}" + "last_updated": "Last update: {date}", + "add": "Add", + "cancel": "Cancel", + "add_repo": "Add a repository", + "confirm_repo_delete": "Are you sure to remove {name} repository?", + "submit_module": "Submit a module", + "donate": "Donate", + "support": "Support", + "website": "Website" } From c19115a847011759d299ff7be4ee9e820909564a Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 12:58:16 +0200 Subject: [PATCH 13/44] Add Googlers Repo as an readonly --- Website/src/activitys/RepoActivity.tsx | 10 ++++++++++ Website/src/components/dapi/Anchor.tsx | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx index 8c7526e67..0e7a305fd 100644 --- a/Website/src/activitys/RepoActivity.tsx +++ b/Website/src/activitys/RepoActivity.tsx @@ -70,6 +70,16 @@ class RepoActivity extends AppCompatActivity { modules: "https://raw.githubusercontent.com/Magisk-Modules-Alt-Repo/json/main/modules.json", readonly: true, }, + { + name: "Googlers-Magisk-Repo", + website: "https://github.com/Googlers-Magisk-Repo", + support: undefined, + donate: undefined, + submitModule: undefined, + last_update: undefined, + modules: "https://raw.githubusercontent.com/Googlers-Magisk-Repo/googlers-magisk-repo.github.io/master/modules.json", + readonly: true, + }, ]; } diff --git a/Website/src/components/dapi/Anchor.tsx b/Website/src/components/dapi/Anchor.tsx index 69d2abf37..fc6703f4c 100644 --- a/Website/src/components/dapi/Anchor.tsx +++ b/Website/src/components/dapi/Anchor.tsx @@ -28,7 +28,6 @@ class Anchor extends ViewX { rel={rel} target={util.typeCheck(target, "_blank")} type={type} - title={"Open " + href} onClick={() => { os.open(href); }} From 000bad101cdd62f77df80fd28d01107e512dd2e9 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 14:58:05 +0200 Subject: [PATCH 14/44] Repo changes - Added option to hide read-only repos - Added option to enable/disable repos --- Website/bun.lockb | Bin 204860 -> 204900 bytes Website/src/activitys/RepoActivity.tsx | 121 +++++++++++++++--- Website/src/activitys/SettingsActivity.tsx | 7 + .../fragments/ExploreModuleFragment.tsx | 44 ++++--- 4 files changed, 134 insertions(+), 38 deletions(-) diff --git a/Website/bun.lockb b/Website/bun.lockb index e7969b97bbf6b51e93cf327d52ea50fab4d96146..4c44bb7fc115549e56bc5df1487b32a06795f85e 100755 GIT binary patch delta 13936 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 diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx index 0e7a305fd..e2ed58013 100644 --- a/Website/src/activitys/RepoActivity.tsx +++ b/Website/src/activitys/RepoActivity.tsx @@ -1,17 +1,26 @@ import { ActivityXRenderData, AlertDialog, List, Toolbar } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; import SharedPreferences, { ISharedPreferences } from "@Native/SharedPreferences"; -import { Add, DeleteRounded, LanguageRounded, SupportRounded, UploadFileRounded, VolunteerActivismRounded } from "@mui/icons-material"; +import { + Add, + DeleteRounded, + ExtensionRounded, + LanguageRounded, + SupportRounded, + UploadFileRounded, + VolunteerActivismRounded, +} from "@mui/icons-material"; import { link } from "googlers-tools"; import ons from "onsenui"; import Icon from "@Components/Icon"; -import { AlertDialog as Dialog, Input } from "react-onsenui"; +import { AlertDialog as Dialog, Input, Switch } from "react-onsenui"; import Toast from "@Native/Toast"; import { os } from "@Native/os"; import { OverridableComponent } from "@mui/material/OverridableComponent"; import { SvgIconTypeMap } from "@mui/material/SvgIcon/SvgIcon"; import axios from "axios"; import { string } from "@Strings"; +import { Fragment } from "react"; interface Props { pushPage: any; @@ -32,6 +41,31 @@ interface ListItemProps { onClick: () => void; } +export interface RepoInterface { + /** + * An required filed, to disply the repository name + */ + name: string; + /** + * An given website link for the repository + */ + website?: string | undefined; + /** + * Given support link i.g. Telegram, Xda, GitHub or something + */ + support?: string | undefined; + donate?: string | undefined; + submitModule?: string | undefined; + last_update?: string | number | undefined; + modules: string; + /** + * The setting enabled by default if the repo is built-in + */ + readonly: boolean; + isOn: boolean; + built_in_type?: string; +} + class RepoActivity extends AppCompatActivity { private pref: ISharedPreferences; @@ -49,6 +83,7 @@ class RepoActivity extends AppCompatActivity { this.addRepo = this.addRepo.bind(this); this.removeRepo = this.removeRepo.bind(this); + this.changeEnabledState = this.changeEnabledState.bind(this); this.onCreateToolbar = this.onCreateToolbar.bind(this); this.hideAlertDialog = this.hideAlertDialog.bind(this); @@ -58,7 +93,7 @@ class RepoActivity extends AppCompatActivity { } // Contact @Der_Googler on Telegram to request changes - public static getReadOnlyRepos(): Array { + public static getReadOnlyRepos(): Array { return [ { name: "Magisk Modules Alternative Repository", @@ -69,9 +104,11 @@ class RepoActivity extends AppCompatActivity { last_update: undefined, modules: "https://raw.githubusercontent.com/Magisk-Modules-Alt-Repo/json/main/modules.json", readonly: true, + isOn: SharedPreferences.getBoolean("repoMMARenabled", true), + built_in_type: "MMAR", }, { - name: "Googlers-Magisk-Repo", + name: "Googlers Magisk Repo", website: "https://github.com/Googlers-Magisk-Repo", support: undefined, donate: undefined, @@ -79,6 +116,8 @@ class RepoActivity extends AppCompatActivity { last_update: undefined, modules: "https://raw.githubusercontent.com/Googlers-Magisk-Repo/googlers-magisk-repo.github.io/master/modules.json", readonly: true, + isOn: SharedPreferences.getBoolean("repoGMRenabled", true), + built_in_type: "GMR", }, ]; } @@ -107,7 +146,7 @@ class RepoActivity extends AppCompatActivity { } } - private getRepos(): Array { + private getRepos(): Array { return JSON.parse(this.pref.getString("repos", "[]")); } @@ -121,6 +160,15 @@ class RepoActivity extends AppCompatActivity { this.setState({ repos: this.getRepos() }); } + private changeEnabledState(state: any) { + let array = this.getRepos(); + var item = array.find((item: RepoInterface) => item.isOn === !state); + if (item) { + item.isOn = state; + } + this.pref.setString("repos", JSON.stringify(array)); + } + private addRepo() { const { repoName, repoLink } = this.state; @@ -143,6 +191,7 @@ class RepoActivity extends AppCompatActivity { last_update: data.last_update ? data.last_update : null, modules: repoLink, readonly: false, + isOn: false, }, ]) ); @@ -215,23 +264,57 @@ class RepoActivity extends AppCompatActivity { ); }; + const roReposOption = (): Array => { + return !SharedPreferences.getBoolean("enableHideReadonlyRepositories_switch", false) ? RepoActivity.getReadOnlyRepos() : []; + }; + return ( <> - {RepoActivity.getReadOnlyRepos() + {roReposOption() .concat(data.s.repos) - .map((repo: any) => ( - <> + .map((repo: RepoInterface, index: number) => ( + {repo.name} {repo.readonly ? " (Read-Only)" : ""} + {}} + > +
+ +
+ +
Enabled
+
+ { + switch (repo.built_in_type) { + case "MMAR": + this.pref.setBoolean("repoMMARenabled", e.target.checked); + break; + case "GMR": + this.pref.setBoolean("repoGMRenabled", e.target.checked); + break; + default: + this.changeEnabledState(e.target.checked); + break; + } + }} + /> +
+ { - os.open(repo.website); + if (repo.website) { + os.open(repo.website); + } }} /> { icon={SupportRounded} text={string.support} onClick={() => { - os.open(repo.support); + if (repo.support) { + os.open(repo.support); + } }} /> { icon={VolunteerActivismRounded} text={string.donate} onClick={() => { - os.open(repo.donate); + if (repo.donate) { + os.open(repo.donate); + } }} /> { icon={UploadFileRounded} text={string.submit_module} onClick={() => { - os.open(repo.submitModule); + if (repo.submitModule) { + os.open(repo.submitModule); + } }} /> { ) .then((g) => { if (g) { - this.removeRepo({ - name: repo.name, - modules: repo.link, - readonly: false, - }); + this.removeRepo(repo); } }); }} /> - + ))} <> diff --git a/Website/src/activitys/SettingsActivity.tsx b/Website/src/activitys/SettingsActivity.tsx index 032a35dfb..1c02ab1ff 100644 --- a/Website/src/activitys/SettingsActivity.tsx +++ b/Website/src/activitys/SettingsActivity.tsx @@ -13,6 +13,7 @@ import { BugReportRounded, ExtensionRounded, GavelRounded, + HideSourceRounded, PowerInputRounded, SourceRounded, } from "@mui/icons-material"; @@ -83,6 +84,12 @@ class SettingsActivity extends AppCompatActivity { }); }, }, + { + key: "enableHideReadonlyRepositories", + type: "switch", + icon: , + text: "Hide Readonly Repositories", + }, ], }, { diff --git a/Website/src/activitys/fragments/ExploreModuleFragment.tsx b/Website/src/activitys/fragments/ExploreModuleFragment.tsx index a4e2314a5..f71fca141 100644 --- a/Website/src/activitys/fragments/ExploreModuleFragment.tsx +++ b/Website/src/activitys/fragments/ExploreModuleFragment.tsx @@ -10,7 +10,8 @@ import { os } from "@Native/os"; import ons from "onsenui"; import { string } from "@Strings"; import { isTablet } from "react-device-detect"; -import RepoActivity from "@Activitys/RepoActivity"; +import RepoActivity, { RepoInterface } from "@Activitys/RepoActivity"; +import Toast from "@Native/Toast"; interface Props { pushPage(...arg: any): PushProps; @@ -26,7 +27,7 @@ interface States { class ExploreModuleFragment extends Component { private searchBar: LegacyRef | undefined; - private prefManager: SharedPreferences; + private pref: SharedPreferences; public constructor(props: Props | Readonly) { super(props); @@ -37,7 +38,7 @@ class ExploreModuleFragment extends Component { moduleOptions: {}, loading: true, }; - this.prefManager = new SharedPreferences(); + this.pref = new SharedPreferences(); } public componentDidMount = () => { @@ -51,24 +52,27 @@ class ExploreModuleFragment extends Component { }, 2000); RepoActivity.getReadOnlyRepos() - .concat(JSON.parse(SharedPreferences.getString("repos", "[]"))) - .map((repo: any) => { - axios - .get(repo.modules) - .then((response) => { - const modules = response.data.modules; - this.setState((state, props) => ({ - modulesIndex: state.modulesIndex.concat(modules), - })); - }) - .catch((error) => { - this.setState({ - modulesIndex: [], + .concat(JSON.parse(this.pref.getString("repos", "[]"))) + .map((repo: RepoInterface) => { + if (repo.isOn) { + axios + .get(repo.modules) + .then((response) => { + const modules = response.data.modules; + this.setState((state, props) => ({ + modulesIndex: state.modulesIndex.concat(modules), + })); + }) + .catch((error) => { + this.setState({ + modulesIndex: [], + }); + Toast.makeText(error, Toast.LENGTH_SHORT).show(); + }) + .then(() => { + // always executed }); - }) - .then(() => { - // always executed - }); + } // If the repo is disabled, do nothing. }); /* axios From 91512eb009e618a03bf109b4f27915212e223bc0 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 15:39:46 +0200 Subject: [PATCH 15/44] Design changes --- Website/src/activitys/MainApplication.tsx | 32 +- Website/src/activitys/RepoActivity.tsx | 1 + Website/src/styles/Md3Fab.ts | 9 + Website/src/styles/Md3Switch.ts | 63 ++++ Website/src/styles/addtional.scss | 58 ---- Website/src/styles/dark_theme.ts | 16 + Website/src/styles/light_theme.ts | 362 +++++++++++----------- 7 files changed, 298 insertions(+), 243 deletions(-) create mode 100644 Website/src/styles/Md3Fab.ts create mode 100644 Website/src/styles/Md3Switch.ts diff --git a/Website/src/activitys/MainApplication.tsx b/Website/src/activitys/MainApplication.tsx index 758ae0934..610b64d7a 100644 --- a/Website/src/activitys/MainApplication.tsx +++ b/Website/src/activitys/MainApplication.tsx @@ -1,14 +1,15 @@ import Toolbar from "@Builders/ToolbarBuilder"; import { TabWrapper } from "@Components/TabWrapper"; -import { SettingsRounded } from "@mui/icons-material"; +import { ExtensionRounded, SettingsRounded } from "@mui/icons-material"; import { os } from "@Native/os"; import SharedPreferences from "@Native/SharedPreferences"; import { string } from "@Strings"; import { Tab, Tabbar, TabbarRenderTab, ToolbarButton } from "react-onsenui"; -import { ActivityXRenderData } from "react-onsenuix"; +import { ActivityXRenderData, Fab } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; import DeviceModuleFragment from "./fragments/DeviceModuleFragment"; import ExploreModuleFragment from "./fragments/ExploreModuleFragment"; +import RepoActivity from "./RepoActivity"; import SettingsActivity from "./SettingsActivity"; interface Props { @@ -38,6 +39,7 @@ class MainApplication extends AppCompatActivity { this.openSettings = this.openSettings.bind(this); this.renderTabs = this.renderTabs.bind(this); + this.onCreateFAB = this.onCreateFAB.bind(this); } public onCreateToolbar(): Toolbar.Props { @@ -56,6 +58,32 @@ class MainApplication extends AppCompatActivity { os.close(); } + public onCreateFAB(): JSX.Element { + return ( + <> + { + this.props.pushPage({ + key: "repoactivity", + activity: RepoActivity, + }); + }} + position="bottom right" + > + + + + + + ); + } + public componentDidUpdate() { super.componentDidUpdate; } diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx index e2ed58013..cb2b77346 100644 --- a/Website/src/activitys/RepoActivity.tsx +++ b/Website/src/activitys/RepoActivity.tsx @@ -290,6 +290,7 @@ class RepoActivity extends AppCompatActivity {
Enabled
{ switch (repo.built_in_type) { diff --git a/Website/src/styles/Md3Fab.ts b/Website/src/styles/Md3Fab.ts new file mode 100644 index 000000000..6dfb5cb6d --- /dev/null +++ b/Website/src/styles/Md3Fab.ts @@ -0,0 +1,9 @@ +import { UiXThemeType } from "react-onsenuix"; + +export function Md3Fab(): UiXThemeType { + return { + "ons-fab.fab--material3 ": { + borderRadius: "30%", + }, + }; +} diff --git a/Website/src/styles/Md3Switch.ts b/Website/src/styles/Md3Switch.ts new file mode 100644 index 000000000..ad5a51bf9 --- /dev/null +++ b/Website/src/styles/Md3Switch.ts @@ -0,0 +1,63 @@ +import { UiXThemeType } from "react-onsenuix"; + +type Color = `#${string}`; + +interface Md3SwitchStyles { + bgColor: Color; + thumbColor: Color; + checkedThumbColor: Color; + checkedBgColor: Color; +} + +export function Md3Switch(sx: Md3SwitchStyles): UiXThemeType { + return { + ".switch--material3": { + width: "36px", + height: "24px", + padding: "0 10px", + minWidth: "36px", + }, + ".switch--material3__input": { + position: "absolute", + right: "0", + top: "0", + left: "0", + bottom: "0", + padding: "0", + border: "0", + backgroundColor: "transparent", + verticalAlign: "top", + outline: "none", + width: "100%", + height: "100%", + margin: "0", + webkitAppearance: "none", + appearance: "none", + zIndex: "0", + }, + ":checked + .switch--material__toggle": { + boxShadow: "none", + backgroundColor: sx.checkedBgColor, + }, + ".switch--material3__toggle": { + backgroundColor: sx.bgColor, + marginTop: "2px", + height: "20px", + boxShadow: "none", + }, + ".switch--material3__handle": { + backgroundColor: sx.thumbColor, + left: "0", + marginTop: "0.3px", + width: "15px", + height: "15px", + boxShadow: "none", + marginLeft: "3px", + }, + ":checked + .switch--material3__toggle > .switch--material3__handle": { + left: "15px", + backgroundColor: sx.checkedThumbColor, + boxShadow: "none", + }, + }; +} diff --git a/Website/src/styles/addtional.scss b/Website/src/styles/addtional.scss index 5cfffeaff..27657688f 100644 --- a/Website/src/styles/addtional.scss +++ b/Website/src/styles/addtional.scss @@ -123,61 +123,3 @@ license-card-wrapper { } } } - -// Custom Material 3 Switch and FAB - -.switch--material { - width: 36px; - height: 24px; - padding: 0 10px; - min-width: 36px; -} - -.switch--material__input { - position: absolute; - right: 0; - top: 0; - left: 0; - bottom: 0; - padding: 0; - border: 0; - background-color: transparent; - vertical-align: top; - outline: none; - width: 100%; - height: 100%; - margin: 0; - -webkit-appearance: none; - appearance: none; - z-index: 0; -} - -.switch--material__toggle { - background-color: #b0afaf; - background-color: var(--material-switch-inactive-background-color); - margin-top: 5px; - height: 20px; - box-shadow: none; -} - -.switch--material__handle { - background-color: #f1f1f1; - background-color: var(--material-switch-inactive-thumb-color); - left: 0; - margin-top: 0.3px; - width: 15px; - height: 15px; - box-shadow: none; - margin-left: 3px; -} - -:checked + .switch--material__toggle > .switch--material__handle { - left: 15px; - background-color: #37474f; - background-color: var(--material-switch-active-thumb-color); - box-shadow: none; -} - -ons-fab.fab--material { - border-radius: 30%; -} diff --git a/Website/src/styles/dark_theme.ts b/Website/src/styles/dark_theme.ts index 92d217b50..8027d1e5b 100644 --- a/Website/src/styles/dark_theme.ts +++ b/Website/src/styles/dark_theme.ts @@ -1,3 +1,6 @@ +import { Md3Fab } from "./Md3Fab"; +import { Md3Switch } from "./Md3Switch"; + const dark_theme: any = { "@global": { html: { @@ -340,6 +343,15 @@ const dark_theme: any = { left: "-15px", right: "-15px", }, + + // Custom Material 3 Switch and FAB + ...Md3Switch({ + bgColor: "#adacac", + thumbColor: "#f1f1f1", + checkedThumbColor: "#ffffff", + checkedBgColor: "#bb86fc", + }), + ".range": { display: "inline-block", position: "relative", @@ -4896,6 +4908,10 @@ const dark_theme: any = { ".progress-circular--material__secondary": { stroke: "rgba(172, 105, 254, 1)", }, + + // Custom Material 3 Fab + ...Md3Fab(), + "button.fab, ons-fab.fab, ons-speed-dial-item.fab": { position: "relative", display: "inline-block", diff --git a/Website/src/styles/light_theme.ts b/Website/src/styles/light_theme.ts index 8362513eb..479c70cb6 100644 --- a/Website/src/styles/light_theme.ts +++ b/Website/src/styles/light_theme.ts @@ -1,3 +1,6 @@ +import { Md3Fab } from "./Md3Fab"; +import { Md3Switch } from "./Md3Switch"; + const light_theme: any = { "@global": { ":root": {}, @@ -18,14 +21,14 @@ const light_theme: any = { touchAction: "manipulation", }, "html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video": - { - webkitUserSelect: "none", - mozUserSelect: "none", - msUserSelect: "none", - userSelect: "none", - webkitTapHighlightColor: "transparent", - webkitTouchCallout: "none", - }, + { + webkitUserSelect: "none", + mozUserSelect: "none", + msUserSelect: "none", + userSelect: "none", + webkitTapHighlightColor: "transparent", + webkitTouchCallout: "none", + }, "input, textarea, select": { webkitUserSelect: "auto", msUserSelect: "auto", @@ -157,18 +160,18 @@ const light_theme: any = { fontSize: "20px", }, ".page--material__content h1, .page--material__content h2, .page--material__content h3, .page--material__content h4, .page--material__content h5": - { - fontFamily: '"Roboto", "Noto", sans-serif', - webkitFontSmoothing: "antialiased", - fontWeight: "500", - fallbacks: [ - { - fontWeight: "400", - }, - ], - margin: "0.6em 0", - padding: "0", - }, + { + fontFamily: '"Roboto", "Noto", sans-serif', + webkitFontSmoothing: "antialiased", + fontWeight: "500", + fallbacks: [ + { + fontWeight: "400", + }, + ], + margin: "0.6em 0", + padding: "0", + }, ".page--material__content h1": { fontSize: "28px", }, @@ -319,8 +322,7 @@ const light_theme: any = { marginTop: "-5px", width: "20px", height: "20px", - boxShadow: - "0 4px 5px 0 rgba(0, 0, 0, 0.14), 0 1px 10px 0 rgba(0, 0, 0, 0.12),\r\n 0 2px 4px -1px rgba(0, 0, 0, 0.4)", + boxShadow: "0 4px 5px 0 rgba(0, 0, 0, 0.14), 0 1px 10px 0 rgba(0, 0, 0, 0.12),\r\n 0 2px 4px -1px rgba(0, 0, 0, 0.4)", }, ":checked + .switch--material__toggle": { backgroundColor: "#7c43bd", @@ -329,8 +331,7 @@ const light_theme: any = { ":checked + .switch--material__toggle > .switch--material__handle": { left: "16px", backgroundColor: "#4a148c", - boxShadow: - "0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12),\r\n 0 3px 1px -2px rgba(0, 0, 0, 0.2)", + boxShadow: "0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12),\r\n 0 3px 1px -2px rgba(0, 0, 0, 0.2)", }, ":disabled + .switch--material__toggle": { opacity: "0.3", @@ -360,6 +361,15 @@ const light_theme: any = { left: "-15px", right: "-15px", }, + + // Custom Material 3 Switch and FAB + ...Md3Switch({ + bgColor: "#b0afaf", + thumbColor: "#f1f1f1", + checkedThumbColor: "#ffffff", + checkedBgColor: "#7c43bd", + }), + ".range": { display: "inline-block", position: "relative", @@ -581,8 +591,7 @@ const light_theme: any = { "-moz-radial-gradient(\r\n circle farthest-corner,\r\n #4a148c 0%,\r\n #4a148c 6.6px,\r\n transparent 7px\r\n )", boxShadow: "none", }, - ".range--material__input:active::-webkit-slider-thumb, .range--material__input.range__input--active::-webkit-slider-thumb": - { + ".range--material__input:active::-webkit-slider-thumb, .range--material__input.range__input--active::-webkit-slider-thumb": { webkitTransform: "scale(1.5)", transform: "scale(1.5)", transition: "transform 0.1s linear, -webkit-transform 0.1s linear", @@ -796,8 +805,7 @@ const light_theme: any = { ".list-item--material.list-item--expandable": { backgroundImage: "linear-gradient(0deg, #eee, #eee 50%, transparent 50%)", }, - ".list-item--material.list-item--longdivider, .list-item--material.list-item--expandable.list-item--longdivider": - { + ".list-item--material.list-item--longdivider, .list-item--material.list-item--expandable.list-item--longdivider": { backgroundImage: "linear-gradient(0deg, #eee, #eee 50%, transparent 50%)", }, ".list-header--material:not(:first-of-type)": { @@ -1633,8 +1641,7 @@ const light_theme: any = { backgroundColor: "#4a148c", borderRadius: "8px", transition: "all 0.25s linear", - boxShadow: - "0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12),\r\n 0 3px 1px -2px rgba(0, 0, 0, 0.2)", + boxShadow: "0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12),\r\n 0 3px 1px -2px rgba(0, 0, 0, 0.2)", minHeight: "36px", textAlign: "center", webkitTransform: "translate3d(0, 0, 0)", @@ -1646,8 +1653,7 @@ const light_theme: any = { transition: "all 0.25s linear", }, ".button--material:active": { - boxShadow: - "0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12),\r\n 0 3px 5px -1px rgba(0, 0, 0, 0.4)", + boxShadow: "0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12),\r\n 0 3px 5px -1px rgba(0, 0, 0, 0.4)", backgroundColor: "#4a148c", opacity: "0.9", transition: "all 0.25s linear", @@ -1698,8 +1704,7 @@ const light_theme: any = { backgroundColor: "#4a148c", }, { - boxShadow: - "0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12),\r\n 0 3px 1px -2px rgba(0, 0, 0, 0.2)", + boxShadow: "0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12),\r\n 0 3px 1px -2px rgba(0, 0, 0, 0.2)", }, { transition: "none", @@ -2032,8 +2037,7 @@ const light_theme: any = { borderRadius: "0", borderWidth: "0", }, - ".segment--material__item:first-child > .segment--material__button, .segment--material__item:last-child > .segment--material__button": - { + ".segment--material__item:first-child > .segment--material__button, .segment--material__item:last-child > .segment--material__button": { borderRadius: "0", borderWidth: "0", }, @@ -2250,8 +2254,7 @@ const light_theme: any = { background: "none", backgroundColor: "#4a148c", borderBottomWidth: "0", - boxShadow: - "0 4px 2px -2px rgba(0, 0, 0, 0.14), 0 3px 5px -2px rgba(0, 0, 0, 0.12),\r\n 0 5px 1px -4px rgba(0, 0, 0, 0.2)", + boxShadow: "0 4px 2px -2px rgba(0, 0, 0, 0.14), 0 3px 5px -2px rgba(0, 0, 0, 0.12),\r\n 0 5px 1px -4px rgba(0, 0, 0, 0.2)", }, ".tabbar--material__button": { backgroundColor: "transparent", @@ -3439,10 +3442,10 @@ const light_theme: any = { paddingRight: "30px", }, ".list-item--nodivider__center, .list-item--nodivider__right, .list-item--nodivider.list-item--expandable, .list-item--expandable .list-item__center, .list-item--expandable .list-item__right": - { - border: "none", - backgroundImage: "none", - }, + { + border: "none", + backgroundImage: "none", + }, ".list-item--longdivider": { borderBottom: "none", fallbacks: [ @@ -3627,8 +3630,7 @@ const light_theme: any = { backgroundPosition: "18px center", fontSize: "14px", padding: "0 24px 0 64px", - boxShadow: - "0 0 2px 0 rgba(0, 0, 0, 0.12), 0 2px 2px 0 rgba(0, 0, 0, 0.24),\r\n 0 1px 0 0 rgba(255, 255, 255, 0.06) inset", + boxShadow: "0 0 2px 0 rgba(0, 0, 0, 0.12), 0 2px 2px 0 rgba(0, 0, 0, 0.24),\r\n 0 1px 0 0 rgba(255, 255, 255, 0.06) inset", }, ".text-input": { boxSizing: "border-box", @@ -3924,8 +3926,7 @@ const light_theme: any = { ], }, ".text-input--material:focus": { - backgroundImage: - "linear-gradient(#3d5afe, #3d5afe),\r\n linear-gradient(to top, transparent 1px, #afafaf 1px)", + backgroundImage: "linear-gradient(#3d5afe, #3d5afe),\r\n linear-gradient(to top, transparent 1px, #afafaf 1px)", webkitAnimation: "material-text-input-animate 0.3s forwards", animation: "material-text-input-animate 0.3s forwards", }, @@ -4144,8 +4145,7 @@ const light_theme: any = { webkitFontSmoothing: "antialiased", fontWeight: "400", textAlign: "left", - boxShadow: - "0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12),\r\n 0 8px 10px -5px rgba(0, 0, 0, 0.4)", + boxShadow: "0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12),\r\n 0 8px 10px -5px rgba(0, 0, 0, 0.4)", }, ".dialog-container--material": { borderRadius: "8px", @@ -4346,8 +4346,7 @@ const light_theme: any = { ".alert-dialog-container--material": { borderRadius: "25px", padding: "22px 0 0 0", - boxShadow: - "0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12),\r\n 0 8px 10px -5px rgba(0, 0, 0, 0.4)", + boxShadow: "0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12),\r\n 0 8px 10px -5px rgba(0, 0, 0, 0.4)", }, ".alert-dialog-title--material": { fontFamily: '"Roboto", "Noto", sans-serif', @@ -4549,8 +4548,7 @@ const light_theme: any = { backgroundColor: "#fafafa", borderRadius: "2px", color: "#1f1f21", - boxShadow: - "0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12),\r\n 0 3px 1px -2px rgba(0, 0, 0, 0.2)", + boxShadow: "0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12),\r\n 0 3px 1px -2px rgba(0, 0, 0, 0.2)", }, ".popover--material__arrow": { display: "none", @@ -4718,8 +4716,7 @@ const light_theme: any = { strokeDashoffset: "-251.32%", }, }, - ".progress-circular--material__background, .progress-circular--material__primary, .progress-circular--material__secondary": - { + ".progress-circular--material__background, .progress-circular--material__primary, .progress-circular--material__secondary": { strokeWidth: "9%", }, ".progress-circular--material__background": { @@ -4731,6 +4728,10 @@ const light_theme: any = { ".progress-circular--material__secondary": { stroke: "#12005e", }, + + // Custom Material 3 Fab + ...Md3Fab(), + "ons-fab.fab, ons-speed-dial-item.fab, button.fab": { position: "relative", display: "inline-block", @@ -4789,12 +4790,12 @@ const light_theme: any = { outline: "0", }, "ons-fab.fab:disabled, ons-fab.fab[disabled], ons-speed-dial-item.fab:disabled, ons-speed-dial-item.fab[disabled], button.fab:disabled, button.fab[disabled]": - { - backgroundColor: "color-mod(black alpha(50%))", - boxShadow: "none", - opacity: "0.3", - pointerEvents: "none", - }, + { + backgroundColor: "color-mod(black alpha(50%))", + boxShadow: "none", + opacity: "0.3", + pointerEvents: "none", + }, "ons-fab.fab__icon, ons-speed-dial-item.fab__icon, button.fab__icon": { position: "relative", overflow: "hidden", @@ -4886,13 +4887,11 @@ const light_theme: any = { backgroundColor: "#4a148c", borderRadius: "50%", overflow: "hidden", - boxShadow: - "0 4px 5px 0 rgba(0, 0, 0, 0.14), 0 1px 10px 0 rgba(0, 0, 0, 0.12),\r\n 0 2px 4px -1px rgba(0, 0, 0, 0.4)", + boxShadow: "0 4px 5px 0 rgba(0, 0, 0, 0.14), 0 1px 10px 0 rgba(0, 0, 0, 0.12),\r\n 0 2px 4px -1px rgba(0, 0, 0, 0.4)", transition: "all 0.2s ease-in-out", }, "ons-fab.fab--material:active, ons-speed-dial-item.fab--material:active, button.fab--material:active": { - boxShadow: - "0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12),\r\n 0 5px 5px -3px rgba(0, 0, 0, 0.4)", + boxShadow: "0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12),\r\n 0 5px 5px -3px rgba(0, 0, 0, 0.4)", backgroundColor: "rgba(255, 255, 255, 0.75)", fallbacks: [ { @@ -4916,12 +4915,12 @@ const light_theme: any = { lineHeight: "56px", }, "ons-fab.fab--material:disabled, ons-fab.fab--material[disabled], ons-speed-dial-item.fab--material:disabled, ons-speed-dial-item.fab--material[disabled], button.fab--material:disabled, button.fab--material[disabled]": - { - backgroundColor: "color-mod(black alpha(50%))", - boxShadow: "none", - opacity: "0.3", - pointerEvents: "none", - }, + { + backgroundColor: "color-mod(black alpha(50%))", + boxShadow: "none", + opacity: "0.3", + pointerEvents: "none", + }, "ons-fab.fab--mini, ons-speed-dial-item.fab--mini, button.fab--mini": { width: "40px", height: "40px", @@ -5455,8 +5454,7 @@ const light_theme: any = { left: "0", right: "0", bottom: "0", - boxShadow: - "0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12),\r\n 0 8px 10px -5px rgba(0, 0, 0, 0.4)", + boxShadow: "0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12),\r\n 0 8px 10px -5px rgba(0, 0, 0, 0.4)", }, ".action-sheet-title--material": { fontFamily: '"Roboto", "Noto", sans-serif', @@ -5568,8 +5566,7 @@ const light_theme: any = { ".card--material": { backgroundColor: "white", borderRadius: "8px", - boxShadow: - "0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12),\r\n 0 3px 1px -2px rgba(0, 0, 0, 0.2)", + boxShadow: "0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12),\r\n 0 3px 1px -2px rgba(0, 0, 0, 0.2)", fontFamily: '"Roboto", "Noto", sans-serif', webkitFontSmoothing: "antialiased", fontWeight: "400", @@ -5697,15 +5694,15 @@ const light_theme: any = { top: "0", }, ".toolbar.toolbar--transparent.toolbar--cover-content + .page__background + .page__content, .toolbar.toolbar--transparent.toolbar--cover-content\r\n + .page__background\r\n + .page__content\r\n .page_content": - { - top: "0", - paddingTop: "44px", - }, + { + top: "0", + paddingTop: "44px", + }, ".toolbar.toolbar--material.toolbar--transparent.toolbar--cover-content\r\n + .page__background\r\n + .page__content, .toolbar.toolbar--material.toolbar--transparent.toolbar--cover-content\r\n + .page__background\r\n + .page__content\r\n .page_content": - { - top: "0", - paddingTop: "56px", - }, + { + top: "0", + paddingTop: "56px", + }, ".tabbar:not(.tabbar--top)": { paddingBottom: "0", }, @@ -5739,9 +5736,9 @@ const light_theme: any = { width: "calc(100% - 88px)", }, "html[onsflag-iphonex-landscape] .fab--bottom__left, html[onsflag-iphonex-landscape] .fab--bottom__center, html[onsflag-iphonex-landscape] .fab--bottom__right": - { - bottom: "21px", - }, + { + bottom: "21px", + }, "html[onsflag-iphonex-landscape] .fab--top__left, html[onsflag-iphonex-landscape] .fab--bottom__left": { left: "44px", }, @@ -5759,39 +5756,39 @@ const light_theme: any = { bottom: "21px", }, "html[onsflag-iphonex-landscape] .dialog .bottom-bar, html[onsflag-iphonex-landscape] .page-with-bottom-toolbar > .page__content .bottom-bar, html[onsflag-iphonex-landscape] .tabbar__content:not(.tabbar--top__content) .bottom-bar": - { - bottom: "0", - boxSizing: "border-box", - paddingBottom: "0", - }, + { + bottom: "0", + boxSizing: "border-box", + paddingBottom: "0", + }, "html[onsflag-iphonex-landscape] .dialog .page__content, html[onsflag-iphonex-landscape] .page-with-bottom-toolbar > .page__content .page__content, html[onsflag-iphonex-landscape] .tabbar__content:not(.tabbar--top__content) .page__content, html[onsflag-iphonex-landscape] .page-with-bottom-toolbar > .page__content": - { - bottom: "0", - paddingBottom: "0", - }, + { + bottom: "0", + paddingBottom: "0", + }, "html[onsflag-iphonex-landscape] .page-with-bottom-toolbar > .page__content": { bottom: "65px", paddingBottom: "0", }, "html[onsflag-iphonex-landscape] .dialog .page-with-bottom-toolbar > .page__content, html[onsflag-iphonex-landscape] .page-with-bottom-toolbar > .page__content .page-with-bottom-toolbar > .page__content, html[onsflag-iphonex-landscape] .tabbar__content:not(.tabbar--top__content) .page-with-bottom-toolbar > .page__content": - { - bottom: "44px", - paddingBottom: "0", - }, + { + bottom: "44px", + paddingBottom: "0", + }, "html[onsflag-iphonex-landscape] .tabbar:not(.tabbar--top)": { paddingBottom: "21px", }, "html[onsflag-iphonex-landscape] .dialog .tabbar:not(.tabbar--top), html[onsflag-iphonex-landscape] .page-with-bottom-toolbar > .page__content .tabbar:not(.tabbar--top), html[onsflag-iphonex-landscape] .tabbar__content:not(.tabbar--top__content) .tabbar:not(.tabbar--top)": - { - paddingBottom: "0", - }, + { + paddingBottom: "0", + }, "html[onsflag-iphonex-landscape] .tabbar__content:not(.tabbar--top__content)": { bottom: "70px", }, "html[onsflag-iphonex-landscape] .dialog .tabbar__content:not(.tabbar--top__content), html[onsflag-iphonex-landscape] .page-with-bottom-toolbar > .page__content .tabbar__content:not(.tabbar--top__content), html[onsflag-iphonex-landscape] .tabbar__content:not(.tabbar--top__content) .tabbar__content:not(.tabbar--top__content)": - { - bottom: "49px", - }, + { + bottom: "49px", + }, "html[onsflag-iphonex-landscape] .page__content > .list:not(.list--inset)": { marginLeft: "-44px", marginRight: "-44px", @@ -5802,22 +5799,21 @@ const light_theme: any = { "html[onsflag-iphonex-landscape] .page__content > .list:not(.list--inset) > .list-item": { paddingLeft: "58px", }, - "html[onsflag-iphonex-landscape]\r\n .page__content\r\n > .list:not(.list--inset)\r\n > .list-item--chevron:before": - { + "html[onsflag-iphonex-landscape]\r\n .page__content\r\n > .list:not(.list--inset)\r\n > .list-item--chevron:before": { right: "60px", }, "html[onsflag-iphonex-landscape]\r\n .page__content\r\n > .list:not(.list--inset)\r\n > .list-item\r\n > .list-item__center:last-child": - { - paddingRight: "50px", - }, + { + paddingRight: "50px", + }, "html[onsflag-iphonex-landscape]\r\n .page__content\r\n > .list:not(.list--inset)\r\n > .list-item\r\n > .list-item__right": - { - paddingRight: "56px", - }, + { + paddingRight: "56px", + }, "html[onsflag-iphonex-landscape]\r\n .page__content\r\n > .list:not(.list--inset)\r\n > .list-item\r\n > .list-item--chevron__right": - { - paddingRight: "74px", - }, + { + paddingRight: "74px", + }, "html[onsflag-iphonex-landscape] .dialog .page__content > .list:not(.list--inset)": { marginLeft: "0", marginRight: "0", @@ -5829,31 +5825,31 @@ const light_theme: any = { paddingLeft: "14px", }, "html[onsflag-iphonex-landscape]\r\n .dialog\r\n .page__content\r\n > .list:not(.list--inset)\r\n > .list-item--chevron:before": - { - right: "16px", - }, + { + right: "16px", + }, "html[onsflag-iphonex-landscape]\r\n .dialog\r\n .page__content\r\n > .list:not(.list--inset)\r\n > .list-item\r\n > .list-item__center:last-child": - { - paddingRight: "6px", - }, + { + paddingRight: "6px", + }, "html[onsflag-iphonex-landscape]\r\n .dialog\r\n .page__content\r\n > .list:not(.list--inset)\r\n > .list-item\r\n > .list-item__right": - { - paddingRight: "12px", - }, + { + paddingRight: "12px", + }, "html[onsflag-iphonex-landscape]\r\n .dialog\r\n .page__content\r\n > .list:not(.list--inset)\r\n > .list-item\r\n > .list-item--chevron__right": - { - paddingRight: "30px", - }, + { + paddingRight: "30px", + }, }, "@media (orientation: portrait)": { "html[onsflag-iphonex-portrait] .fab--top__left, html[onsflag-iphonex-portrait] .fab--top__center, html[onsflag-iphonex-portrait] .fab--top__right": - { - top: "64px", - }, + { + top: "64px", + }, "html[onsflag-iphonex-portrait] .fab--bottom__left, html[onsflag-iphonex-portrait] .fab--bottom__center, html[onsflag-iphonex-portrait] .fab--bottom__right": - { - bottom: "34px", - }, + { + bottom: "34px", + }, "html[onsflag-iphonex-portrait] .action-sheet": { bottom: "48px", }, @@ -5866,22 +5862,22 @@ const light_theme: any = { paddingTop: "44px", }, "html[onsflag-iphonex-portrait] .dialog .toolbar, html[onsflag-iphonex-portrait] .toolbar:not(.toolbar--cover-content)+.page__background+.page__content .toolbar, html[onsflag-iphonex-portrait] .tabbar--top__content .toolbar": - { - top: "0", - boxSizing: "border-box", - paddingTop: "0", - }, + { + top: "0", + boxSizing: "border-box", + paddingTop: "0", + }, "html[onsflag-iphonex-portrait] .bottom-bar": { bottom: "0", boxSizing: "content-box", paddingBottom: "34px", }, "html[onsflag-iphonex-portrait] .dialog .bottom-bar, html[onsflag-iphonex-portrait] .page-with-bottom-toolbar > .page__content .bottom-bar, html[onsflag-iphonex-portrait] .tabbar__content:not(.tabbar--top__content) .bottom-bar": - { - bottom: "0", - boxSizing: "border-box", - paddingBottom: "0", - }, + { + bottom: "0", + boxSizing: "border-box", + paddingBottom: "0", + }, "html[onsflag-iphonex-portrait] .page__content": { top: "0", paddingTop: "44px", @@ -5889,72 +5885,72 @@ const light_theme: any = { paddingBottom: "34px", }, "html[onsflag-iphonex-portrait] .dialog .page__content, html[onsflag-iphonex-portrait] .toolbar:not(.toolbar--cover-content)+.page__background+.page__content .page__content, html[onsflag-iphonex-portrait] .tabbar--top__content .page__content, html[onsflag-iphonex-portrait] .toolbar:not(.toolbar--cover-content)+.page__background+.page__content": - { - top: "0", - paddingTop: "0", - }, + { + top: "0", + paddingTop: "0", + }, "html[onsflag-iphonex-portrait] .dialog .page__content, html[onsflag-iphonex-portrait] .page-with-bottom-toolbar > .page__content .page__content, html[onsflag-iphonex-portrait] .tabbar__content:not(.tabbar--top__content) .page__content, html[onsflag-iphonex-portrait] .page-with-bottom-toolbar > .page__content": - { - bottom: "0", - paddingBottom: "0", - }, + { + bottom: "0", + paddingBottom: "0", + }, "html[onsflag-iphonex-portrait] .toolbar:not(.toolbar--cover-content) + .page__background, html[onsflag-iphonex-portrait]\r\n .toolbar:not(.toolbar--cover-content)\r\n + .page__background\r\n + .page__content": - { - top: "88px", - paddingTop: "0", - }, + { + top: "88px", + paddingTop: "0", + }, "html[onsflag-iphonex-portrait] .dialog .toolbar:not(.toolbar--cover-content)+.page__background, html[onsflag-iphonex-portrait] .dialog .toolbar:not(.toolbar--cover-content)+.page__background+.page__content, html[onsflag-iphonex-portrait] .toolbar:not(.toolbar--cover-content)+.page__background+.page__content .toolbar:not(.toolbar--cover-content)+.page__background, html[onsflag-iphonex-portrait] .toolbar:not(.toolbar--cover-content)+.page__background+.page__content .toolbar:not(.toolbar--cover-content)+.page__background+.page__content, html[onsflag-iphonex-portrait] .tabbar--top__content .toolbar:not(.toolbar--cover-content)+.page__background, html[onsflag-iphonex-portrait] .tabbar--top__content .toolbar:not(.toolbar--cover-content)+.page__background+.page__content": - { - top: "44px", - paddingTop: "0", - }, + { + top: "44px", + paddingTop: "0", + }, "html[onsflag-iphonex-portrait] .page-with-bottom-toolbar > .page__content": { bottom: "78px", paddingBottom: "0", }, "html[onsflag-iphonex-portrait] .dialog .page-with-bottom-toolbar > .page__content, html[onsflag-iphonex-portrait] .page-with-bottom-toolbar > .page__content .page-with-bottom-toolbar > .page__content, html[onsflag-iphonex-portrait] .tabbar__content:not(.tabbar--top__content) .page-with-bottom-toolbar > .page__content": - { - bottom: "44px", - paddingBottom: "0", - }, + { + bottom: "44px", + paddingBottom: "0", + }, "html[onsflag-iphonex-portrait]\r\n .toolbar.toolbar--transparent.toolbar--cover-content\r\n + .page__background\r\n + .page__content, html[onsflag-iphonex-portrait]\r\n .toolbar.toolbar--transparent.toolbar--cover-content\r\n + .page__background\r\n + .page__content\r\n .page_content": - { - top: "0", - paddingTop: "88px", - }, + { + top: "0", + paddingTop: "88px", + }, "html[onsflag-iphonex-portrait] .dialog .toolbar.toolbar--transparent.toolbar--cover-content+.page__background+.page__content, html[onsflag-iphonex-portrait] .dialog .toolbar.toolbar--transparent.toolbar--cover-content+.page__background+.page__content .page_content, html[onsflag-iphonex-portrait] .toolbar:not(.toolbar--cover-content)+.page__background+.page__content .toolbar.toolbar--transparent.toolbar--cover-content+.page__background+.page__content, html[onsflag-iphonex-portrait] .toolbar:not(.toolbar--cover-content)+.page__background+.page__content .toolbar.toolbar--transparent.toolbar--cover-content+.page__background+.page__content .page__content, html[onsflag-iphonex-portrait] .tabbar--top__content .toolbar.toolbar--transparent.toolbar--cover-content+.page__background+.page__content, html[onsflag-iphonex-portrait] .tabbar--top__content .toolbar.toolbar--transparent.toolbar--cover-content+.page__background+.page__content .page_content": - { - top: "0", - paddingTop: "44px", - }, + { + top: "0", + paddingTop: "44px", + }, "html[onsflag-iphonex-portrait] .tabbar--top": { paddingTop: "44px", }, "html[onsflag-iphonex-portrait] .dialog .tabbar--top, html[onsflag-iphonex-portrait] .toolbar:not(.toolbar--cover-content)+.page__background+.page__content .tabbar--top, html[onsflag-iphonex-portrait] .tabbar--top__content .tabbar--top": - { - paddingTop: "0", - }, + { + paddingTop: "0", + }, "html[onsflag-iphonex-portrait] .tabbar--top__content": { top: "93px", }, "html[onsflag-iphonex-portrait] .dialog .tabbar--top__content, html[onsflag-iphonex-portrait] .toolbar:not(.toolbar--cover-content)+.page__background+.page__content .tabbar--top__content, html[onsflag-iphonex-portrait] .tabbar--top__content .tabbar--top__content": - { - top: "49px", - }, + { + top: "49px", + }, "html[onsflag-iphonex-portrait] .tabbar:not(.tabbar--top):not(.tabbar--top)": { paddingBottom: "34px", }, "html[onsflag-iphonex-portrait] .dialog .tabbar:not(.tabbar--top):not(.tabbar--top), html[onsflag-iphonex-portrait] .page-with-bottom-toolbar > .page__content .tabbar:not(.tabbar--top), html[onsflag-iphonex-portrait] .tabbar__content:not(.tabbar--top__content) .tabbar:not(.tabbar--top)": - { - paddingBottom: "0", - }, + { + paddingBottom: "0", + }, "html[onsflag-iphonex-portrait] .tabbar__content:not(.tabbar--top__content)": { bottom: "83px", }, "html[onsflag-iphonex-portrait] .dialog .tabbar__content:not(.tabbar--top__content), html[onsflag-iphonex-portrait] .page-with-bottom-toolbar > .page__content .tabbar__content:not(.tabbar--top__content), html[onsflag-iphonex-portrait] .tabbar__content:not(.tabbar--top__content) .tabbar__content:not(.tabbar--top__content)": - { - bottom: "49px", - }, + { + bottom: "49px", + }, }, }, }; From b9cc3fd689b53aeaba62c5e4221a0c9de217449c Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 15:40:45 +0200 Subject: [PATCH 16/44] bump version --- Android/app/build.gradle | 4 ++-- Website/package.json | 4 ++-- update.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Android/app/build.gradle b/Android/app/build.gradle index dfb34a96e..5df982c70 100755 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId 'com.dergoogler.mmrl' minSdk 26 targetSdk 32 - versionName "1.4.1" - versionCode "141".toInteger() + versionName "1.4.2" + versionCode "142".toInteger() } buildTypes { release { diff --git a/Website/package.json b/Website/package.json index 798ee3c4a..7950def08 100644 --- a/Website/package.json +++ b/Website/package.json @@ -1,7 +1,7 @@ { "name": "com.dergoogler.mmrl.web", - "version": "1.4.1", - "versionCode": "141", + "version": "1.4.2", + "versionCode": "142", "description": "", "main": "index.tsx", "keywords": [], diff --git a/update.py b/update.py index 748993ebd..f9e4c497a 100644 --- a/update.py +++ b/update.py @@ -2,8 +2,8 @@ # Run "python3 update.py" -new_version = "1.4.1" -new_versionCode = 141 +new_version = "1.4.2" +new_versionCode = 142 Website_version = "./Website/package.json" Android_version = "./Android/app/build.gradle" From 644c35a45d71c8b19075efae3957401dd5ab8542 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 15:43:26 +0200 Subject: [PATCH 17/44] Remove some screenshots --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 1fce9ff44..c4c650473 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,6 @@ Use [this](https://dergoogler.com/repo-generator/) service to create a custom re - - - - - - From 4ad311c67dd4cbf1070bb40b131d903a8e5bc638 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 15:45:40 +0200 Subject: [PATCH 18/44] . --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index c4c650473..d74f69ed8 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,12 @@ Use [this](https://dergoogler.com/repo-generator/) service to create a custom re ## What MMRL Supports (Roadmap) -- [x] Custom repo loading +- [x] Custom repo loading (Since 1.4.2 mutiple repositories are supported) - [x] Translation - [x] Dark mode #### Android only -- [x] Custom theming - [x] View installed modules - [x] Remove installed modules - [x] Enable/Disable installed modules From 9fa3be326f6d45d1c237a018752e42faee1a6617 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 15:52:02 +0200 Subject: [PATCH 19/44] Update DeviceModule switches and fix md3 switch color --- Website/src/components/DeviceModule.tsx | 1 + Website/src/styles/light_theme.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Website/src/components/DeviceModule.tsx b/Website/src/components/DeviceModule.tsx index c528d6421..1be7a6ef8 100644 --- a/Website/src/components/DeviceModule.tsx +++ b/Website/src/components/DeviceModule.tsx @@ -85,6 +85,7 @@ class DeviceModule extends ViewX { {name} { diff --git a/Website/src/styles/light_theme.ts b/Website/src/styles/light_theme.ts index 479c70cb6..b2c2bd754 100644 --- a/Website/src/styles/light_theme.ts +++ b/Website/src/styles/light_theme.ts @@ -367,7 +367,7 @@ const light_theme: any = { bgColor: "#b0afaf", thumbColor: "#f1f1f1", checkedThumbColor: "#ffffff", - checkedBgColor: "#7c43bd", + checkedBgColor: "#4a148c", }), ".range": { From c66213e7c297ef1aeeb37e846467373ea7bd7347 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 20:09:52 +0200 Subject: [PATCH 20/44] Prevent null strings in repos --- Website/bun.lockb | Bin 204900 -> 205212 bytes Website/package.json | 2 +- Website/src/activitys/RepoActivity.tsx | 14 +++++++------- Website/src/utils/licenses.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Website/bun.lockb b/Website/bun.lockb index 4c44bb7fc115549e56bc5df1487b32a06795f85e..047a89ad2c77fa26e2bb601eb0181ee00e0eaf1d 100755 GIT binary patch delta 42372 zcmeI5eSFVV|Hr@kqBgaJu+fCvY&4}*8_iv%QBzb*nS0tW_i4lWQqrg?7H8B76F%N{UBBn+yYtDX&re-s_{Vwd^?jf7e4o3|`P`iIIWynS z*PZ&nOQ+u3I%e%m->a!z-YJ>V@9Z9JUM;?9>IHXi+ney>VBW^v{lde+t&#_D}UMtKexZ`_Eq233#r|<`G0%enRI#k>d}F^ zzXpQE`h8l>=L-o&4_KeClO+TDeY&bys{u7~R}XJH@AA0ZPg+%7^+LP7GXrY$Nt;QQ z7JVy__$s6-S0e>krJqrPa4>s1{1tQ(dL600a-`t4s^?9gFA!{KOVI7}xveUA4=LkT zYqw!fMPHzk(bq^F{TJf!eLofzHRl{v;+HKX*3oUnBp^Ge+RrF#$)PZ)^ zMkQEB2YCr@8g9Sdige{e=QYumkyW;ySfO6BxjEbF4N_Bmh5m=t z*bOJ2YE8BIWmSG8R%n#vvWlkbBRBm0dSNOxRx~&E{dxhVCdy~6qBqNnon-ATN)X&u zZB4fRDb_Em=v15jGpj6FAzV@FfOB4Dm7Z=Zkc}X{(57YOzu%_aR(HS>xX$mRHs5la z?~g54v??sL1s=Br+*U{Wq~)@TK4t9+%Vm{smF26k>PWFomtYnCpFQIsjw-p~AD)%_ z^~O+-B7(!T&X#an9l{37W!3aXth%(x@&!K^y; z4t{muJ)2KfPlb=M^6$W^qhDZkvwnqDkQM*Nre&4?+mQBhD^dZz!|J)V&!+!l?S3pj zzF+lWEf;%P#l`NYE;*{GPLI{Y?KJDJVeRQQpRCH�u56{Lie$G1BJ427(pTw?I}E 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 delta 42784 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

)nKZb5?)e<&O>6b(b! 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 { ...JSON.parse(this.pref.getString("repos", "[]")), { name: repoName, - website: data.website ? data.website : null, - support: data.support ? data.support : null, - donate: data.donate ? data.donate : null, - submitModule: data.submitModule ? data.submitModule : null, - last_update: data.last_update ? data.last_update : null, + website: util.typeCheck(data.website, null), + support: util.typeCheck(data.support, null), + donate: util.typeCheck(data.donate, null), + submitModule: util.typeCheck(data.submitModule, null), + last_update: util.typeCheck(data.last_update, null), modules: repoLink, readonly: false, isOn: false, @@ -248,7 +248,7 @@ class RepoActivity extends AppCompatActivity { const ListItem = (props: ListItemProps) => { return ( <> - {props.part ? ( + {props.part || props.part ? ( ", - "version": "1.2.5", + "version": "1.2.7", "license": "GPL-3.0", "repository": "https://github.com/DerGoogler/googlers-tools" }, From a7c0be6ec226b94a21d5b24375efa79c70280fb3 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 20:31:42 +0200 Subject: [PATCH 21/44] Fix FAB overlap locale modules --- Website/src/activitys/MainApplication.tsx | 30 ++++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/Website/src/activitys/MainApplication.tsx b/Website/src/activitys/MainApplication.tsx index 610b64d7a..f90d23233 100644 --- a/Website/src/activitys/MainApplication.tsx +++ b/Website/src/activitys/MainApplication.tsx @@ -1,11 +1,10 @@ -import Toolbar from "@Builders/ToolbarBuilder"; import { TabWrapper } from "@Components/TabWrapper"; import { ExtensionRounded, SettingsRounded } from "@mui/icons-material"; import { os } from "@Native/os"; import SharedPreferences from "@Native/SharedPreferences"; import { string } from "@Strings"; -import { Tab, Tabbar, TabbarRenderTab, ToolbarButton } from "react-onsenui"; -import { ActivityXRenderData, Fab } from "react-onsenuix"; +import { OnsFabElement } from "onsenui"; +import { ActivityXRenderData, Fab, TabbarEvent, Tab, Tabbar, TabbarRenderTab, Toolbar } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; import DeviceModuleFragment from "./fragments/DeviceModuleFragment"; import ExploreModuleFragment from "./fragments/ExploreModuleFragment"; @@ -30,26 +29,32 @@ interface Props { pushPage: any; } -interface States {} +interface States { + fabDisplay: string; +} class MainApplication extends AppCompatActivity { public constructor(props: Props | Readonly) { super(props); - this.state = {}; + this.state = { + fabDisplay: "", + }; this.openSettings = this.openSettings.bind(this); this.renderTabs = this.renderTabs.bind(this); this.onCreateFAB = this.onCreateFAB.bind(this); + + document.querySelector("ons-fab")?.hide(); } - public onCreateToolbar(): Toolbar.Props { + public onCreateToolbar() { return { title: "Magisk Module Repo Loader", addToolbarButtonPosition: "right", addToolbarButton: ( - + - + ), }; } @@ -62,7 +67,7 @@ class MainApplication extends AppCompatActivity { return ( <> { this.props.pushPage({ @@ -116,6 +121,13 @@ class MainApplication extends AppCompatActivity { swipeable={false} position={SharedPreferences.getBoolean("enableBottomTabs_switch", false) ? "bottom" : "top"} renderTabs={this.renderTabs} + onPreChange={(event: TabbarEvent) => { + if (event.index == 1) { + this.setState({ fabDisplay: "none" }); + } else { + this.setState({ fabDisplay: "" }); + } + }} /> ) : ( From 51f55f7965fdb28a6c4d1659f6bc2381cce0346e Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 20:50:34 +0200 Subject: [PATCH 22/44] Add new SharedPreference method --- Website/src/activitys/MainApplication.tsx | 7 +-- Website/src/activitys/RepoActivity.tsx | 47 +++++++++---------- .../fragments/ExploreModuleFragment.tsx | 19 +------- Website/src/native/SharedPreferences.ts | 25 +++++++++- 4 files changed, 50 insertions(+), 48 deletions(-) diff --git a/Website/src/activitys/MainApplication.tsx b/Website/src/activitys/MainApplication.tsx index f90d23233..a645de92c 100644 --- a/Website/src/activitys/MainApplication.tsx +++ b/Website/src/activitys/MainApplication.tsx @@ -4,7 +4,8 @@ import { os } from "@Native/os"; import SharedPreferences from "@Native/SharedPreferences"; import { string } from "@Strings"; import { OnsFabElement } from "onsenui"; -import { ActivityXRenderData, Fab, TabbarEvent, Tab, Tabbar, TabbarRenderTab, Toolbar } from "react-onsenuix"; +import { ToolbarButton } from "react-onsenui"; +import { ActivityXRenderData, Fab, TabbarEvent, Tab, Tabbar, TabbarRenderTab } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; import DeviceModuleFragment from "./fragments/DeviceModuleFragment"; import ExploreModuleFragment from "./fragments/ExploreModuleFragment"; @@ -52,9 +53,9 @@ class MainApplication extends AppCompatActivity { title: "Magisk Module Repo Loader", addToolbarButtonPosition: "right", addToolbarButton: ( - + - + ), }; } diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx index 41d8e1807..6c425671f 100644 --- a/Website/src/activitys/RepoActivity.tsx +++ b/Website/src/activitys/RepoActivity.tsx @@ -13,7 +13,7 @@ import { import { link, util } from "googlers-tools"; import ons from "onsenui"; import Icon from "@Components/Icon"; -import { AlertDialog as Dialog, Input, Switch } from "react-onsenui"; +import { AlertDialog as Dialog, Input, Switch, ToolbarButton } from "react-onsenui"; import Toast from "@Native/Toast"; import { os } from "@Native/os"; import { OverridableComponent } from "@mui/material/OverridableComponent"; @@ -147,7 +147,7 @@ class RepoActivity extends AppCompatActivity { } private getRepos(): Array { - return JSON.parse(this.pref.getString("repos", "[]")); + return this.pref.getJSON>("repos", []); } private removeRepo(item: any) { @@ -156,7 +156,7 @@ class RepoActivity extends AppCompatActivity { var index = array.indexOf(item); array.splice(index, 1); - this.pref.setString("repos", JSON.stringify(array)); + this.pref.setJSON>("repos", array); this.setState({ repos: this.getRepos() }); } @@ -166,7 +166,7 @@ class RepoActivity extends AppCompatActivity { if (item) { item.isOn = state; } - this.pref.setString("repos", JSON.stringify(array)); + this.pref.setJSON>("repos", array); } private addRepo() { @@ -178,23 +178,20 @@ class RepoActivity extends AppCompatActivity { .get(repoLink) .then((response) => { const data = response.data; - this.pref.setString( - "repos", - JSON.stringify([ - ...JSON.parse(this.pref.getString("repos", "[]")), - { - name: repoName, - website: util.typeCheck(data.website, null), - support: util.typeCheck(data.support, null), - donate: util.typeCheck(data.donate, null), - submitModule: util.typeCheck(data.submitModule, null), - last_update: util.typeCheck(data.last_update, null), - modules: repoLink, - readonly: false, - isOn: false, - }, - ]) - ); + this.pref.setJSON>("repos", [ + ...this.pref.getJSON>("repos", []), + { + name: repoName, + website: util.typeCheck(data.website, null), + support: util.typeCheck(data.support, null), + donate: util.typeCheck(data.donate, null), + submitModule: util.typeCheck(data.submitModule, null), + last_update: util.typeCheck(data.last_update, null), + modules: repoLink, + readonly: false, + isOn: false, + }, + ]); this.hideAlertDialog(); }) @@ -219,11 +216,9 @@ class RepoActivity extends AppCompatActivity { onBackButton: this.props.popPage, addToolbarButtonPosition: "right", addToolbarButton: ( - - - - - + + + ), }; } diff --git a/Website/src/activitys/fragments/ExploreModuleFragment.tsx b/Website/src/activitys/fragments/ExploreModuleFragment.tsx index f71fca141..cba3f68ab 100644 --- a/Website/src/activitys/fragments/ExploreModuleFragment.tsx +++ b/Website/src/activitys/fragments/ExploreModuleFragment.tsx @@ -52,7 +52,7 @@ class ExploreModuleFragment extends Component { }, 2000); RepoActivity.getReadOnlyRepos() - .concat(JSON.parse(this.pref.getString("repos", "[]"))) + .concat(this.pref.getJSON>("repos", [])) .map((repo: RepoInterface) => { if (repo.isOn) { axios @@ -75,23 +75,6 @@ class ExploreModuleFragment extends Component { } // If the repo is disabled, do nothing. }); - /* axios - .get(this.prefManager.getString("repo", "https://raw.githubusercontent.com/Magisk-Modules-Alt-Repo/json/main/modules.json")) - .then((response) => { - const modules = response.data.modules; - this.setState({ - modulesIndex: modules, - }); - }) - .catch((error) => { - this.setState({ - modulesIndex: [], - }); - }) - .then(() => { - // always executed - });*/ - axios.get("https://dergoogler.com/repo/moduleOptions.json").then((response) => { this.setState({ moduleOptions: response.data, diff --git a/Website/src/native/SharedPreferences.ts b/Website/src/native/SharedPreferences.ts index 11cf5e1a8..1c770cbea 100644 --- a/Website/src/native/SharedPreferences.ts +++ b/Website/src/native/SharedPreferences.ts @@ -5,14 +5,16 @@ export interface ISharedPreferences { setString(key: string, value: string): void; setBoolean(key: string, value: bool): void; setInt(key: string, value: int): void; + setJSON(key: string, value: T): void; getString(key: string, defValue: string): string; getBoolean(key: string, defValue: boolean): boolean; getInt(key: string, defValue: int): int; + getJSON(key: string, defValue: T): T; removePref(key: string): void; clearPrefs(): void; } -declare const nsharedpreferences: ISharedPreferences; +declare const nsharedpreferences: Record any>; /** * Simple class to manage the web local sotrage and the Android native preferences @@ -48,6 +50,14 @@ class SharedPreferences implements ISharedPreferences { } } + public setJSON(key: string, value: T): void { + if (os.isAndroid) { + nsharedpreferences.setInt(key, JSON.stringify(value)); + } else { + this.webStorage.setItem(key, JSON.stringify(value)); + } + } + /** * Retrieve a String value from the preferences. * @@ -121,6 +131,19 @@ class SharedPreferences implements ISharedPreferences { } } + public getJSON(key: string, defValue: T): T { + if (os.isAndroid) { + return JSON.parse(nsharedpreferences.getInt(key, JSON.stringify(defValue))); + } else { + const get = this.webStorage.getItem(key); + if (get === null) { + return defValue; + } else { + return JSON.parse(get); + } + } + } + /** * Removes the key/value pair with the given key, if a key/value pair with the given key exists. * From 391e46becda5f052d9c717ca919a3df7649ecfdd Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Sun, 17 Jul 2022 22:06:51 +0200 Subject: [PATCH 23/44] Code improvements and updated translation --- Website/bun.lockb | Bin 205212 -> 205212 bytes Website/src/activitys/AppCompatActivity.tsx | 5 +- Website/src/activitys/MainApplication.tsx | 1 + Website/src/activitys/NoRootActivity.tsx | 13 +- Website/src/activitys/RepoActivity.tsx | 4 +- Website/src/activitys/ViewModuleActivity.tsx | 138 +++++++------------ Website/src/language/de.json | 6 +- Website/src/language/en.json | 6 +- 8 files changed, 75 insertions(+), 98 deletions(-) diff --git a/Website/bun.lockb b/Website/bun.lockb index 047a89ad2c77fa26e2bb601eb0181ee00e0eaf1d..413b48ded67ed2e42ba5ea8de73eeed87a44e49c 100755 GIT binary patch delta 13778 zcmc&(zi%8x6n;(&!p8iPAU{9~G)O@fc10QrB2iJKra(ws&g*bz-=4LbIEwi3B2m!s z7g!V&C{_<&^!d$v?|t)T-rL!e)2)-! zt%qydA4&1E`Q-8+|Ec-@+w{E1n#Idck@qZe9smE~+Vmpks_lJk0opD~|j4P(DhLP;FmDk~% z;g0o`(90S1SUWFb%d2gYCIqqNh5jD$Gy5ll>>$|_`TGTtSFj5>pF5^Lg9D7!R$d1n zw!GR*u5iSbS3TA)gfqy$=1CKR*z#(lYz;_kdA0r43F3@;%g-|)OY-UAaU$QoB=WL7 z1Kcq68604&w(>dvvE|ifa)l$dyy~%bA)L`RNfUzD^5Xn470WGK+Y@t_jPq&A$Ca-( zMeu8Qbs6Y_al)VRaKm*R&rR46Q=h>B#;V+BB%dLSHxbE~_E4TcBuCkDQ1$KFkJ85j;D z@$DqblT73~8jW(>J;!tz*bpPhU^vZE?CtL`cEd*Jf|>r$#gP441UqfzbvS2m{x*>- z9I@qP{}(}4XH~UL(gajNjr`2u&vAt@e~UrvcWl%*kj?WCsbMkne_U15=#I$EQMzls&oEsEc8EcL%2nfG zTxan7VSbiK6PMWXYAj-|dy-}86yePua1{*tyBP{6ymRYtw101$pP(o(`#IJR)6f$( zoKJ&A(vaBln*PsE!bM^(Q#P7pgME>mU1S$uNvy`y)o{U%Bw-FIGg>VOT@hPe?N|P1=>J?IW|?J)<==eytYWmo9V8E@1-q3P>(BgzD-9#rX_@_9 z6O$L)Sf6(^-{2ag?AOXJCq4%KfDZBzxSHnnldZvew zh%K)|r4`b|CAPd;StqXDySP^6CFDU=@dt{e zA+hDvU2h575nEpLe|^d?)Sr*weW{>*5nEpLe<8P1<6MCLeafFJqi^i>%xQBV**n3@ z@629ami^>en7SH9vQs(B!$`!I7x%wLeh&$~9MlT&{CalrV4@|-8j|qh)uQ1nF)9-o zEBe1G2~`*u)mT1;Q{^kV@R*vCADN_vLmNg%Wq!dJzWx66gQ8LKQOn%_g_pG^;>CcK z9an$yU&Z+!FS#64VE@;n{JHikKl-0u<>&ohpYjjc|HVDw>XT6Wl^^$iy~@x2yHEKy hz;7CmzEr^b|M~=poFCe+{PN?KjdPE$Y@Gl8(*LVmz@Y#D delta 13778 zcmc&(zi%8x6n+i{;b4AAf$&2L70AenT_sHlkPrn$8X5{f%H_NcclPaByTMVEz_UaV z(eM{o6cmV(iij5XG&Gcmzkt60_`bQ>+z;KYXLsN1T6fyh=Qs1c_syG`H?yZ_o2O@+ zKd)_Hd*{E8AKm=$#>Fjt^}M5go)2Rp-jk~5*0h8jk) z(^_8JIl~#-P{KyeXoIn9MC^IBPSRKqdtT_@Kz?TbsFxiidm?{g(S07hvA=Lkn>03P ztF^o~AojdkO)fiP&#Mi_&cYewU-hK1AojdkDO(MRJ+IcEIwsC&WBIuTWJx|gJWk}{ zvm(#=H6RSrCXEf+YAvq~h&``Xlgp0S^J;^!vv5Z1B#i~J=jHy#r7$d8>)Uab4D)e% z4fW2giz4_qUR?%;VC?XF9CA30!f~nze}XHF*;@=^zha`kjBK7gq}pPr|7<&~*dO=* zc+s8j4EF!Y4M;~SsHyzSnVZtC2*B)g*iTkYYLn9=3Q=$MP}cD+Fh;zHvF+$!Z;%~{{DZc|Mx@I?ON_){By>mQ_8{GLzo(ck16#zP zKjkX%Fs?H=f4ILT(!?e9yc&y`UjVSb8Df!WWt z%`mm@uws8|7D+{7&+F>HW)jX5bC|NhDC_Nu?Cc`D_)20mrlE#&b|kS`q>z8bQfSj* z#s1v=-;#B?EoXFbLuiZG^J=&9pP>E=iJ03gw^)8>x6eh4cDRG&;xuQs665|e+u=&X zNOoFef7`_5#WdC@70m-&gB0~zQRT$PpnrUl5)STvTpleW=IWUDau)W&r+X>90@F~# zNOpRzhmnXquR^62(!?e9yt*(>9J{x0t;$Qt?_LqX$K^*XOxqwS;h5b2#fq+k*sF^9 zXC*a = createContext("null"); @@ -11,6 +11,8 @@ export const AppCompatActivityContext: Context = createContext("null"); class AppCompatActivity

extends ActivityX { public readonly isAndroid: bool = Constants.isAndroid; + public pageStyle: React.CSSProperties = {}; + private darkColor: string = "#1f1f1f"; private lightColor: string = "#4a148c"; @@ -82,6 +84,7 @@ class AppCompatActivity

extends ActivityX { { ); } + public componentDidUpdate() { super.componentDidUpdate; } diff --git a/Website/src/activitys/NoRootActivity.tsx b/Website/src/activitys/NoRootActivity.tsx index 036693cc6..55afbdf7a 100644 --- a/Website/src/activitys/NoRootActivity.tsx +++ b/Website/src/activitys/NoRootActivity.tsx @@ -2,6 +2,7 @@ import { Button, Card } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; import Toast from "@Native/Toast"; import Toolbar from "@Builders/ToolbarBuilder"; +import { string } from "@Strings"; class NoRootActivity extends AppCompatActivity { private readonly magiskPackageName: string = "com.topjohnwu.magisk"; @@ -9,7 +10,7 @@ class NoRootActivity extends AppCompatActivity { public onCreateToolbar(): Toolbar.Props { return { - title: "No Root", + title: string.no_root, }; } @@ -17,14 +18,12 @@ class NoRootActivity extends AppCompatActivity { return (

-
Failed!
-
- It seems that this device has no root? Please check the Magisk app and enable root permission. If you don't have root, then - search in the internet for your device. -
+
{string.failed}!
+
{string.no_root_message}
); diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx index 6c425671f..59115a57a 100644 --- a/Website/src/activitys/RepoActivity.tsx +++ b/Website/src/activitys/RepoActivity.tsx @@ -243,7 +243,7 @@ class RepoActivity extends AppCompatActivity { const ListItem = (props: ListItemProps) => { return ( <> - {props.part || props.part ? ( + {props.part && ( {
{props.text}
 - ) : null} + )} ); }; diff --git a/Website/src/activitys/ViewModuleActivity.tsx b/Website/src/activitys/ViewModuleActivity.tsx index 06bab6429..3c05059e7 100644 --- a/Website/src/activitys/ViewModuleActivity.tsx +++ b/Website/src/activitys/ViewModuleActivity.tsx @@ -11,6 +11,8 @@ import AppCompatActivity from "./AppCompatActivity"; import { string } from "@Strings"; import Magisk from "@Native/Magisk"; import Toolbar from "@Builders/ToolbarBuilder"; +import { CSSProperties } from "react"; +import { link } from "googlers-tools"; interface Props { extra?: any; @@ -24,6 +26,7 @@ interface States { class ViewModuleActivity extends AppCompatActivity { public static readonly ignoreURL: bool = true; + public pageStyle: CSSProperties = { marginBottom: "28px" }; public constructor(props: Props | Readonly) { super(props); @@ -91,21 +94,14 @@ class ViewModuleActivity extends AppCompatActivity { style={{ padding: "8px", height: "100%" }} className={new SharedPreferences().getBoolean("enableDarkmode_switch", false) ? "markdown-body-dark" : "markdown-body-light"} > - { - /* - // @ts-ignore */ - (() => { - if (verified) { - return ( - } severity="success"> - {string.module_verified} - - ); - } - })() - } - + {verified && ( + } severity="success"> + {string.module_verified} + + )} +
+
{
- {(() => { - if (minMagisk != (null || undefined)) { - return ( - - - - - ); - } else { - return null; - } - })()} - {(() => { - if (minApi != (null || undefined)) { - return ( - - - - - ); - } else { - return null; - } - })()} - {(() => { - if (maxApi != (null || undefined)) { - return ( - - - - - ); - } else { - return null; - } - })()} - {(() => { - if (needRamdisk != (null || undefined)) { - return ( - - - - - ); - } else { - return null; - } - })()} - {(() => { - if (changeBoot != (null || undefined)) { - return ( - - - - - ); - } else { - return null; - } - })()} + {minMagisk != (null || undefined) && ( + + + + + )} + {minApi != (null || undefined) && ( + + + + + )} + {maxApi != (null || undefined) && ( + + + + + )} + {needRamdisk != (null || undefined) && ( + + + + + )} + {changeBoot != (null || undefined) && ( + + + + + )}
Informations
- Min. Magisk - Magisk.VERSION_CODE ? "red" : "") : "", - }} - > - {minMagisk} -
Min. Android{minApi}
Max. Android{maxApi}
needsRamdisk{needRamdisk}
changeBoot{changeBoot}
+ Min. Magisk + Magisk.VERSION_CODE ? "red" : "") : "", + }} + > + {minMagisk} +
Min. Android{minApi}
Max. Android{maxApi}
needsRamdisk{needRamdisk}
changeBoot{changeBoot}
diff --git a/Website/src/language/de.json b/Website/src/language/de.json index 17e5f7cff..913dd918c 100644 --- a/Website/src/language/de.json +++ b/Website/src/language/de.json @@ -31,5 +31,9 @@ "submit_module": "Ein Module einreichen", "donate": "Spenden", "support": "Support", - "website": "Webseite" + "website": "Webseite", + "no_root": "Kein Root", + "failed": "Fehlgeschlagen", + "no_root_message": "Scheint, dass keine Root-Berechtigungen vorhanden sind? Wenn Sie Magisk (Delta) installiert haben, können Sie es direkt von hier aus öffnen.", + "open_magisk": "Magisk öffnen" } diff --git a/Website/src/language/en.json b/Website/src/language/en.json index 18c3e9286..b5d5d3f38 100644 --- a/Website/src/language/en.json +++ b/Website/src/language/en.json @@ -31,5 +31,9 @@ "submit_module": "Submit a module", "donate": "Donate", "support": "Support", - "website": "Website" + "website": "Website", + "no_root": "No Root", + "failed": "Failed", + "no_root_message": "Seems that you'e doesn't having root permissions? If you have Magisk (Delta) installed you can directly open it from here.", + "open_magisk": "Open Magisk" } From 0a9574df9c06f380ca24777090d8c630c9590f92 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Mon, 18 Jul 2022 10:55:10 +0200 Subject: [PATCH 24/44] Design improvements --- Website/bun.lockb | Bin 205212 -> 204900 bytes Website/package.json | 2 +- Website/src/activitys/AppCompatActivity.tsx | 42 +++++++++----------- Website/src/activitys/MainApplication.tsx | 11 ++--- Website/src/activitys/RepoActivity.tsx | 6 +-- Website/src/components/Icon.tsx | 7 +++- Website/src/styles/dark_theme.ts | 1 - Website/src/utils/licenses.json | 4 +- 8 files changed, 36 insertions(+), 37 deletions(-) diff --git a/Website/bun.lockb b/Website/bun.lockb index 413b48ded67ed2e42ba5ea8de73eeed87a44e49c..e186bc41240e5d819c984b90f065d574165c64fb 100755 GIT binary patch delta 42887 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 delta 42472 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 = createContext("null"); - class AppCompatActivity

extends ActivityX { public readonly isAndroid: bool = Constants.isAndroid; @@ -16,8 +14,6 @@ class AppCompatActivity

extends ActivityX { private darkColor: string = "#1f1f1f"; private lightColor: string = "#4a148c"; - public static contextType: Context = AppCompatActivityContext; - public constructor(props: P | Readonly

) { super(props); this.onlyAndroid(); @@ -81,26 +77,24 @@ class AppCompatActivity

extends ActivityX { public render = (): JSX.Element => { return ( - - - { - return ; - }} - > - - - - + + { + return ; + }} + > + + + ); }; } diff --git a/Website/src/activitys/MainApplication.tsx b/Website/src/activitys/MainApplication.tsx index 3b7dabca6..ee110184c 100644 --- a/Website/src/activitys/MainApplication.tsx +++ b/Website/src/activitys/MainApplication.tsx @@ -1,3 +1,4 @@ +import Icon from "@Components/Icon"; import { TabWrapper } from "@Components/TabWrapper"; import { ExtensionRounded, SettingsRounded } from "@mui/icons-material"; import { os } from "@Native/os"; @@ -5,7 +6,7 @@ import SharedPreferences from "@Native/SharedPreferences"; import { string } from "@Strings"; import { OnsFabElement } from "onsenui"; import { ToolbarButton } from "react-onsenui"; -import { ActivityXRenderData, Fab, TabbarEvent, Tab, Tabbar, TabbarRenderTab } from "react-onsenuix"; +import { ActivityXRenderData, Fab, TabbarEvent, Tab, Tabbar, TabbarRenderTab, Toolbar } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; import DeviceModuleFragment from "./fragments/DeviceModuleFragment"; import ExploreModuleFragment from "./fragments/ExploreModuleFragment"; @@ -53,9 +54,10 @@ class MainApplication extends AppCompatActivity { title: "Magisk Module Repo Loader", addToolbarButtonPosition: "right", addToolbarButton: ( - - - + + + {/**/} + ), }; } @@ -90,7 +92,6 @@ class MainApplication extends AppCompatActivity { ); } - public componentDidUpdate() { super.componentDidUpdate; } diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx index 59115a57a..f7ec53ed1 100644 --- a/Website/src/activitys/RepoActivity.tsx +++ b/Website/src/activitys/RepoActivity.tsx @@ -216,9 +216,9 @@ class RepoActivity extends AppCompatActivity { onBackButton: this.props.popPage, addToolbarButtonPosition: "right", addToolbarButton: ( - - - + + + ), }; } diff --git a/Website/src/components/Icon.tsx b/Website/src/components/Icon.tsx index a595a0d49..246943408 100644 --- a/Website/src/components/Icon.tsx +++ b/Website/src/components/Icon.tsx @@ -22,12 +22,17 @@ class Icon extends ViewX { super(props); this.pref = new SharedPreferences(); this.isDarkmode = this.pref.getBoolean("enableDarkmode_switch", false); + + this.createView = this.createView.bind(this); } public createView(data: ViewXRenderData): JSX.Element { return ( ); diff --git a/Website/src/styles/dark_theme.ts b/Website/src/styles/dark_theme.ts index 8027d1e5b..b030692a4 100644 --- a/Website/src/styles/dark_theme.ts +++ b/Website/src/styles/dark_theme.ts @@ -2410,7 +2410,6 @@ const dark_theme: any = { }, ], display: "inline-block", - padding: "0 12px", height: "100%", margin: "0", border: "none", diff --git a/Website/src/utils/licenses.json b/Website/src/utils/licenses.json index 5b45b48e4..d625f7576 100644 --- a/Website/src/utils/licenses.json +++ b/Website/src/utils/licenses.json @@ -169,9 +169,9 @@ }, { "name": "react-onsenuix", - "description": "Onsen UI - React Components for Hybrid Cordova/PhoneGap Apps with Material Design and iOS UI components", + "description": "React Onsen UI, but Typed!", "author": "Der_Googler ", - "version": "1.0.5", + "version": "1.0.6", "license": "null", "repository": "https://github.com/DerGoogler/react-onsenuix" }, From cc9d40a8e98e783a62bea9a376867324aa668154 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Mon, 18 Jul 2022 12:46:52 +0200 Subject: [PATCH 25/44] Improve search --- .../fragments/ExploreModuleFragment.tsx | 83 ++++++------------- Website/src/components/ExploreModule.tsx | 23 ----- Website/src/components/Searchbar.tsx | 65 +++++++++++++++ 3 files changed, 92 insertions(+), 79 deletions(-) create mode 100644 Website/src/components/Searchbar.tsx diff --git a/Website/src/activitys/fragments/ExploreModuleFragment.tsx b/Website/src/activitys/fragments/ExploreModuleFragment.tsx index cba3f68ab..d3f7f5350 100644 --- a/Website/src/activitys/fragments/ExploreModuleFragment.tsx +++ b/Website/src/activitys/fragments/ExploreModuleFragment.tsx @@ -12,17 +12,27 @@ import { string } from "@Strings"; import { isTablet } from "react-device-detect"; import RepoActivity, { RepoInterface } from "@Activitys/RepoActivity"; import Toast from "@Native/Toast"; +import { Searchbar } from "@Components/Searchbar"; interface Props { pushPage(...arg: any): PushProps; } interface States { - modulesIndex: Array; - currentSerachText: string; - search: string; + modulesIndex: Array; moduleOptions: any[any]; loading: boolean; + searchValue: string; + finalSearchValue: string; +} + +interface ModuleObject { + id: string; + last_update: number; + notes_url: string; + prop_url: string; + stars: number; + zip_url: string; } class ExploreModuleFragment extends Component { @@ -33,10 +43,10 @@ class ExploreModuleFragment extends Component { super(props); this.state = { modulesIndex: [], - currentSerachText: "", - search: "", moduleOptions: {}, loading: true, + searchValue: "", + finalSearchValue: "", }; this.pref = new SharedPreferences(); } @@ -85,19 +95,21 @@ class ExploreModuleFragment extends Component { public componentDidCatch = () => {}; private filter = (e: any) => { - this.setState({ currentSerachText: e.target.value.toLowerCase() }); + this.setState((state: Readonly, props: Readonly) => ({ + searchValue: e.target.value, + })); }; private triggerSearch = () => { this.setState((state: Readonly, props: Readonly) => ({ - search: state.currentSerachText, + finalSearchValue: state.searchValue, })); }; public render = () => { - const { search, loading, modulesIndex } = this.state; + const { loading, modulesIndex, searchValue, finalSearchValue } = this.state; - const resultsRender = []; + const resultsRender: Array = []; for (var i = 0; i < modulesIndex.length; i += 2) { resultsRender.push({this.cardRender(modulesIndex.slice(i, i + 2))}); @@ -115,49 +127,7 @@ class ExploreModuleFragment extends Component { flexDirection: "column", }} > -

- - -
+ { ); }; - private cardRender(map: Array) { - return map + private cardRender(map: Array) { + const filteredModules = map.filter((item) => item.id.toLowerCase().includes(this.state.finalSearchValue.toLowerCase())); + + return filteredModules .sort((a, b) => (a.id > b.id ? 1 : -1)) - .map((item: any) => { + .map((item) => { return ( { notesUrl={item.notes_url} downloadUrl={item.zip_url} pushPage={this.props.pushPage} - searchState={this.state.search} moduleOptions={this.state.moduleOptions} last_update={item.last_update} /> diff --git a/Website/src/components/ExploreModule.tsx b/Website/src/components/ExploreModule.tsx index dab27c04f..1bb63fc26 100644 --- a/Website/src/components/ExploreModule.tsx +++ b/Website/src/components/ExploreModule.tsx @@ -19,7 +19,6 @@ interface Props { stars?: int; last_update?: any; getId: any; - searchState?: string; propsUrl: string; } @@ -73,28 +72,6 @@ class ExploreModule extends ViewX { }); }; - public componentDidUpdate() { - const { searchState } = this.props; - dom.findBy(this.cardName, (ref) => { - if (searchState != "") { - const search = ref.textContent || ref.innerText; - if (search.toLowerCase().indexOf(searchState) > -1) { - dom.findBy(this.searchedCard, (ref: HTMLElement) => { - ref.style.display = ""; - }); - } else { - dom.findBy(this.searchedCard, (ref: HTMLElement) => { - ref.style.display = "none"; - }); - } - } else { - dom.findBy(this.searchedCard, (ref: HTMLElement) => { - ref.style.display = ""; - }); - } - }); - } - private formatDate(date: Date) { var hours = date.getHours(); var minutes = date.getMinutes(); diff --git a/Website/src/components/Searchbar.tsx b/Website/src/components/Searchbar.tsx new file mode 100644 index 000000000..a54259a8a --- /dev/null +++ b/Website/src/components/Searchbar.tsx @@ -0,0 +1,65 @@ +import { SearchRounded } from "@mui/icons-material"; +import { SearchInput } from "react-onsenui"; +import { Button, ViewX, ViewXRenderData } from "react-onsenuix"; + +interface SearchbarProps { + placeholder: string; + onInputChange: (e: Event) => void; + onButtonClick: () => void; +} + +class Searchbar extends ViewX { + public constructor(props: SearchbarProps | Readonly) { + super(props); + this.createView = this.createView.bind(this); + } + + public createView(data: ViewXRenderData): JSX.Element { + return ( +
+ + +
+ ); + } +} + +export { Searchbar }; From d762d5f81bdbb0b2cffc067a29f8826e3f39dae8 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Mon, 18 Jul 2022 13:33:09 +0200 Subject: [PATCH 26/44] ! - Fix searchbar is not fillig display width - Added search to repo screen - Some code improvements --- Website/src/activitys/MainApplication.tsx | 44 +---- Website/src/activitys/RepoActivity.tsx | 218 ++++++++++++---------- Website/src/components/DeviceModule.tsx | 1 - Website/src/components/Searchbar.tsx | 1 + 4 files changed, 124 insertions(+), 140 deletions(-) diff --git a/Website/src/activitys/MainApplication.tsx b/Website/src/activitys/MainApplication.tsx index ee110184c..30725a129 100644 --- a/Website/src/activitys/MainApplication.tsx +++ b/Website/src/activitys/MainApplication.tsx @@ -1,12 +1,10 @@ import Icon from "@Components/Icon"; import { TabWrapper } from "@Components/TabWrapper"; -import { ExtensionRounded, SettingsRounded } from "@mui/icons-material"; +import { SettingsRounded } from "@mui/icons-material"; import { os } from "@Native/os"; import SharedPreferences from "@Native/SharedPreferences"; import { string } from "@Strings"; -import { OnsFabElement } from "onsenui"; -import { ToolbarButton } from "react-onsenui"; -import { ActivityXRenderData, Fab, TabbarEvent, Tab, Tabbar, TabbarRenderTab, Toolbar } from "react-onsenuix"; +import { ActivityXRenderData, Tab, Tabbar, TabbarRenderTab, Toolbar } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; import DeviceModuleFragment from "./fragments/DeviceModuleFragment"; import ExploreModuleFragment from "./fragments/ExploreModuleFragment"; @@ -45,8 +43,6 @@ class MainApplication extends AppCompatActivity { this.openSettings = this.openSettings.bind(this); this.renderTabs = this.renderTabs.bind(this); this.onCreateFAB = this.onCreateFAB.bind(this); - - document.querySelector("ons-fab")?.hide(); } public onCreateToolbar() { @@ -55,8 +51,7 @@ class MainApplication extends AppCompatActivity { addToolbarButtonPosition: "right", addToolbarButton: ( - - {/**/} + ), }; @@ -66,32 +61,6 @@ class MainApplication extends AppCompatActivity { os.close(); } - public onCreateFAB(): JSX.Element { - return ( - <> - { - this.props.pushPage({ - key: "repoactivity", - activity: RepoActivity, - }); - }} - position="bottom right" - > - - - - - - ); - } - public componentDidUpdate() { super.componentDidUpdate; } @@ -124,13 +93,6 @@ class MainApplication extends AppCompatActivity { swipeable={false} position={SharedPreferences.getBoolean("enableBottomTabs_switch", false) ? "bottom" : "top"} renderTabs={this.renderTabs} - onPreChange={(event: TabbarEvent) => { - if (event.index == 1) { - this.setState({ fabDisplay: "none" }); - } else { - this.setState({ fabDisplay: "" }); - } - }} /> ) : ( diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx index f7ec53ed1..57d4f151c 100644 --- a/Website/src/activitys/RepoActivity.tsx +++ b/Website/src/activitys/RepoActivity.tsx @@ -21,6 +21,7 @@ import { SvgIconTypeMap } from "@mui/material/SvgIcon/SvgIcon"; import axios from "axios"; import { string } from "@Strings"; import { Fragment } from "react"; +import { Searchbar } from "@Components/Searchbar"; interface Props { pushPage: any; @@ -32,6 +33,8 @@ interface States { alertDialogShown: boolean; repoName: string; repoLink: string; + searchValue: string; + finalSearchValue: string; } interface ListItemProps { @@ -79,6 +82,8 @@ class RepoActivity extends AppCompatActivity { alertDialogShown: false, repoName: "", repoLink: "", + searchValue: "", + finalSearchValue: "", }; this.addRepo = this.addRepo.bind(this); @@ -90,6 +95,8 @@ class RepoActivity extends AppCompatActivity { this.showAlertDialog = this.showAlertDialog.bind(this); this.handleRepoLinkChange = this.handleRepoLinkChange.bind(this); this.handleRepoNameChange = this.handleRepoNameChange.bind(this); + this.repoSearchFilter = this.repoSearchFilter.bind(this); + this.triggerRepoSearch = this.triggerRepoSearch.bind(this); } // Contact @Der_Googler on Telegram to request changes @@ -217,7 +224,7 @@ class RepoActivity extends AppCompatActivity { addToolbarButtonPosition: "right", addToolbarButton: ( - + ), }; @@ -238,6 +245,18 @@ class RepoActivity extends AppCompatActivity { this.setState({ repoLink: e.target.value }); } + private repoSearchFilter(e: any) { + this.setState((state: Readonly, props: Readonly) => ({ + searchValue: e.target.value, + })); + } + + private triggerRepoSearch() { + this.setState((state: Readonly, props: Readonly) => ({ + finalSearchValue: state.searchValue, + })); + } + // Some layout atr inspired from @Fox2Code public onCreate(data: ActivityXRenderData): JSX.Element { const ListItem = (props: ListItemProps) => { @@ -263,106 +282,109 @@ class RepoActivity extends AppCompatActivity { return !SharedPreferences.getBoolean("enableHideReadonlyRepositories_switch", false) ? RepoActivity.getReadOnlyRepos() : []; }; + const filteredRepos = roReposOption() + .concat(data.s.repos) + .filter((item) => item.name.toLowerCase().includes(this.state.finalSearchValue.toLowerCase())); + return ( <> + - {roReposOption() - .concat(data.s.repos) - .map((repo: RepoInterface, index: number) => ( - - - {repo.name} - {repo.readonly ? " (Read-Only)" : ""} - - {}} - > -
- -
- -
Enabled
-
- { - switch (repo.built_in_type) { - case "MMAR": - this.pref.setBoolean("repoMMARenabled", e.target.checked); - break; - case "GMR": - this.pref.setBoolean("repoGMRenabled", e.target.checked); - break; - default: - this.changeEnabledState(e.target.checked); - break; - } - }} - /> -
- - { - if (repo.website) { - os.open(repo.website); - } - }} - /> - { - if (repo.support) { - os.open(repo.support); - } - }} - /> - { - if (repo.donate) { - os.open(repo.donate); - } - }} - /> - { - if (repo.submitModule) { - os.open(repo.submitModule); - } - }} - /> - { - ons.notification - .confirm( - string.formatString(string.confirm_repo_delete, { - name: repo.name, - }) as string - ) - .then((g) => { - if (g) { - this.removeRepo(repo); - } - }); - }} - /> - - ))} + {filteredRepos.map((repo: RepoInterface, index: number) => ( + + + {repo.name} + {repo.readonly ? " (Read-Only)" : ""} + + {}} + > +
+ +
+ +
Enabled
+
+ { + switch (repo.built_in_type) { + case "MMAR": + this.pref.setBoolean("repoMMARenabled", e.target.checked); + break; + case "GMR": + this.pref.setBoolean("repoGMRenabled", e.target.checked); + break; + default: + this.changeEnabledState(e.target.checked); + break; + } + }} + /> +
+ + { + if (repo.website) { + os.open(repo.website); + } + }} + /> + { + if (repo.support) { + os.open(repo.support); + } + }} + /> + { + if (repo.donate) { + os.open(repo.donate); + } + }} + /> + { + if (repo.submitModule) { + os.open(repo.submitModule); + } + }} + /> + { + ons.notification + .confirm( + string.formatString(string.confirm_repo_delete, { + name: repo.name, + }) as string + ) + .then((g) => { + if (g) { + this.removeRepo(repo); + } + }); + }} + /> + + ))} <> diff --git a/Website/src/components/DeviceModule.tsx b/Website/src/components/DeviceModule.tsx index 1be7a6ef8..836266849 100644 --- a/Website/src/components/DeviceModule.tsx +++ b/Website/src/components/DeviceModule.tsx @@ -76,7 +76,6 @@ class DeviceModule extends ViewX { diff --git a/Website/src/components/Searchbar.tsx b/Website/src/components/Searchbar.tsx index a54259a8a..3142838b0 100644 --- a/Website/src/components/Searchbar.tsx +++ b/Website/src/components/Searchbar.tsx @@ -22,6 +22,7 @@ class Searchbar extends ViewX { display: "inline-flex", justifyContent: "center", padding: "8px 8px 4px", + width: "100%", }} > Date: Mon, 18 Jul 2022 14:04:56 +0200 Subject: [PATCH 27/44] Prevent reusage in shell --- Website/src/activitys/MainActivity.tsx | 2 +- Website/src/native/BuildConfig.ts | 2 +- Website/src/native/Magisk.ts | 2 +- Website/src/native/Magiskboot.ts | 2 +- Website/src/native/{ShellBuilder.ts => Shell.ts} | 6 ++++-- 5 files changed, 8 insertions(+), 6 deletions(-) rename Website/src/native/{ShellBuilder.ts => Shell.ts} (89%) diff --git a/Website/src/activitys/MainActivity.tsx b/Website/src/activitys/MainActivity.tsx index d17ddf68e..90d8fa30e 100644 --- a/Website/src/activitys/MainActivity.tsx +++ b/Website/src/activitys/MainActivity.tsx @@ -4,7 +4,7 @@ import { Page, RouterNavigator } from "react-onsenui"; import MainApplication from "@Activitys/MainApplication"; import Constants from "@Native/Constants"; import NoRootActivity from "./NoRootActivity"; -import Shell from "@Native/ShellBuilder"; +import Shell from "@Native/Shell"; import { link } from "googlers-tools"; interface ModuleOptions { diff --git a/Website/src/native/BuildConfig.ts b/Website/src/native/BuildConfig.ts index 3a400fbdd..e57f503c2 100644 --- a/Website/src/native/BuildConfig.ts +++ b/Website/src/native/BuildConfig.ts @@ -1,5 +1,5 @@ import { os } from "./os"; -import Shell from "@Native/ShellBuilder"; +import Shell from "@Native/Shell"; import pkg from "@Package"; import SharedPreferences from "./SharedPreferences"; import Build from "./Build"; diff --git a/Website/src/native/Magisk.ts b/Website/src/native/Magisk.ts index a1e82cf7d..c5f703abd 100644 --- a/Website/src/native/Magisk.ts +++ b/Website/src/native/Magisk.ts @@ -1,6 +1,6 @@ import Log from "./Log"; import { os } from "./os"; -import Shell from "./ShellBuilder"; +import Shell from "./Shell"; class Magisk { private static log: Log = new Log(this.constructor.name); diff --git a/Website/src/native/Magiskboot.ts b/Website/src/native/Magiskboot.ts index b6e369ff9..ac9db0dfb 100644 --- a/Website/src/native/Magiskboot.ts +++ b/Website/src/native/Magiskboot.ts @@ -1,4 +1,4 @@ -import Shell from "./ShellBuilder"; +import Shell from "./Shell"; class Magiskboot { public static readonly magiskbootpath: string = "/data/adb/magisk/magiskboot"; diff --git a/Website/src/native/ShellBuilder.ts b/Website/src/native/Shell.ts similarity index 89% rename from Website/src/native/ShellBuilder.ts rename to Website/src/native/Shell.ts index eae9bbd95..997589656 100644 --- a/Website/src/native/ShellBuilder.ts +++ b/Website/src/native/Shell.ts @@ -1,8 +1,10 @@ import Log from "@Native/Log"; import { os } from "./os"; +type cmdReturn = Omit; + interface IShell { - cmd(cmd: string): this; + cmd(cmd: string): cmdReturn; exec(): void; result(): string; isAppGrantedRoot(): boolean; @@ -25,7 +27,7 @@ class ShellClass implements IShell { * Runs an Android native shell cmd * Should never used multiple */ - public cmd(cmd: string): this { + public cmd(cmd: string): cmdReturn { this.command = cmd; return this; } From 37d69d4affee962be301a8bbc12a65daece7bc81 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Mon, 18 Jul 2022 14:38:52 +0200 Subject: [PATCH 28/44] Improve screens for desktops --- Website/src/activitys/fragments/ExploreModuleFragment.tsx | 6 ++---- Website/src/components/ExploreModule.tsx | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Website/src/activitys/fragments/ExploreModuleFragment.tsx b/Website/src/activitys/fragments/ExploreModuleFragment.tsx index d3f7f5350..7507be9f1 100644 --- a/Website/src/activitys/fragments/ExploreModuleFragment.tsx +++ b/Website/src/activitys/fragments/ExploreModuleFragment.tsx @@ -1,15 +1,13 @@ import { Component, LegacyRef } from "react"; import { SearchInput, ProgressCircular, Row } from "react-onsenui"; -import { Button, Page } from "react-onsenuix"; import axios from "axios"; import ExploreModule from "@Components/ExploreModule"; import SharedPreferences from "@Native/SharedPreferences"; import { PushProps } from "@Activitys/MainActivity"; -import { SearchRounded } from "@mui/icons-material"; import { os } from "@Native/os"; import ons from "onsenui"; import { string } from "@Strings"; -import { isTablet } from "react-device-detect"; +import { isDesktop, isTablet } from "react-device-detect"; import RepoActivity, { RepoInterface } from "@Activitys/RepoActivity"; import Toast from "@Native/Toast"; import { Searchbar } from "@Components/Searchbar"; @@ -144,7 +142,7 @@ class ExploreModuleFragment extends Component { transform: "translate(-50%, -50%)", }} /> - ) : isTablet ? ( + ) : isTablet || isDesktop ? ( resultsRender ) : ( this.cardRender(modulesIndex) diff --git a/Website/src/components/ExploreModule.tsx b/Website/src/components/ExploreModule.tsx index 1bb63fc26..950ee26d4 100644 --- a/Website/src/components/ExploreModule.tsx +++ b/Website/src/components/ExploreModule.tsx @@ -6,7 +6,7 @@ import ViewModuleActivity from "@Activitys/ViewModuleActivity"; import Log from "@Native/Log"; import { VerifiedRounded } from "@mui/icons-material"; import { os } from "@Native/os"; -import { isTablet } from "react-device-detect"; +import { isDesktop, isTablet } from "react-device-detect"; import { dom, link } from "googlers-tools"; import { ViewX, ViewXRenderData } from "react-onsenuix"; import { string } from "@Strings"; @@ -101,7 +101,7 @@ class ExploreModule extends ViewX { }; private checkDeviceSize(element: JSX.Element): JSX.Element { - if (isTablet) { + if (isTablet || isDesktop) { return {element}; } else { return element; From c3ff94b2966729f04dbaa602fcfe25ed813d6c09 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Mon, 18 Jul 2022 14:58:55 +0200 Subject: [PATCH 29/44] Limted repo to 5 --- Website/src/activitys/RepoActivity.tsx | 20 ++++++---- .../fragments/ExploreModuleFragment.tsx | 2 +- Website/src/native/Toast.ts | 40 ++++++++++++++----- Website/src/typings/android/os.d.ts | 2 +- 4 files changed, 45 insertions(+), 19 deletions(-) diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx index 57d4f151c..8eaefb2ed 100644 --- a/Website/src/activitys/RepoActivity.tsx +++ b/Website/src/activitys/RepoActivity.tsx @@ -72,6 +72,8 @@ export interface RepoInterface { class RepoActivity extends AppCompatActivity { private pref: ISharedPreferences; + private readonly MAX_REPO_LENGTH: number = 5; + public constructor(props: Props | Readonly) { super(props); @@ -121,7 +123,7 @@ class RepoActivity extends AppCompatActivity { donate: undefined, submitModule: undefined, last_update: undefined, - modules: "https://raw.githubusercontent.com/Googlers-Magisk-Repo/googlers-magisk-repo.github.io/master/modules.json", + modules: "https://repo.dergoogler.com/modules.json", readonly: true, isOn: SharedPreferences.getBoolean("repoGMRenabled", true), built_in_type: "GMR", @@ -189,11 +191,11 @@ class RepoActivity extends AppCompatActivity { ...this.pref.getJSON>("repos", []), { name: repoName, - website: util.typeCheck(data.website, null), - support: util.typeCheck(data.support, null), - donate: util.typeCheck(data.donate, null), - submitModule: util.typeCheck(data.submitModule, null), - last_update: util.typeCheck(data.last_update, null), + website: util.typeCheck(link.validURL(data.website), null), + support: util.typeCheck(link.validURL(data.support), null), + donate: util.typeCheck(link.validURL(data.donate), null), + submitModule: util.typeCheck(link.validURL(data.submitModule), null), + last_update: util.typeCheck(link.validURL(data.last_update), null), modules: repoLink, readonly: false, isOn: false, @@ -231,7 +233,11 @@ class RepoActivity extends AppCompatActivity { } private showAlertDialog() { - this.setState({ alertDialogShown: true }); + if (this.getRepos().length === this.MAX_REPO_LENGTH) { + Toast.makeText("You can't add more than 5 repositories (Read-Only Repos are not counted).", Toast.LENGTH_SHORT).show(); + } else { + this.setState({ alertDialogShown: true }); + } } private hideAlertDialog() { diff --git a/Website/src/activitys/fragments/ExploreModuleFragment.tsx b/Website/src/activitys/fragments/ExploreModuleFragment.tsx index 7507be9f1..cda6c3f8a 100644 --- a/Website/src/activitys/fragments/ExploreModuleFragment.tsx +++ b/Website/src/activitys/fragments/ExploreModuleFragment.tsx @@ -83,7 +83,7 @@ class ExploreModuleFragment extends Component { } // If the repo is disabled, do nothing. }); - axios.get("https://dergoogler.com/repo/moduleOptions.json").then((response) => { + axios.get("https://repo.dergoogler.com/moduleOptions.json").then((response) => { this.setState({ moduleOptions: response.data, }); diff --git a/Website/src/native/Toast.ts b/Website/src/native/Toast.ts index 7c14f8b8e..fe892f8f1 100644 --- a/Website/src/native/Toast.ts +++ b/Website/src/native/Toast.ts @@ -1,33 +1,53 @@ -import Constants from "@Native/Constants"; import ons from "onsenui"; import { os } from "./os"; -class Toast { +type ToastReturn = Omit; + +interface IToast { + /** + * Show the view or text notification for a short period of time. + */ + readonly LENGTH_LONG: int; + + /** + * Show the view or text notification for a long period of time. + */ + readonly LENGTH_SHORT: int; + + makeText(text: string, duration: int): ToastReturn; + show(): void; +} + +class ToastClass implements IToast { /** * Show the view or text notification for a short period of time. */ - public static readonly LENGTH_LONG: int = os.isAndroid ? 1 : 5000; + public readonly LENGTH_LONG: int = os.isAndroid ? 1 : 5000; /** * Show the view or text notification for a long period of time. */ - public static readonly LENGTH_SHORT: int = os.isAndroid ? 0 : 2000; - private static duration: int; - private static text: string; + public readonly LENGTH_SHORT: int = os.isAndroid ? 0 : 2000; + + private duration: int | undefined; + private text: string | undefined; - public static makeText(text: string, duration: int): Toast { + public makeText(text: string, duration: int): ToastReturn { this.text = text; this.duration = duration; - return new this(); + return this; } public show(): void { if (os.isAndroid) { - nos.makeToast(Toast.text, Toast.duration); + nos.makeToast(this.text, this.duration); } else { - ons.notification.toast(Toast.text, { timeout: Toast.duration, animation: "fall" }); + ons.notification.toast(this.text, { timeout: this.duration, animation: "fall" }); } } } +const Toast: IToast = new ToastClass(); + export default Toast; +export { ToastClass, IToast }; diff --git a/Website/src/typings/android/os.d.ts b/Website/src/typings/android/os.d.ts index 87b801eb2..4b493e1fe 100644 --- a/Website/src/typings/android/os.d.ts +++ b/Website/src/typings/android/os.d.ts @@ -1,5 +1,5 @@ interface NOS { - makeToast(content: string, duration: int): void; + makeToast(content: string | undefined, duration: int| undefined): void; getSchemeParam(param: string): string; hasStoragePermission(): bool; requestStoargePermission(): void; From 3f9dd28ccc7bb2c8b347cd68a0dc449f30a45f1c Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Mon, 18 Jul 2022 17:31:41 +0200 Subject: [PATCH 30/44] Update modules.json format --- Website/src/activitys/ViewModuleActivity.tsx | 44 +++++++++++++--- .../fragments/ExploreModuleFragment.tsx | 4 +- Website/src/components/ExploreModule.tsx | 52 ++++++++----------- Website/src/typings/ModuleProps.ts | 32 ++++++++++++ 4 files changed, 93 insertions(+), 39 deletions(-) create mode 100644 Website/src/typings/ModuleProps.ts diff --git a/Website/src/activitys/ViewModuleActivity.tsx b/Website/src/activitys/ViewModuleActivity.tsx index 3c05059e7..26cb06ae1 100644 --- a/Website/src/activitys/ViewModuleActivity.tsx +++ b/Website/src/activitys/ViewModuleActivity.tsx @@ -1,4 +1,4 @@ -import { Toolbar as gae, Button } from "react-onsenuix"; +import { Toolbar as gae, Button, AlertDialog } from "react-onsenuix"; import { Dialog } from "react-onsenui"; import ons from "onsenui"; import axios from "axios"; @@ -12,16 +12,22 @@ import { string } from "@Strings"; import Magisk from "@Native/Magisk"; import Toolbar from "@Builders/ToolbarBuilder"; import { CSSProperties } from "react"; -import { link } from "googlers-tools"; +import { link, util } from "googlers-tools"; +import ModuleProps from "@Types/ModuleProps"; interface Props { - extra?: any; + extra: { + moduleProps: ModuleProps.PropUrl; + [x: string]: any; + }; popPage: any; } interface States { notes: string; dialogShown: boolean; + mProps: ModuleProps.PropUrl; + mFoxProps: ModuleProps.FoxProps; } class ViewModuleActivity extends AppCompatActivity { @@ -33,6 +39,8 @@ class ViewModuleActivity extends AppCompatActivity { this.state = { notes: "", dialogShown: false, + mProps: this.props.extra.moduleProps, + mFoxProps: this.props.extra.moduleProps.foxprops, }; } @@ -54,16 +62,33 @@ class ViewModuleActivity extends AppCompatActivity { .then(() => { // always executed }); + + const { minMagisk, minApi, maxApi, needRamdisk, changeBoot } = this.state.mFoxProps; + if (minApi && minApi > 20) { + const builder = new AlertDialog.Builder(); + builder.setTitle("Unsupported!"); + builder.setMessage("This module target api is higher than your device api."); + builder.setPositiveButton("Ok"); + builder.setCancelable(false); + builder.showAlert(); + } }; public onCreateToolbar = (): Toolbar.Props => { - const { minMagisk, minApi, maxApi, needRamdisk, changeBoot } = this.props.extra?.moduleProps; + // Normal props + const { name } = this.state.mProps; + // FoxProps + const { minMagisk, minApi, maxApi, needRamdisk, changeBoot } = this.state.mFoxProps; return { - title: this.props.extra.name, + title: this.props.extra?.name, onBackButton: this.props.popPage, addToolbarButton: ( <> - {(minMagisk || minApi || maxApi || needRamdisk || changeBoot) != (null || undefined) ? ( + {((minMagisk && minMagisk) || + (minApi && minApi) || + (maxApi && maxApi) || + (needRamdisk && needRamdisk) || + (changeBoot && changeBoot)) != (null || undefined) ? (
@@ -85,7 +110,10 @@ class ViewModuleActivity extends AppCompatActivity { }; public onCreate = () => { - const { minMagisk, minApi, maxApi, needRamdisk, changeBoot, name, stars, alpahMMRLinstall } = this.props.extra?.moduleProps; + // Normal props + const { name } = this.state.mProps; + // FoxProps + const { minMagisk, minApi, maxApi, needRamdisk, changeBoot } = this.state.mFoxProps; const { download, id } = this.props.extra; const { verified, low } = this.props.extra?.moduleOptions; return ( @@ -159,7 +187,7 @@ class ViewModuleActivity extends AppCompatActivity { Magisk.VERSION_CODE ? "red" : "") : "", + color: os.isAndroid ? (Magisk.PARSE_VERSION(minMagisk as any) > Magisk.VERSION_CODE ? "red" : "") : "", }} > {minMagisk} diff --git a/Website/src/activitys/fragments/ExploreModuleFragment.tsx b/Website/src/activitys/fragments/ExploreModuleFragment.tsx index cda6c3f8a..fc451b351 100644 --- a/Website/src/activitys/fragments/ExploreModuleFragment.tsx +++ b/Website/src/activitys/fragments/ExploreModuleFragment.tsx @@ -11,6 +11,7 @@ import { isDesktop, isTablet } from "react-device-detect"; import RepoActivity, { RepoInterface } from "@Activitys/RepoActivity"; import Toast from "@Native/Toast"; import { Searchbar } from "@Components/Searchbar"; +import ModuleProps from "@Types/ModuleProps"; interface Props { pushPage(...arg: any): PushProps; @@ -28,13 +29,12 @@ interface ModuleObject { id: string; last_update: number; notes_url: string; - prop_url: string; + prop_url: ModuleProps.PropUrl; stars: number; zip_url: string; } class ExploreModuleFragment extends Component { - private searchBar: LegacyRef | undefined; private pref: SharedPreferences; public constructor(props: Props | Readonly) { diff --git a/Website/src/components/ExploreModule.tsx b/Website/src/components/ExploreModule.tsx index 950ee26d4..64875090a 100644 --- a/Website/src/components/ExploreModule.tsx +++ b/Website/src/components/ExploreModule.tsx @@ -10,6 +10,7 @@ import { isDesktop, isTablet } from "react-device-detect"; import { dom, link } from "googlers-tools"; import { ViewX, ViewXRenderData } from "react-onsenuix"; import { string } from "@Strings"; +import ModuleProps from "@Types/ModuleProps"; interface Props { notesUrl?: string; @@ -19,7 +20,7 @@ interface Props { stars?: int; last_update?: any; getId: any; - propsUrl: string; + propsUrl: string | ModuleProps.PropUrl; } interface ModuleOptions { @@ -29,22 +30,7 @@ interface ModuleOptions { } interface States { - props: { - id?: string; - name?: string; - version?: string; - versionCode?: int; - author?: string; - description?: string; - minApi?: int; - maxApi?: int; - minMagisk?: int; - needRamdisk?: boolean; - support?: string; - donate?: string; - config?: string; - changeBoot?: boolean; - }; + props: Partial; } class ExploreModule extends ViewX { @@ -64,12 +50,26 @@ class ExploreModule extends ViewX { public componentDidMount = () => { const { propsUrl } = this.props; - const { props } = this.state; - axios.get(propsUrl).then((response) => { - this.setState({ - props: Properties.parseToProperties(response.data), + if (link.validURL(propsUrl as any)) { + axios.get(propsUrl as string).then((response) => { + let tmp = Properties.parseToProperties(response.data); + tmp.foxprops = { + minApi: null as any, + maxApi: null as any, + minMagisk: null as any, + needRamdisk: null as any, + support: null as any, + donate: null as any, + config: null as any, + changeBoot: null as any, + }; + this.setState({ + props: tmp, + }); }); - }); + } else { + this.setState({ props: propsUrl as ModuleProps.PropUrl }); + } }; private formatDate(date: Date) { @@ -137,13 +137,7 @@ class ExploreModule extends ViewX { moduleOptions: { verified: isVerified, }, - moduleProps: { - minMagisk: props.minMagisk, - minApi: props.minApi, - maxApi: props.maxApi, - needRamdisk: props?.needRamdisk, - changeBoot: props.changeBoot, - }, + moduleProps: props, }, }); }} diff --git a/Website/src/typings/ModuleProps.ts b/Website/src/typings/ModuleProps.ts new file mode 100644 index 000000000..89bbe0276 --- /dev/null +++ b/Website/src/typings/ModuleProps.ts @@ -0,0 +1,32 @@ +namespace ModuleProps { + export interface FoxProps { + minApi?: int; + maxApi?: int + minMagisk?: string | int; + needRamdisk?: boolean; + support?: string; + donate?: string; + config?: string; + changeBoot?: boolean; + } + + export interface PropUrl { + id: string; + name: string; + author: string; + version: string; + versionCode: string; + description: string; + foxprops: FoxProps; + } + + export interface RootObject { + id: string; + last_update: number; + zip_url: string; + notes_url: string; + prop_url: PropUrl; + } +} + +export default ModuleProps; From 854a459f2017acad751edfac45fa1c0db58cdb55 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Mon, 18 Jul 2022 21:13:13 +0200 Subject: [PATCH 31/44] Improve management --- Website/package.json | 2 +- Website/webpack.config.ts | 17 +++-------------- Website/webpack.dev.ts | 7 +++++-- Website/webpack.prod.ts | 8 +++++--- Website/webpack/defConfig.ts | 25 +++++++++++++++++++++++++ Website/webpack/plugins.ts | 23 +++++++++++++++++++++++ 6 files changed, 62 insertions(+), 20 deletions(-) create mode 100644 Website/webpack/defConfig.ts create mode 100644 Website/webpack/plugins.ts diff --git a/Website/package.json b/Website/package.json index 39e284066..aa627c7de 100644 --- a/Website/package.json +++ b/Website/package.json @@ -71,4 +71,4 @@ "webpack-cli": "^4.9.1", "yaml-loader": "^0.8.0" } -} \ No newline at end of file +} diff --git a/Website/webpack.config.ts b/Website/webpack.config.ts index b710b822b..c9ae1a096 100644 --- a/Website/webpack.config.ts +++ b/Website/webpack.config.ts @@ -2,14 +2,7 @@ import { Configuration } from "webpack"; import { resolve, join } from "path"; import MiniCssExtractPlugin from "mini-css-extract-plugin"; import CssMinimizerPlugin from "css-minimizer-webpack-plugin"; - -const defConfig = { - output: { - filename: "bundle/[name].bundle.js", - path: resolve(__dirname, "./../Android/app/src/main/assets"), - assetModuleFilename: "files/[name].[ext]", - }, -}; +import { defConfig } from "./webpack/defConfig"; const config: Configuration = { entry: { @@ -68,11 +61,7 @@ const config: Configuration = { maxEntrypointSize: 512000, maxAssetSize: 512000, }, - plugins: [ - new MiniCssExtractPlugin({ - filename: "bundle/[name].bundle.css", - }), - ], + plugins: [], resolve: { fallback: { path: false, @@ -99,4 +88,4 @@ const config: Configuration = { }, }; -export { defConfig, config }; +export default config; diff --git a/Website/webpack.dev.ts b/Website/webpack.dev.ts index 88fa42894..cdf742995 100644 --- a/Website/webpack.dev.ts +++ b/Website/webpack.dev.ts @@ -1,8 +1,11 @@ import { merge } from "webpack-merge"; -import { defConfig, config } from "./webpack.config"; +import { defConfig, Mode } from "./webpack/defConfig"; +import { devPlugins } from "./webpack/plugins"; +import config from "./webpack.config"; export default merge(config, { - mode: "development", + mode: Mode.Development, ...defConfig, + ...devPlugins, devtool: "source-map", }); diff --git a/Website/webpack.prod.ts b/Website/webpack.prod.ts index 1d50ff49b..06f04de07 100644 --- a/Website/webpack.prod.ts +++ b/Website/webpack.prod.ts @@ -1,10 +1,12 @@ import { merge } from "webpack-merge"; -import { defConfig, config } from "./webpack.config"; -import UglifyJsPlugin from "uglifyjs-webpack-plugin"; +import { defConfig, Mode } from "./webpack/defConfig"; +import config from "./webpack.config"; +import { ProdPlugins } from "./webpack/plugins"; export default merge(config, { - mode: "production", + mode: Mode.Production, ...defConfig, + ...ProdPlugins, optimization: { //@ts-ignore minimizer: [new UglifyJsPlugin()], diff --git a/Website/webpack/defConfig.ts b/Website/webpack/defConfig.ts new file mode 100644 index 000000000..ba28bafe2 --- /dev/null +++ b/Website/webpack/defConfig.ts @@ -0,0 +1,25 @@ +import { resolve } from "path"; +import { Configuration } from "webpack"; + +export enum Config { + Blue, + AndroidOutputPath = "./../../Android/app/src/main/assets", + OutputFilename = "bundle/[name].bundle.js", + AssetModuleFilename = "files/[name].[ext]", + CssOutputFilename = "bundle/[name].bundle.css", +} + +export enum Mode { + Production = "production", + Development = "development", +} + +const defConfig: Configuration = { + output: { + filename: Config.OutputFilename as string, + path: resolve(__dirname, Config.AndroidOutputPath), + assetModuleFilename: Config.AssetModuleFilename as string, + }, +}; + +export { defConfig }; diff --git a/Website/webpack/plugins.ts b/Website/webpack/plugins.ts new file mode 100644 index 000000000..c4209e6f8 --- /dev/null +++ b/Website/webpack/plugins.ts @@ -0,0 +1,23 @@ +import MiniCssExtractPlugin from "mini-css-extract-plugin"; +import UglifyJsPlugin from "uglifyjs-webpack-plugin"; +import { Configuration } from "webpack"; +import { Config } from "./defConfig"; + +const ProdPlugins: Configuration = { + plugins: [ + // @ts-ignore + new UglifyJsPlugin(), + new MiniCssExtractPlugin({ + filename: Config.CssOutputFilename as string, + }), + ], +}; +const devPlugins: Configuration = { + plugins: [ + new MiniCssExtractPlugin({ + filename: Config.CssOutputFilename as string, + }), + ], +}; + +export { devPlugins, ProdPlugins }; From 97d9ac6e47a23ed3dceac237c772662f85e358b8 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Mon, 18 Jul 2022 22:03:30 +0200 Subject: [PATCH 32/44] . --- Android/app/build.gradle | 2 +- Android/gradle.properties | 3 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../.gradle/4.4.1/fileChanges/last-build.bin | Bin 0 -> 1 bytes .../.gradle/4.4.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .../.gradle/4.4.1/taskHistory/taskHistory.bin | Bin 0 -> 18734 bytes .../4.4.1/taskHistory/taskHistory.lock | Bin 0 -> 17 bytes .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .../buildOutputCleanup/cache.properties | 2 + Website/bun.lockb | Bin 204900 -> 205092 bytes Website/package-lock.json | 7078 ++++++++--------- Website/package.json | 4 +- Website/tsconfig.json | 2 +- 13 files changed, 3145 insertions(+), 3948 deletions(-) create mode 100644 Website/.gradle/4.4.1/fileChanges/last-build.bin create mode 100644 Website/.gradle/4.4.1/fileHashes/fileHashes.lock create mode 100644 Website/.gradle/4.4.1/taskHistory/taskHistory.bin create mode 100644 Website/.gradle/4.4.1/taskHistory/taskHistory.lock create mode 100644 Website/.gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 Website/.gradle/buildOutputCleanup/cache.properties diff --git a/Android/app/build.gradle b/Android/app/build.gradle index 5df982c70..dcac5175b 100755 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'com.android.application' -apply plugin: 'com.github.node-gradle.node' +// apply plugin: 'com.github.node-gradle.node' android { compileSdk 32 diff --git a/Android/gradle.properties b/Android/gradle.properties index 59d5aab6a..f8e55fb6e 100755 --- a/Android/gradle.properties +++ b/Android/gradle.properties @@ -17,4 +17,5 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true android.useAndroidX=true -android.enableJetifier=true \ No newline at end of file +android.enableJetifier=true +android.enableUnitTestBinaryResources=false diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties index e6f7be129..0b51df273 100755 --- a/Android/gradle/wrapper/gradle-wrapper.properties +++ b/Android/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Sat Jun 11 19:47:22 CEST 2022 +#Mon Jul 18 21:46:42 CEST 2022 distributionBase=GRADLE_USER_HOME distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists diff --git a/Website/.gradle/4.4.1/fileChanges/last-build.bin b/Website/.gradle/4.4.1/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/Website/.gradle/4.4.1/fileHashes/fileHashes.lock b/Website/.gradle/4.4.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..6bf928747e3010bc972465fce0fcc362f56ea9ef GIT binary patch literal 17 TcmZRc{oJP}U-{on1}FdkIx_^f literal 0 HcmV?d00001 diff --git a/Website/.gradle/4.4.1/taskHistory/taskHistory.bin b/Website/.gradle/4.4.1/taskHistory/taskHistory.bin new file mode 100644 index 0000000000000000000000000000000000000000..f2007ab28fef3c17d9535d69f90c2da136c74792 GIT binary patch literal 18734 zcmeI(Jxjze7{KvFTol1B$|?8(e4&Uhw|jIDM>%JyZR{0~wxq?{4u>B=a1~A$KY=(q zI5|1G2#zj??%t+3>v5kz5cxll0F4_DU-;Cx|!Q~o9|cU?XBVa!EiM5 zi&c#t0R#|0009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**5I_I{1Q0*~0R#|0009IL zKmY**5I_I{1pb1+x;ezFX)l8&ySb_-rOt~mI%sbmmgRB12wHx4Qf`=k1JZh0ID0-9 zx8uFjiHrAsqa)1fIL$&YwH=kH$XAh9?5ZTzS<|f8 hca#@vH&ec}#M)A`bN6ty{P=Ns-JNay#-88Qy)U)&cSisK literal 0 HcmV?d00001 diff --git a/Website/.gradle/4.4.1/taskHistory/taskHistory.lock b/Website/.gradle/4.4.1/taskHistory/taskHistory.lock new file mode 100644 index 0000000000000000000000000000000000000000..1d51dd4e401d5b2d93d23a5d87aeb5c9973eb6f4 GIT binary patch literal 17 UcmZQx#HRjim&{L71_)pV04@{*zyJUM literal 0 HcmV?d00001 diff --git a/Website/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Website/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000000000000000000000000000000000..f36d806dc49c6efc50bf52bb12cf9aa518dd342e GIT binary patch literal 17 UcmZQxy{wFZ)pkY`0|YPv04RV1C;$Ke literal 0 HcmV?d00001 diff --git a/Website/.gradle/buildOutputCleanup/cache.properties b/Website/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 000000000..3b17d7f35 --- /dev/null +++ b/Website/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Mon Jul 18 21:35:59 CEST 2022 +gradle.version=4.4.1 diff --git a/Website/bun.lockb b/Website/bun.lockb index e186bc41240e5d819c984b90f065d574165c64fb..68f077508d764b23b3ef297421029f5263dad043 100755 GIT binary patch delta 23505 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 delta 22746 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 diff --git a/Website/package-lock.json b/Website/package-lock.json index 7f9f2e0f6..78c590a33 100644 --- a/Website/package-lock.json +++ b/Website/package-lock.json @@ -1,12 +1,12 @@ { "name": "com.dergoogler.mmrl.web", - "version": "1.4.1", + "version": "1.4.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "com.dergoogler.mmrl.web", - "version": "1.4.1", + "version": "1.4.2", "license": "ISC", "dependencies": { "@emotion/react": "^11.9.0", @@ -15,11 +15,13 @@ "@mui/icons-material": "^5.8.0", "@mui/material": "^5.8.0", "axios": "^0.27.2", - "bota64": "^1.0.3", - "googlers-tools": "^1.1.7", + "bota64": "^1.0.7", + "googlers-tools": "^1.2.7", + "highlight.js": "^11.6.0", "jss": "^10.9.0", "jss-preset-default": "^10.9.0", "localized-strings": "^0.2.4", + "markdown-to-jsx": "^7.1.7", "marked-react": "^1.1.2", "material-icons": "^1.10.8", "object-assign": "^4.1.1", @@ -28,17 +30,19 @@ "react-device-detect": "^2.2.2", "react-dom": "^18.2.0", "react-onsenui": "^1.12.0", + "react-onsenuix": "^1.0.6", "react-syntax-highlighter": "^15.5.0" }, "devDependencies": { "@babel/core": "^7.16.5", "@babel/preset-env": "^7.16.5", "@babel/preset-react": "^7.16.5", - "@types/node": "^18.0.3", + "@types/node": "^18.0.6", "@types/object-assign": "^4.0.30", "@types/react-dom": "^18.0.2", "@types/react-onsenui": "^2.9.17", "@types/react-syntax-highlighter": "^15.5.2", + "@types/uglifyjs-webpack-plugin": "^1.1.2", "@types/webpack": "^5.28.0", "babel-loader": "^8.2.3", "css-loader": "^6.5.1", @@ -53,7 +57,9 @@ "style-loader": "^3.3.1", "ts-loader": "^9.3.0", "ts-node": "^10.8.0", + "tslib": "^2.4.0", "typescript": "^4.7.2", + "uglifyjs-webpack-plugin": "^2.2.0", "url-loader": "^4.1.1", "vscode": "^1.1.37", "webpack": "^5.73.0", @@ -61,16 +67,9 @@ "yaml-loader": "^0.8.0" } }, - "../../Bota64": { - "name": "bota64", - "version": "1.0.0", - "extraneous": true, - "license": "MIT" - }, "node_modules/@ampproject/remapping": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", + "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.1.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -80,39 +79,36 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz", - "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==", + "version": "7.18.6", + "license": "MIT", "dependencies": { - "@babel/highlight": "^7.16.7" + "@babel/highlight": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/compat-data": { - "version": "7.17.10", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz", - "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==", + "version": "7.18.8", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.2.tgz", - "integrity": "sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==", + "version": "7.18.6", + "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.18.2", - "@babel/helper-compilation-targets": "^7.18.2", - "@babel/helper-module-transforms": "^7.18.0", - "@babel/helpers": "^7.18.2", - "@babel/parser": "^7.18.0", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.18.2", - "@babel/types": "^7.18.2", + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.18.6", + "@babel/helper-compilation-targets": "^7.18.6", + "@babel/helper-module-transforms": "^7.18.6", + "@babel/helpers": "^7.18.6", + "@babel/parser": "^7.18.6", + "@babel/template": "^7.18.6", + "@babel/traverse": "^7.18.6", + "@babel/types": "^7.18.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -128,12 +124,11 @@ } }, "node_modules/@babel/generator": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz", - "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==", + "version": "7.18.7", + "license": "MIT", "dependencies": { - "@babel/types": "^7.18.2", - "@jridgewell/gen-mapping": "^0.3.0", + "@babel/types": "^7.18.7", + "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, "engines": { @@ -141,11 +136,10 @@ } }, "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz", - "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==", + "version": "0.3.2", + "license": "MIT", "dependencies": { - "@jridgewell/set-array": "^1.0.0", + "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", "@jridgewell/trace-mapping": "^0.3.9" }, @@ -154,37 +148,34 @@ } }, "node_modules/@babel/helper-annotate-as-pure": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz", - "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz", - "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-explode-assignable-expression": "^7.16.7", - "@babel/types": "^7.16.7" + "@babel/helper-explode-assignable-expression": "^7.18.6", + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz", - "integrity": "sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==", + "version": "7.18.6", + "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.17.10", - "@babel/helper-validator-option": "^7.16.7", + "@babel/compat-data": "^7.18.6", + "@babel/helper-validator-option": "^7.18.6", "browserslist": "^4.20.2", "semver": "^6.3.0" }, @@ -196,18 +187,17 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz", - "integrity": "sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-function-name": "^7.17.9", - "@babel/helper-member-expression-to-functions": "^7.17.7", - "@babel/helper-optimise-call-expression": "^7.16.7", - "@babel/helper-replace-supers": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7" + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-function-name": "^7.18.6", + "@babel/helper-member-expression-to-functions": "^7.18.6", + "@babel/helper-optimise-call-expression": "^7.18.6", + "@babel/helper-replace-supers": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -217,13 +207,12 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz", - "integrity": "sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "regexpu-core": "^5.0.1" + "@babel/helper-annotate-as-pure": "^7.18.6", + "regexpu-core": "^5.1.0" }, "engines": { "node": ">=6.9.0" @@ -234,9 +223,8 @@ }, "node_modules/@babel/helper-define-polyfill-provider": { "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz", - "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-compilation-targets": "^7.13.0", "@babel/helper-module-imports": "^7.12.13", @@ -252,223 +240,208 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz", - "integrity": "sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==", + "version": "7.18.6", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-explode-assignable-expression": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz", - "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.17.9", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz", - "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==", + "version": "7.18.6", + "license": "MIT", "dependencies": { - "@babel/template": "^7.16.7", - "@babel/types": "^7.17.0" + "@babel/template": "^7.18.6", + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz", - "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==", + "version": "7.18.6", + "license": "MIT", "dependencies": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.17.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz", - "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.17.0" + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz", - "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==", + "version": "7.18.6", + "license": "MIT", "dependencies": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz", - "integrity": "sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==", + "version": "7.18.8", + "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-module-imports": "^7.16.7", - "@babel/helper-simple-access": "^7.17.7", - "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/helper-validator-identifier": "^7.16.7", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.18.0", - "@babel/types": "^7.18.0" + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-module-imports": "^7.18.6", + "@babel/helper-simple-access": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/helper-validator-identifier": "^7.18.6", + "@babel/template": "^7.18.6", + "@babel/traverse": "^7.18.8", + "@babel/types": "^7.18.8" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-optimise-call-expression": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz", - "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz", - "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==", + "version": "7.18.6", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz", - "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-wrap-function": "^7.16.8", - "@babel/types": "^7.16.8" + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-wrap-function": "^7.18.6", + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz", - "integrity": "sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.18.2", - "@babel/helper-member-expression-to-functions": "^7.17.7", - "@babel/helper-optimise-call-expression": "^7.16.7", - "@babel/traverse": "^7.18.2", - "@babel/types": "^7.18.2" + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-member-expression-to-functions": "^7.18.6", + "@babel/helper-optimise-call-expression": "^7.18.6", + "@babel/traverse": "^7.18.6", + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-simple-access": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz", - "integrity": "sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==", + "version": "7.18.6", + "license": "MIT", "dependencies": { - "@babel/types": "^7.18.2" + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz", - "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.16.0" + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz", - "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==", + "version": "7.18.6", + "license": "MIT", "dependencies": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", - "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==", + "version": "7.18.6", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz", - "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==", + "version": "7.18.6", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz", - "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-function-name": "^7.16.7", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.16.8", - "@babel/types": "^7.16.8" + "@babel/helper-function-name": "^7.18.6", + "@babel/template": "^7.18.6", + "@babel/traverse": "^7.18.6", + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz", - "integrity": "sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==", + "version": "7.18.6", + "license": "MIT", "dependencies": { - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.18.2", - "@babel/types": "^7.18.2" + "@babel/template": "^7.18.6", + "@babel/traverse": "^7.18.6", + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz", - "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==", + "version": "7.18.6", + "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.16.7", + "@babel/helper-validator-identifier": "^7.18.6", "chalk": "^2.0.0", "js-tokens": "^4.0.0" }, @@ -477,9 +450,8 @@ } }, "node_modules/@babel/parser": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.3.tgz", - "integrity": "sha512-rL50YcEuHbbauAFAysNsJA4/f89fGTOBRNs9P81sniKnKAr4xULe5AecolcsKbi88xu0ByWYDj/S1AJ3FSFuSQ==", + "version": "7.18.8", + "license": "MIT", "bin": { "parser": "bin/babel-parser.js" }, @@ -488,12 +460,11 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz", - "integrity": "sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -503,14 +474,13 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz", - "integrity": "sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0", - "@babel/plugin-proposal-optional-chaining": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-skip-transparent-expression-wrappers": "^7.18.6", + "@babel/plugin-proposal-optional-chaining": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -520,13 +490,13 @@ } }, "node_modules/@babel/plugin-proposal-async-generator-functions": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz", - "integrity": "sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-remap-async-to-generator": "^7.16.8", + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-remap-async-to-generator": "^7.18.6", "@babel/plugin-syntax-async-generators": "^7.8.4" }, "engines": { @@ -537,13 +507,12 @@ } }, "node_modules/@babel/plugin-proposal-class-properties": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz", - "integrity": "sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.17.12", - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-create-class-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -553,13 +522,12 @@ } }, "node_modules/@babel/plugin-proposal-class-static-block": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz", - "integrity": "sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.18.0", - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-create-class-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-class-static-block": "^7.14.5" }, "engines": { @@ -570,12 +538,11 @@ } }, "node_modules/@babel/plugin-proposal-dynamic-import": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz", - "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-dynamic-import": "^7.8.3" }, "engines": { @@ -586,12 +553,11 @@ } }, "node_modules/@babel/plugin-proposal-export-namespace-from": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz", - "integrity": "sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-export-namespace-from": "^7.8.3" }, "engines": { @@ -602,12 +568,11 @@ } }, "node_modules/@babel/plugin-proposal-json-strings": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz", - "integrity": "sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-json-strings": "^7.8.3" }, "engines": { @@ -618,12 +583,11 @@ } }, "node_modules/@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz", - "integrity": "sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" }, "engines": { @@ -634,12 +598,11 @@ } }, "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz", - "integrity": "sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" }, "engines": { @@ -650,12 +613,11 @@ } }, "node_modules/@babel/plugin-proposal-numeric-separator": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz", - "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-numeric-separator": "^7.10.4" }, "engines": { @@ -666,16 +628,15 @@ } }, "node_modules/@babel/plugin-proposal-object-rest-spread": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz", - "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.17.10", - "@babel/helper-compilation-targets": "^7.17.10", - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/compat-data": "^7.18.6", + "@babel/helper-compilation-targets": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.17.12" + "@babel/plugin-transform-parameters": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -685,12 +646,11 @@ } }, "node_modules/@babel/plugin-proposal-optional-catch-binding": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz", - "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" }, "engines": { @@ -701,13 +661,12 @@ } }, "node_modules/@babel/plugin-proposal-optional-chaining": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz", - "integrity": "sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-skip-transparent-expression-wrappers": "^7.18.6", "@babel/plugin-syntax-optional-chaining": "^7.8.3" }, "engines": { @@ -718,13 +677,12 @@ } }, "node_modules/@babel/plugin-proposal-private-methods": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz", - "integrity": "sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.17.12", - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-create-class-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -734,14 +692,13 @@ } }, "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz", - "integrity": "sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-create-class-features-plugin": "^7.17.12", - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-create-class-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-private-property-in-object": "^7.14.5" }, "engines": { @@ -752,13 +709,12 @@ } }, "node_modules/@babel/plugin-proposal-unicode-property-regex": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz", - "integrity": "sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.17.12", - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=4" @@ -769,9 +725,8 @@ }, "node_modules/@babel/plugin-syntax-async-generators": { "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -781,9 +736,8 @@ }, "node_modules/@babel/plugin-syntax-class-properties": { "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" }, @@ -793,9 +747,8 @@ }, "node_modules/@babel/plugin-syntax-class-static-block": { "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -808,9 +761,8 @@ }, "node_modules/@babel/plugin-syntax-dynamic-import": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -820,9 +772,8 @@ }, "node_modules/@babel/plugin-syntax-export-namespace-from": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.3" }, @@ -831,12 +782,11 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz", - "integrity": "sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -847,9 +797,8 @@ }, "node_modules/@babel/plugin-syntax-json-strings": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -858,11 +807,10 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz", - "integrity": "sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog==", + "version": "7.18.6", + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -873,9 +821,8 @@ }, "node_modules/@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -885,9 +832,8 @@ }, "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -897,9 +843,8 @@ }, "node_modules/@babel/plugin-syntax-numeric-separator": { "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.10.4" }, @@ -909,9 +854,8 @@ }, "node_modules/@babel/plugin-syntax-object-rest-spread": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -921,9 +865,8 @@ }, "node_modules/@babel/plugin-syntax-optional-catch-binding": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -933,9 +876,8 @@ }, "node_modules/@babel/plugin-syntax-optional-chaining": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -945,9 +887,8 @@ }, "node_modules/@babel/plugin-syntax-private-property-in-object": { "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -960,9 +901,8 @@ }, "node_modules/@babel/plugin-syntax-top-level-await": { "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5" }, @@ -974,12 +914,11 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz", - "integrity": "sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -989,14 +928,13 @@ } }, "node_modules/@babel/plugin-transform-async-to-generator": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz", - "integrity": "sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.16.7", - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-remap-async-to-generator": "^7.16.8" + "@babel/helper-module-imports": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-remap-async-to-generator": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1006,12 +944,11 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz", - "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1021,12 +958,11 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.17.12.tgz", - "integrity": "sha512-jw8XW/B1i7Lqwqj2CbrViPcZijSxfguBWZP2aN59NHgxUyO/OcO1mfdCxH13QhN5LbWhPkX+f+brKGhZTiqtZQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1036,18 +972,17 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.17.12.tgz", - "integrity": "sha512-cvO7lc7pZat6BsvH6l/EGaI8zpl8paICaoGk+7x7guvtfak/TbIf66nYmJOH13EuG0H+Xx3M+9LQDtSvZFKXKw==", - "dev": true, - "dependencies": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-function-name": "^7.17.9", - "@babel/helper-optimise-call-expression": "^7.16.7", - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-replace-supers": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7", + "version": "7.18.8", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-function-name": "^7.18.6", + "@babel/helper-optimise-call-expression": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-replace-supers": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", "globals": "^11.1.0" }, "engines": { @@ -1058,12 +993,11 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz", - "integrity": "sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1073,12 +1007,11 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz", - "integrity": "sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1088,13 +1021,12 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz", - "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1104,12 +1036,11 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz", - "integrity": "sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1119,13 +1050,12 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz", - "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1135,12 +1065,11 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.18.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz", - "integrity": "sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==", + "version": "7.18.8", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1150,14 +1079,13 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz", - "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.16.7", - "@babel/helper-function-name": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-compilation-targets": "^7.18.6", + "@babel/helper-function-name": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1167,12 +1095,11 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz", - "integrity": "sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1182,12 +1109,11 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz", - "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1197,13 +1123,12 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz", - "integrity": "sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.18.0", - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-module-transforms": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", "babel-plugin-dynamic-import-node": "^2.3.3" }, "engines": { @@ -1214,14 +1139,13 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz", - "integrity": "sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.18.0", - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-simple-access": "^7.18.2", + "@babel/helper-module-transforms": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-simple-access": "^7.18.6", "babel-plugin-dynamic-import-node": "^2.3.3" }, "engines": { @@ -1232,15 +1156,14 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.0.tgz", - "integrity": "sha512-vwKpxdHnlM5tIrRt/eA0bzfbi7gUBLN08vLu38np1nZevlPySRe6yvuATJB5F/WPJ+ur4OXwpVYq9+BsxqAQuQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-hoist-variables": "^7.16.7", - "@babel/helper-module-transforms": "^7.18.0", - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-validator-identifier": "^7.16.7", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-module-transforms": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-validator-identifier": "^7.18.6", "babel-plugin-dynamic-import-node": "^2.3.3" }, "engines": { @@ -1251,13 +1174,12 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz", - "integrity": "sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.18.0", - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-module-transforms": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1267,13 +1189,12 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz", - "integrity": "sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.17.12", - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1283,12 +1204,11 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz", - "integrity": "sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1298,13 +1218,12 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz", - "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-replace-supers": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-replace-supers": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1314,12 +1233,11 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz", - "integrity": "sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==", + "version": "7.18.8", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1329,12 +1247,11 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz", - "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1344,12 +1261,11 @@ } }, "node_modules/@babel/plugin-transform-react-display-name": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz", - "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1359,16 +1275,15 @@ } }, "node_modules/@babel/plugin-transform-react-jsx": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz", - "integrity": "sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-module-imports": "^7.16.7", - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/plugin-syntax-jsx": "^7.17.12", - "@babel/types": "^7.17.12" + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-module-imports": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/plugin-syntax-jsx": "^7.18.6", + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1378,12 +1293,11 @@ } }, "node_modules/@babel/plugin-transform-react-jsx-development": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz", - "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/plugin-transform-react-jsx": "^7.16.7" + "@babel/plugin-transform-react-jsx": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1393,13 +1307,12 @@ } }, "node_modules/@babel/plugin-transform-react-pure-annotations": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.0.tgz", - "integrity": "sha512-6+0IK6ouvqDn9bmEG7mEyF/pwlJXVj5lwydybpyyH3D0A7Hftk+NCTdYjnLNZksn261xaOV5ksmp20pQEmc2RQ==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1409,12 +1322,11 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz", - "integrity": "sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-plugin-utils": "^7.18.6", "regenerator-transform": "^0.15.0" }, "engines": { @@ -1425,12 +1337,11 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz", - "integrity": "sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1440,12 +1351,11 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz", - "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1455,13 +1365,12 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz", - "integrity": "sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0" + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-skip-transparent-expression-wrappers": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1471,12 +1380,11 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz", - "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1486,12 +1394,11 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz", - "integrity": "sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1501,12 +1408,11 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz", - "integrity": "sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1516,12 +1422,11 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz", - "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1531,13 +1436,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz", - "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1547,38 +1451,37 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz", - "integrity": "sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==", - "dev": true, - "dependencies": { - "@babel/compat-data": "^7.17.10", - "@babel/helper-compilation-targets": "^7.18.2", - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-validator-option": "^7.16.7", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12", - "@babel/plugin-proposal-async-generator-functions": "^7.17.12", - "@babel/plugin-proposal-class-properties": "^7.17.12", - "@babel/plugin-proposal-class-static-block": "^7.18.0", - "@babel/plugin-proposal-dynamic-import": "^7.16.7", - "@babel/plugin-proposal-export-namespace-from": "^7.17.12", - "@babel/plugin-proposal-json-strings": "^7.17.12", - "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12", - "@babel/plugin-proposal-numeric-separator": "^7.16.7", - "@babel/plugin-proposal-object-rest-spread": "^7.18.0", - "@babel/plugin-proposal-optional-catch-binding": "^7.16.7", - "@babel/plugin-proposal-optional-chaining": "^7.17.12", - "@babel/plugin-proposal-private-methods": "^7.17.12", - "@babel/plugin-proposal-private-property-in-object": "^7.17.12", - "@babel/plugin-proposal-unicode-property-regex": "^7.17.12", + "version": "7.18.6", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/compat-data": "^7.18.6", + "@babel/helper-compilation-targets": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-validator-option": "^7.18.6", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.6", + "@babel/plugin-proposal-async-generator-functions": "^7.18.6", + "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/plugin-proposal-class-static-block": "^7.18.6", + "@babel/plugin-proposal-dynamic-import": "^7.18.6", + "@babel/plugin-proposal-export-namespace-from": "^7.18.6", + "@babel/plugin-proposal-json-strings": "^7.18.6", + "@babel/plugin-proposal-logical-assignment-operators": "^7.18.6", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", + "@babel/plugin-proposal-numeric-separator": "^7.18.6", + "@babel/plugin-proposal-object-rest-spread": "^7.18.6", + "@babel/plugin-proposal-optional-catch-binding": "^7.18.6", + "@babel/plugin-proposal-optional-chaining": "^7.18.6", + "@babel/plugin-proposal-private-methods": "^7.18.6", + "@babel/plugin-proposal-private-property-in-object": "^7.18.6", + "@babel/plugin-proposal-unicode-property-regex": "^7.18.6", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.17.12", + "@babel/plugin-syntax-import-assertions": "^7.18.6", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", @@ -1588,43 +1491,43 @@ "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/plugin-transform-arrow-functions": "^7.17.12", - "@babel/plugin-transform-async-to-generator": "^7.17.12", - "@babel/plugin-transform-block-scoped-functions": "^7.16.7", - "@babel/plugin-transform-block-scoping": "^7.17.12", - "@babel/plugin-transform-classes": "^7.17.12", - "@babel/plugin-transform-computed-properties": "^7.17.12", - "@babel/plugin-transform-destructuring": "^7.18.0", - "@babel/plugin-transform-dotall-regex": "^7.16.7", - "@babel/plugin-transform-duplicate-keys": "^7.17.12", - "@babel/plugin-transform-exponentiation-operator": "^7.16.7", - "@babel/plugin-transform-for-of": "^7.18.1", - "@babel/plugin-transform-function-name": "^7.16.7", - "@babel/plugin-transform-literals": "^7.17.12", - "@babel/plugin-transform-member-expression-literals": "^7.16.7", - "@babel/plugin-transform-modules-amd": "^7.18.0", - "@babel/plugin-transform-modules-commonjs": "^7.18.2", - "@babel/plugin-transform-modules-systemjs": "^7.18.0", - "@babel/plugin-transform-modules-umd": "^7.18.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12", - "@babel/plugin-transform-new-target": "^7.17.12", - "@babel/plugin-transform-object-super": "^7.16.7", - "@babel/plugin-transform-parameters": "^7.17.12", - "@babel/plugin-transform-property-literals": "^7.16.7", - "@babel/plugin-transform-regenerator": "^7.18.0", - "@babel/plugin-transform-reserved-words": "^7.17.12", - "@babel/plugin-transform-shorthand-properties": "^7.16.7", - "@babel/plugin-transform-spread": "^7.17.12", - "@babel/plugin-transform-sticky-regex": "^7.16.7", - "@babel/plugin-transform-template-literals": "^7.18.2", - "@babel/plugin-transform-typeof-symbol": "^7.17.12", - "@babel/plugin-transform-unicode-escapes": "^7.16.7", - "@babel/plugin-transform-unicode-regex": "^7.16.7", + "@babel/plugin-transform-arrow-functions": "^7.18.6", + "@babel/plugin-transform-async-to-generator": "^7.18.6", + "@babel/plugin-transform-block-scoped-functions": "^7.18.6", + "@babel/plugin-transform-block-scoping": "^7.18.6", + "@babel/plugin-transform-classes": "^7.18.6", + "@babel/plugin-transform-computed-properties": "^7.18.6", + "@babel/plugin-transform-destructuring": "^7.18.6", + "@babel/plugin-transform-dotall-regex": "^7.18.6", + "@babel/plugin-transform-duplicate-keys": "^7.18.6", + "@babel/plugin-transform-exponentiation-operator": "^7.18.6", + "@babel/plugin-transform-for-of": "^7.18.6", + "@babel/plugin-transform-function-name": "^7.18.6", + "@babel/plugin-transform-literals": "^7.18.6", + "@babel/plugin-transform-member-expression-literals": "^7.18.6", + "@babel/plugin-transform-modules-amd": "^7.18.6", + "@babel/plugin-transform-modules-commonjs": "^7.18.6", + "@babel/plugin-transform-modules-systemjs": "^7.18.6", + "@babel/plugin-transform-modules-umd": "^7.18.6", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.18.6", + "@babel/plugin-transform-new-target": "^7.18.6", + "@babel/plugin-transform-object-super": "^7.18.6", + "@babel/plugin-transform-parameters": "^7.18.6", + "@babel/plugin-transform-property-literals": "^7.18.6", + "@babel/plugin-transform-regenerator": "^7.18.6", + "@babel/plugin-transform-reserved-words": "^7.18.6", + "@babel/plugin-transform-shorthand-properties": "^7.18.6", + "@babel/plugin-transform-spread": "^7.18.6", + "@babel/plugin-transform-sticky-regex": "^7.18.6", + "@babel/plugin-transform-template-literals": "^7.18.6", + "@babel/plugin-transform-typeof-symbol": "^7.18.6", + "@babel/plugin-transform-unicode-escapes": "^7.18.6", + "@babel/plugin-transform-unicode-regex": "^7.18.6", "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.18.2", - "babel-plugin-polyfill-corejs2": "^0.3.0", - "babel-plugin-polyfill-corejs3": "^0.5.0", - "babel-plugin-polyfill-regenerator": "^0.3.0", + "@babel/types": "^7.18.6", + "babel-plugin-polyfill-corejs2": "^0.3.1", + "babel-plugin-polyfill-corejs3": "^0.5.2", + "babel-plugin-polyfill-regenerator": "^0.3.1", "core-js-compat": "^3.22.1", "semver": "^6.3.0" }, @@ -1637,9 +1540,8 @@ }, "node_modules/@babel/preset-modules": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", - "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.0.0", "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", @@ -1652,17 +1554,16 @@ } }, "node_modules/@babel/preset-react": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.17.12.tgz", - "integrity": "sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA==", + "version": "7.18.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-validator-option": "^7.16.7", - "@babel/plugin-transform-react-display-name": "^7.16.7", - "@babel/plugin-transform-react-jsx": "^7.17.12", - "@babel/plugin-transform-react-jsx-development": "^7.16.7", - "@babel/plugin-transform-react-pure-annotations": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-validator-option": "^7.18.6", + "@babel/plugin-transform-react-display-name": "^7.18.6", + "@babel/plugin-transform-react-jsx": "^7.18.6", + "@babel/plugin-transform-react-jsx-development": "^7.18.6", + "@babel/plugin-transform-react-pure-annotations": "^7.18.6" }, "engines": { "node": ">=6.9.0" @@ -1672,9 +1573,8 @@ } }, "node_modules/@babel/runtime": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz", - "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==", + "version": "7.18.6", + "license": "MIT", "dependencies": { "regenerator-runtime": "^0.13.4" }, @@ -1683,31 +1583,29 @@ } }, "node_modules/@babel/template": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz", - "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==", + "version": "7.18.6", + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.16.7", - "@babel/parser": "^7.16.7", - "@babel/types": "^7.16.7" + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.18.6", + "@babel/types": "^7.18.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz", - "integrity": "sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==", - "dependencies": { - "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.18.2", - "@babel/helper-environment-visitor": "^7.18.2", - "@babel/helper-function-name": "^7.17.9", - "@babel/helper-hoist-variables": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/parser": "^7.18.0", - "@babel/types": "^7.18.2", + "version": "7.18.8", + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.18.7", + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-function-name": "^7.18.6", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.18.8", + "@babel/types": "^7.18.8", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1716,11 +1614,10 @@ } }, "node_modules/@babel/types": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.2.tgz", - "integrity": "sha512-0On6B8A4/+mFUto5WERt3EEuG1NznDirvwca1O8UwXQHVY8g3R7OzYgxXdOfMwLO08UrpUD/2+3Bclyq+/C94Q==", + "version": "7.18.8", + "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.16.7", + "@babel/helper-validator-identifier": "^7.18.6", "to-fast-properties": "^2.0.0" }, "engines": { @@ -1729,9 +1626,8 @@ }, "node_modules/@cspotcode/source-map-support": { "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/trace-mapping": "0.3.9" }, @@ -1741,9 +1637,8 @@ }, "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -1751,17 +1646,15 @@ }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", - "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.0.0" } }, "node_modules/@emotion/babel-plugin": { "version": "11.9.2", - "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz", - "integrity": "sha512-Pr/7HGH6H6yKgnVFNEj2MVlreu3ADqftqjqwUvDy/OJzKFgxKeTQ+eeUf20FOTuHVkDON2iNa25rAXVYtWJCjw==", + "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.12.13", "@babel/plugin-syntax-jsx": "^7.12.13", @@ -1782,8 +1675,7 @@ }, "node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "license": "MIT", "engines": { "node": ">=10" }, @@ -1793,19 +1685,17 @@ }, "node_modules/@emotion/babel-plugin/node_modules/source-map": { "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/@emotion/cache": { - "version": "11.7.1", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.7.1.tgz", - "integrity": "sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==", + "version": "11.9.3", + "license": "MIT", "dependencies": { "@emotion/memoize": "^0.7.4", - "@emotion/sheet": "^1.1.0", + "@emotion/sheet": "^1.1.1", "@emotion/utils": "^1.0.0", "@emotion/weak-memoize": "^0.2.5", "stylis": "4.0.13" @@ -1813,31 +1703,27 @@ }, "node_modules/@emotion/hash": { "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", - "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" + "license": "MIT" }, "node_modules/@emotion/is-prop-valid": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz", - "integrity": "sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ==", + "version": "1.1.3", + "license": "MIT", "dependencies": { "@emotion/memoize": "^0.7.4" } }, "node_modules/@emotion/memoize": { "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz", - "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==" + "license": "MIT" }, "node_modules/@emotion/react": { - "version": "11.9.0", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.9.0.tgz", - "integrity": "sha512-lBVSF5d0ceKtfKCDQJveNAtkC7ayxpVlgOohLgXqRwqWr9bOf4TZAFFyIcNngnV6xK6X4x2ZeXq7vliHkoVkxQ==", + "version": "11.9.3", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.13.10", "@emotion/babel-plugin": "^11.7.1", - "@emotion/cache": "^11.7.1", - "@emotion/serialize": "^1.0.3", + "@emotion/cache": "^11.9.3", + "@emotion/serialize": "^1.0.4", "@emotion/utils": "^1.1.0", "@emotion/weak-memoize": "^0.2.5", "hoist-non-react-statics": "^3.3.1" @@ -1856,9 +1742,8 @@ } }, "node_modules/@emotion/serialize": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.3.tgz", - "integrity": "sha512-2mSSvgLfyV3q+iVh3YWgNlUc2a9ZlDU7DjuP5MjK3AXRR0dYigCrP99aeFtaB2L/hjfEZdSThn5dsZ0ufqbvsA==", + "version": "1.0.4", + "license": "MIT", "dependencies": { "@emotion/hash": "^0.8.0", "@emotion/memoize": "^0.7.4", @@ -1868,19 +1753,17 @@ } }, "node_modules/@emotion/sheet": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.1.0.tgz", - "integrity": "sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==" + "version": "1.1.1", + "license": "MIT" }, "node_modules/@emotion/styled": { - "version": "11.8.1", - "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.8.1.tgz", - "integrity": "sha512-OghEVAYBZMpEquHZwuelXcRjRJQOVayvbmNR0zr174NHdmMgrNkLC6TljKC5h9lZLkN5WGrdUcrKlOJ4phhoTQ==", + "version": "11.9.3", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.13.10", "@emotion/babel-plugin": "^11.7.1", - "@emotion/is-prop-valid": "^1.1.2", - "@emotion/serialize": "^1.0.2", + "@emotion/is-prop-valid": "^1.1.3", + "@emotion/serialize": "^1.0.4", "@emotion/utils": "^1.1.0" }, "peerDependencies": { @@ -1899,23 +1782,19 @@ }, "node_modules/@emotion/unitless": { "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", - "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" + "license": "MIT" }, "node_modules/@emotion/utils": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.1.0.tgz", - "integrity": "sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ==" + "license": "MIT" }, "node_modules/@emotion/weak-memoize": { "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", - "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" + "license": "MIT" }, "node_modules/@jridgewell/gen-mapping": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "license": "MIT", "dependencies": { "@jridgewell/set-array": "^1.0.0", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -1925,30 +1804,48 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", - "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==", + "version": "3.1.0", + "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz", - "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==", + "version": "1.1.2", + "license": "MIT", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.2", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": { + "version": "0.3.2", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.13", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", - "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==" + "version": "1.4.14", + "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", - "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "version": "0.3.14", + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" @@ -1956,20 +1853,18 @@ }, "node_modules/@js.properties/properties": { "version": "0.5.4", - "resolved": "https://registry.npmjs.org/@js.properties/properties/-/properties-0.5.4.tgz", - "integrity": "sha512-4M/Mb2CxzuI1CtQhVFs6OC9ceuGPAP6SOWnpLcrdB1TcUHroXbsYDVJNOm32koRMfuCoRACbojcm4dPPcQxu0w==" + "license": "MIT" }, "node_modules/@mui/base": { - "version": "5.0.0-alpha.82", - "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.82.tgz", - "integrity": "sha512-WUVDjCGnLXzmGxrmfW31blhucg0sRX4YddK2Falq7FlVzwdJaPgWn/xzPZmdLL0+WXon0gQVnDrq2qvggE/GMg==", + "version": "5.0.0-alpha.88", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.17.2", - "@emotion/is-prop-valid": "^1.1.2", - "@mui/types": "^7.1.3", - "@mui/utils": "^5.8.0", + "@emotion/is-prop-valid": "^1.1.3", + "@mui/types": "^7.1.4", + "@mui/utils": "^5.8.6", "@popperjs/core": "^2.11.5", - "clsx": "^1.1.1", + "clsx": "^1.2.0", "prop-types": "^15.8.1", "react-is": "^17.0.2" }, @@ -1992,9 +1887,8 @@ } }, "node_modules/@mui/icons-material": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.8.0.tgz", - "integrity": "sha512-ScwLxa0q5VYV70Jfc60V/9VD0b9SvIeZ0Jddx2Dt2pBUFFO9vKdrbt9LYiT+4p21Au5NdYIb2XSHj46CLN1v3g==", + "version": "5.8.4", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.17.2" }, @@ -2017,19 +1911,17 @@ } }, "node_modules/@mui/material": { - "version": "5.8.1", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.8.1.tgz", - "integrity": "sha512-Vl3BHFzOcAT5TJfvzoQUyuo/Xckn+/NSRyJ8upM4Hbz6Y1egW6P8f1RCa4FdkEfPSd5wSSYdmPfAiEh8eI4rPg==", + "version": "5.8.7", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.17.2", - "@mui/base": "5.0.0-alpha.82", - "@mui/system": "^5.8.1", - "@mui/types": "^7.1.3", - "@mui/utils": "^5.8.0", - "@types/react-transition-group": "^4.4.4", - "clsx": "^1.1.1", - "csstype": "^3.0.11", - "hoist-non-react-statics": "^3.3.2", + "@mui/base": "5.0.0-alpha.88", + "@mui/system": "^5.8.7", + "@mui/types": "^7.1.4", + "@mui/utils": "^5.8.6", + "@types/react-transition-group": "^4.4.5", + "clsx": "^1.2.0", + "csstype": "^3.1.0", "prop-types": "^15.8.1", "react-is": "^17.0.2", "react-transition-group": "^4.4.2" @@ -2061,12 +1953,11 @@ } }, "node_modules/@mui/private-theming": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.8.0.tgz", - "integrity": "sha512-MjRAneTmCKLR9u2S4jtjLUe6gpHxlbb4g2bqpDJ2PdwlvwsWIUzbc/gVB4dvccljXeWxr5G2M/Co2blXisvFIw==", + "version": "5.8.6", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.17.2", - "@mui/utils": "^5.8.0", + "@mui/utils": "^5.8.6", "prop-types": "^15.8.1" }, "engines": { @@ -2087,12 +1978,12 @@ } }, "node_modules/@mui/styled-engine": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.8.0.tgz", - "integrity": "sha512-Q3spibB8/EgeMYHc+/o3RRTnAYkSl7ROCLhXJ830W8HZ2/iDiyYp16UcxKPurkXvLhUaILyofPVrP3Su2uKsAw==", + "version": "5.8.7", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.17.2", - "@emotion/cache": "^11.7.1", + "@emotion/cache": "^11.9.3", + "csstype": "^3.1.0", "prop-types": "^15.8.1" }, "engines": { @@ -2117,17 +2008,16 @@ } }, "node_modules/@mui/system": { - "version": "5.8.1", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.8.1.tgz", - "integrity": "sha512-kWJMEN62+HJb4LMRNEAZQYc++FPYsqPsU9dCL7ByLgmz/ZzRrZ8FjDi2r4j0ZeE4kaVvqBXh+RA7tLzmCKqV9w==", + "version": "5.8.7", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.17.2", - "@mui/private-theming": "^5.8.0", - "@mui/styled-engine": "^5.8.0", - "@mui/types": "^7.1.3", - "@mui/utils": "^5.8.0", - "clsx": "^1.1.1", - "csstype": "^3.0.11", + "@mui/private-theming": "^5.8.6", + "@mui/styled-engine": "^5.8.7", + "@mui/types": "^7.1.4", + "@mui/utils": "^5.8.6", + "clsx": "^1.2.0", + "csstype": "^3.1.0", "prop-types": "^15.8.1" }, "engines": { @@ -2156,9 +2046,8 @@ } }, "node_modules/@mui/types": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.3.tgz", - "integrity": "sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==", + "version": "7.1.4", + "license": "MIT", "peerDependencies": { "@types/react": "*" }, @@ -2169,9 +2058,8 @@ } }, "node_modules/@mui/utils": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.8.0.tgz", - "integrity": "sha512-7LgUtCvz78676iC0wpTH7HizMdCrTphhBmRWimIMFrp5Ph6JbDFVuKS1CwYnWWxRyYKL0QzXrDL0lptAU90EXg==", + "version": "5.8.6", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.17.2", "@types/prop-types": "^15.7.5", @@ -2192,8 +2080,7 @@ }, "node_modules/@popperjs/core": { "version": "2.11.5", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz", - "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==", + "license": "MIT", "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -2201,112 +2088,107 @@ }, "node_modules/@tootallnate/once": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 6" } }, "node_modules/@trysound/sax": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", - "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10.13.0" } }, "node_modules/@tsconfig/node10": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", - "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", - "dev": true + "version": "1.0.9", + "dev": true, + "license": "MIT" }, "node_modules/@tsconfig/node12": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", - "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", - "dev": true + "version": "1.0.11", + "dev": true, + "license": "MIT" }, "node_modules/@tsconfig/node14": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", - "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", - "dev": true + "version": "1.0.3", + "dev": true, + "license": "MIT" }, "node_modules/@tsconfig/node16": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", - "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", - "dev": true + "version": "1.0.3", + "dev": true, + "license": "MIT" }, "node_modules/@types/eslint": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.2.tgz", - "integrity": "sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA==", + "version": "8.4.5", "dev": true, + "license": "MIT", "dependencies": { "@types/estree": "*", "@types/json-schema": "*" } }, "node_modules/@types/eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "version": "3.7.4", "dev": true, + "license": "MIT", "dependencies": { "@types/eslint": "*", "@types/estree": "*" } }, + "node_modules/@types/eslint-scope/node_modules/@types/estree": { + "version": "0.0.52", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/eslint/node_modules/@types/estree": { + "version": "0.0.52", + "dev": true, + "license": "MIT" + }, "node_modules/@types/estree": { "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/hast": { "version": "2.3.4", - "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz", - "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==", + "license": "MIT", "dependencies": { "@types/unist": "*" } }, "node_modules/@types/json-schema": { "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/node": { - "version": "18.0.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz", - "integrity": "sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ==", + "version": "18.0.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.6.tgz", + "integrity": "sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw==", "dev": true }, "node_modules/@types/object-assign": { "version": "4.0.30", - "resolved": "https://registry.npmjs.org/@types/object-assign/-/object-assign-4.0.30.tgz", - "integrity": "sha512-HhE8gFfLj321pa6OE59QmOdL5NgIOhkdYn7MWnZTOcHOms8XFzNgr9+A0/GbN0XEX9wTM58yg4YXKhGr69QIUw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/parse-json": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" + "license": "MIT" }, "node_modules/@types/prop-types": { "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" + "license": "MIT" }, "node_modules/@types/react": { - "version": "18.0.9", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.9.tgz", - "integrity": "sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==", + "version": "18.0.15", + "license": "MIT", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -2314,74 +2196,122 @@ } }, "node_modules/@types/react-dom": { - "version": "18.0.5", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz", - "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==", + "version": "18.0.6", "dev": true, + "license": "MIT", "dependencies": { "@types/react": "*" } }, "node_modules/@types/react-is": { "version": "17.0.3", - "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-17.0.3.tgz", - "integrity": "sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==", + "license": "MIT", "dependencies": { "@types/react": "*" } }, "node_modules/@types/react-onsenui": { - "version": "2.9.17", - "resolved": "https://registry.npmjs.org/@types/react-onsenui/-/react-onsenui-2.9.17.tgz", - "integrity": "sha512-r62+TB80SGCwTQDiMr2dA2zqOVAW7GD1mNv9dSuanmAynViNkw2gAUgeI7MsP7klXr7cflJedrWwvb8ng0OaDg==", + "version": "2.9.18", "dev": true, + "license": "MIT", "dependencies": { "@types/react": "*" } }, "node_modules/@types/react-syntax-highlighter": { "version": "15.5.2", - "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-15.5.2.tgz", - "integrity": "sha512-cJJvwU8lQv/efGSo/LmPoaOqWi/B0AG4CNKKCn7HPUL25SqiPn1Vl+fV1JiUigJv97ruTZ8mo08+b8/0zoYufA==", "dev": true, + "license": "MIT", "dependencies": { "@types/react": "*" } }, "node_modules/@types/react-transition-group": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz", - "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==", + "version": "4.4.5", + "license": "MIT", "dependencies": { "@types/react": "*" } }, "node_modules/@types/scheduler": { "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", - "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" + "license": "MIT" + }, + "node_modules/@types/source-list-map": { + "version": "0.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/tapable": { + "version": "1.0.8", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/uglify-js": { + "version": "3.16.0", + "dev": true, + "license": "MIT", + "dependencies": { + "source-map": "^0.6.1" + } + }, + "node_modules/@types/uglifyjs-webpack-plugin": { + "version": "1.1.2", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/webpack": "^4" + } + }, + "node_modules/@types/uglifyjs-webpack-plugin/node_modules/@types/webpack": { + "version": "4.41.32", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "@types/tapable": "^1", + "@types/uglify-js": "*", + "@types/webpack-sources": "*", + "anymatch": "^3.0.0", + "source-map": "^0.6.0" + } }, "node_modules/@types/unist": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", - "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==" + "license": "MIT" }, "node_modules/@types/webpack": { "version": "5.28.0", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz", - "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", "tapable": "^2.2.0", "webpack": "^5" } }, + "node_modules/@types/webpack-sources": { + "version": "3.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/node": "*", + "@types/source-list-map": "*", + "source-map": "^0.7.3" + } + }, + "node_modules/@types/webpack-sources/node_modules/source-map": { + "version": "0.7.4", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">= 8" + } + }, "node_modules/@webassemblyjs/ast": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/helper-numbers": "1.11.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.1" @@ -2389,27 +2319,23 @@ }, "node_modules/@webassemblyjs/floating-point-hex-parser": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-api-error": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-buffer": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-numbers": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/floating-point-hex-parser": "1.11.1", "@webassemblyjs/helper-api-error": "1.11.1", @@ -2418,15 +2344,13 @@ }, "node_modules/@webassemblyjs/helper-wasm-bytecode": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/helper-wasm-section": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -2436,33 +2360,29 @@ }, "node_modules/@webassemblyjs/ieee754": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", "dev": true, + "license": "MIT", "dependencies": { "@xtuc/ieee754": "^1.2.0" } }, "node_modules/@webassemblyjs/leb128": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@xtuc/long": "4.2.2" } }, "node_modules/@webassemblyjs/utf8": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@webassemblyjs/wasm-edit": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -2476,9 +2396,8 @@ }, "node_modules/@webassemblyjs/wasm-gen": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-wasm-bytecode": "1.11.1", @@ -2489,9 +2408,8 @@ }, "node_modules/@webassemblyjs/wasm-opt": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-buffer": "1.11.1", @@ -2501,9 +2419,8 @@ }, "node_modules/@webassemblyjs/wasm-parser": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/helper-api-error": "1.11.1", @@ -2515,29 +2432,26 @@ }, "node_modules/@webassemblyjs/wast-printer": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", "dev": true, + "license": "MIT", "dependencies": { "@webassemblyjs/ast": "1.11.1", "@xtuc/long": "4.2.2" } }, "node_modules/@webpack-cli/configtest": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz", - "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==", + "version": "1.2.0", "dev": true, + "license": "MIT", "peerDependencies": { "webpack": "4.x.x || 5.x.x", "webpack-cli": "4.x.x" } }, "node_modules/@webpack-cli/info": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz", - "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==", + "version": "1.5.0", "dev": true, + "license": "MIT", "dependencies": { "envinfo": "^7.7.3" }, @@ -2546,10 +2460,9 @@ } }, "node_modules/@webpack-cli/serve": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz", - "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==", + "version": "1.7.0", "dev": true, + "license": "MIT", "peerDependencies": { "webpack-cli": "4.x.x" }, @@ -2561,27 +2474,23 @@ }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/@xtuc/long": { "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/abbrev": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/acorn": { "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -2591,27 +2500,24 @@ }, "node_modules/acorn-import-assertions": { "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", "dev": true, + "license": "MIT", "peerDependencies": { "acorn": "^8" } }, "node_modules/acorn-walk": { "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.4.0" } }, "node_modules/agent-base": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, + "license": "MIT", "dependencies": { "debug": "4" }, @@ -2621,9 +2527,8 @@ }, "node_modules/ajv": { "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -2635,11 +2540,18 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/ajv-errors": { + "version": "1.0.1", + "dev": true, + "license": "MIT", + "peerDependencies": { + "ajv": ">=5.0.0" + } + }, "node_modules/ajv-formats": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", - "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "dev": true, + "license": "MIT", "dependencies": { "ajv": "^8.0.0" }, @@ -2654,9 +2566,8 @@ }, "node_modules/ajv-formats/node_modules/ajv": { "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -2670,23 +2581,20 @@ }, "node_modules/ajv-formats/node_modules/json-schema-traverse": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/ajv-keywords": { "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true, + "license": "MIT", "peerDependencies": { "ajv": "^6.9.1" } }, "node_modules/ansi-styles": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "license": "MIT", "dependencies": { "color-convert": "^1.9.0" }, @@ -2696,9 +2604,8 @@ }, "node_modules/anymatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -2707,45 +2614,44 @@ "node": ">= 8" } }, + "node_modules/aproba": { + "version": "1.2.0", + "dev": true, + "license": "ISC" + }, "node_modules/arg": { "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/argparse": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, + "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" } }, "node_modules/array-find-index": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/asap": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/asynckit": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + "license": "MIT" }, "node_modules/axios": { "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.14.9", "form-data": "^4.0.0" @@ -2753,9 +2659,8 @@ }, "node_modules/babel-loader": { "version": "8.2.5", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz", - "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==", "dev": true, + "license": "MIT", "dependencies": { "find-cache-dir": "^3.3.1", "loader-utils": "^2.0.0", @@ -2772,17 +2677,15 @@ }, "node_modules/babel-plugin-dynamic-import-node": { "version": "2.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", - "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", "dev": true, + "license": "MIT", "dependencies": { "object.assign": "^4.1.0" } }, "node_modules/babel-plugin-macros": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz", - "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.7.2", "cosmiconfig": "^6.0.0", @@ -2791,8 +2694,7 @@ }, "node_modules/babel-plugin-macros/node_modules/cosmiconfig": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", - "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", + "license": "MIT", "dependencies": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.1.0", @@ -2804,11 +2706,17 @@ "node": ">=8" } }, + "node_modules/babel-plugin-macros/node_modules/yaml": { + "version": "1.10.2", + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, "node_modules/babel-plugin-polyfill-corejs2": { "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz", - "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==", "dev": true, + "license": "MIT", "dependencies": { "@babel/compat-data": "^7.13.11", "@babel/helper-define-polyfill-provider": "^0.3.1", @@ -2820,9 +2728,8 @@ }, "node_modules/babel-plugin-polyfill-corejs3": { "version": "0.5.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz", - "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-define-polyfill-provider": "^0.3.1", "core-js-compat": "^3.21.0" @@ -2833,9 +2740,8 @@ }, "node_modules/babel-plugin-polyfill-regenerator": { "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz", - "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-define-polyfill-provider": "^0.3.1" }, @@ -2845,44 +2751,43 @@ }, "node_modules/balanced-match": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/big.js": { "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true, + "license": "MIT", "engines": { "node": "*" } }, "node_modules/binary-extensions": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, + "node_modules/bluebird": { + "version": "3.7.2", + "dev": true, + "license": "MIT" + }, "node_modules/boolbase": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/bota64": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/bota64/-/bota64-1.0.4.tgz", - "integrity": "sha512-zWjktQnNqBA0tP2EKeOUVMawTYiTa2FXtJi2fr3kpxspMBML7mHLMndJiG5GOwvwnPR/gslODzdLfzd60OZ4Lg==" + "version": "1.0.7", + "license": "MIT" }, "node_modules/brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2890,9 +2795,8 @@ }, "node_modules/braces": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, + "license": "MIT", "dependencies": { "fill-range": "^7.0.1" }, @@ -2902,14 +2806,11 @@ }, "node_modules/browser-stdout": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/browserslist": { - "version": "4.20.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz", - "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==", + "version": "4.21.1", "funding": [ { "type": "opencollective", @@ -2920,12 +2821,12 @@ "url": "https://tidelift.com/funding/github/npm/browserslist" } ], + "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001332", - "electron-to-chromium": "^1.4.118", - "escalade": "^3.1.1", - "node-releases": "^2.0.3", - "picocolors": "^1.0.0" + "caniuse-lite": "^1.0.30001359", + "electron-to-chromium": "^1.4.172", + "node-releases": "^2.0.5", + "update-browserslist-db": "^1.0.4" }, "bin": { "browserslist": "cli.js" @@ -2936,15 +2837,48 @@ }, "node_modules/buffer-from": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/cacache": { + "version": "12.0.4", + "dev": true, + "license": "ISC", + "dependencies": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + } + }, + "node_modules/cacache/node_modules/lru-cache": { + "version": "5.1.1", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/cacache/node_modules/yallist": { + "version": "3.1.1", + "dev": true, + "license": "ISC" }, "node_modules/call-bind": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", "dev": true, + "license": "MIT", "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -2955,17 +2889,15 @@ }, "node_modules/callsites": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/caniuse-api": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", - "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", "dev": true, + "license": "MIT", "dependencies": { "browserslist": "^4.0.0", "caniuse-lite": "^1.0.0", @@ -2974,9 +2906,7 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001343", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001343.tgz", - "integrity": "sha512-8KeCrAtPMabo/XW14B+R9sZYoClx1n0b+WYgwDKZPtWR3TcdvWzdSy7mPyFEmR5WU1St9v1PW6sdO5dkFOEzfA==", + "version": "1.0.30001363", "funding": [ { "type": "opencollective", @@ -2986,12 +2916,12 @@ "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chalk": { "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -3001,10 +2931,34 @@ "node": ">=4" } }, + "node_modules/chalk/node_modules/has-flag": { + "version": "3.0.0", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "5.5.0", + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/character-entities": { + "version": "1.2.4", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/character-entities-legacy": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", - "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -3012,8 +2966,7 @@ }, "node_modules/character-reference-invalid": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", - "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -3021,8 +2974,6 @@ }, "node_modules/chokidar": { "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, "funding": [ { @@ -3030,6 +2981,7 @@ "url": "https://paulmillr.com/funding/" } ], + "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -3046,20 +2998,23 @@ "fsevents": "~2.3.2" } }, + "node_modules/chownr": { + "version": "1.1.4", + "dev": true, + "license": "ISC" + }, "node_modules/chrome-trace-event": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0" } }, "node_modules/clone-deep": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, + "license": "MIT", "dependencies": { "is-plain-object": "^2.0.4", "kind-of": "^6.0.2", @@ -3070,42 +3025,36 @@ } }, "node_modules/clsx": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", - "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==", + "version": "1.2.1", + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/color-convert": { "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "license": "MIT", "dependencies": { "color-name": "1.1.3" } }, "node_modules/color-name": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + "license": "MIT" }, "node_modules/colord": { "version": "2.9.2", - "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz", - "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/colorette": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", - "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", - "dev": true + "version": "2.0.19", + "dev": true, + "license": "MIT" }, "node_modules/combined-stream": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" }, @@ -3113,42 +3062,72 @@ "node": ">= 0.8" } }, + "node_modules/comma-separated-tokens": { + "version": "1.0.8", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/commander": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10" } }, "node_modules/commondir": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/concat-stream": { + "version": "1.6.2", + "dev": true, + "engines": [ + "node >= 0.8" + ], + "license": "MIT", + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } }, "node_modules/convert-source-map": { "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", + "license": "MIT", "dependencies": { "safe-buffer": "~5.1.1" } }, - "node_modules/core-js-compat": { - "version": "3.22.7", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.7.tgz", - "integrity": "sha512-uI9DAQKKiiE/mclIC5g4AjRpio27g+VMRhe6rQoz+q4Wm4L6A/fJhiLtBw+sfOpDG9wZ3O0pxIw7GbfOlBgjOA==", + "node_modules/copy-concurrently": { + "version": "1.0.5", "dev": true, + "license": "ISC", "dependencies": { - "browserslist": "^4.20.3", + "aproba": "^1.1.1", + "fs-write-stream-atomic": "^1.0.8", + "iferr": "^0.1.5", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.0" + } + }, + "node_modules/core-js-compat": { + "version": "3.23.3", + "dev": true, + "license": "MIT", + "dependencies": { + "browserslist": "^4.21.0", "semver": "7.0.0" }, "funding": { @@ -3158,18 +3137,21 @@ }, "node_modules/core-js-compat/node_modules/semver": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" } }, + "node_modules/core-util-is": { + "version": "1.0.3", + "dev": true, + "license": "MIT" + }, "node_modules/cosmiconfig": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", - "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.2.1", @@ -3181,17 +3163,23 @@ "node": ">=10" } }, + "node_modules/cosmiconfig/node_modules/yaml": { + "version": "1.10.2", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, "node_modules/create-require": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cross-spawn": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -3202,10 +3190,9 @@ } }, "node_modules/css-declaration-sorter": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz", - "integrity": "sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==", + "version": "6.3.0", "dev": true, + "license": "ISC", "engines": { "node": "^10 || ^12 || >=14" }, @@ -3215,9 +3202,8 @@ }, "node_modules/css-loader": { "version": "6.7.1", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz", - "integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==", "dev": true, + "license": "MIT", "dependencies": { "icss-utils": "^5.1.0", "postcss": "^8.4.7", @@ -3241,9 +3227,8 @@ }, "node_modules/css-loader/node_modules/semver": { "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -3256,9 +3241,8 @@ }, "node_modules/css-minimizer-webpack-plugin": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-4.0.0.tgz", - "integrity": "sha512-7ZXXRzRHvofv3Uac5Y+RkWRNo0ZMlcg8e9/OtrqUYmwDWJo+qs67GvdeFrXLsFb7czKNwjQhPkM0avlIYl+1nA==", "dev": true, + "license": "MIT", "dependencies": { "cssnano": "^5.1.8", "jest-worker": "^27.5.1", @@ -3294,9 +3278,8 @@ }, "node_modules/css-minimizer-webpack-plugin/node_modules/ajv": { "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -3310,9 +3293,8 @@ }, "node_modules/css-minimizer-webpack-plugin/node_modules/ajv-keywords": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3" }, @@ -3322,15 +3304,13 @@ }, "node_modules/css-minimizer-webpack-plugin/node_modules/json-schema-traverse": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.9", "ajv": "^8.8.0", @@ -3347,9 +3327,8 @@ }, "node_modules/css-select": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0", "css-what": "^6.0.1", @@ -3363,9 +3342,8 @@ }, "node_modules/css-tree": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", - "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", "dev": true, + "license": "MIT", "dependencies": { "mdn-data": "2.0.14", "source-map": "^0.6.1" @@ -3376,8 +3354,7 @@ }, "node_modules/css-vendor": { "version": "2.0.8", - "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz", - "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.8.3", "is-in-browser": "^1.0.2" @@ -3385,9 +3362,8 @@ }, "node_modules/css-what": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">= 6" }, @@ -3397,9 +3373,8 @@ }, "node_modules/cssesc": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true, + "license": "MIT", "bin": { "cssesc": "bin/cssesc" }, @@ -3408,12 +3383,11 @@ } }, "node_modules/cssnano": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.9.tgz", - "integrity": "sha512-hctQHIIeDrfMjq0bQhoVmRVaSeNNOGxkvkKVOcKpJzLr09wlRrZWH4GaYudp0aszpW8wJeaO5/yBmID9n7DNCg==", + "version": "5.1.12", "dev": true, + "license": "MIT", "dependencies": { - "cssnano-preset-default": "^5.2.9", + "cssnano-preset-default": "^5.2.12", "lilconfig": "^2.0.3", "yaml": "^1.10.2" }, @@ -3429,36 +3403,35 @@ } }, "node_modules/cssnano-preset-default": { - "version": "5.2.9", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.9.tgz", - "integrity": "sha512-/4qcQcAfFEg+gnXE5NxKmYJ9JcT+8S5SDuJCLYMDN8sM/ymZ+lgLXq5+ohx/7V2brUCkgW2OaoCzOdAN0zvhGw==", + "version": "5.2.12", "dev": true, + "license": "MIT", "dependencies": { - "css-declaration-sorter": "^6.2.2", + "css-declaration-sorter": "^6.3.0", "cssnano-utils": "^3.1.0", "postcss-calc": "^8.2.3", "postcss-colormin": "^5.3.0", - "postcss-convert-values": "^5.1.1", - "postcss-discard-comments": "^5.1.1", + "postcss-convert-values": "^5.1.2", + "postcss-discard-comments": "^5.1.2", "postcss-discard-duplicates": "^5.1.0", "postcss-discard-empty": "^5.1.1", "postcss-discard-overridden": "^5.1.0", - "postcss-merge-longhand": "^5.1.5", - "postcss-merge-rules": "^5.1.1", + "postcss-merge-longhand": "^5.1.6", + "postcss-merge-rules": "^5.1.2", "postcss-minify-font-values": "^5.1.0", "postcss-minify-gradients": "^5.1.1", "postcss-minify-params": "^5.1.3", - "postcss-minify-selectors": "^5.2.0", + "postcss-minify-selectors": "^5.2.1", "postcss-normalize-charset": "^5.1.0", "postcss-normalize-display-values": "^5.1.0", - "postcss-normalize-positions": "^5.1.0", - "postcss-normalize-repeat-style": "^5.1.0", + "postcss-normalize-positions": "^5.1.1", + "postcss-normalize-repeat-style": "^5.1.1", "postcss-normalize-string": "^5.1.0", "postcss-normalize-timing-functions": "^5.1.0", "postcss-normalize-unicode": "^5.1.0", "postcss-normalize-url": "^5.1.0", "postcss-normalize-whitespace": "^5.1.1", - "postcss-ordered-values": "^5.1.1", + "postcss-ordered-values": "^5.1.3", "postcss-reduce-initial": "^5.1.0", "postcss-reduce-transforms": "^5.1.0", "postcss-svgo": "^5.1.0", @@ -3473,9 +3446,8 @@ }, "node_modules/cssnano-utils": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", - "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", "dev": true, + "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" }, @@ -3483,11 +3455,18 @@ "postcss": "^8.2.15" } }, + "node_modules/cssnano/node_modules/yaml": { + "version": "1.10.2", + "dev": true, + "license": "ISC", + "engines": { + "node": ">= 6" + } + }, "node_modules/csso": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", - "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", "dev": true, + "license": "MIT", "dependencies": { "css-tree": "^1.1.2" }, @@ -3497,13 +3476,16 @@ }, "node_modules/csstype": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz", - "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==" + "license": "MIT" + }, + "node_modules/cyclist": { + "version": "1.0.1", + "dev": true, + "license": "MIT" }, "node_modules/debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -3518,18 +3500,16 @@ }, "node_modules/debuglog": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz", - "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=", "dev": true, + "license": "MIT", "engines": { "node": "*" } }, "node_modules/define-properties": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", "dev": true, + "license": "MIT", "dependencies": { "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" @@ -3543,17 +3523,15 @@ }, "node_modules/delayed-stream": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", "engines": { "node": ">=0.4.0" } }, "node_modules/dezalgo": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", - "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", "dev": true, + "license": "ISC", "dependencies": { "asap": "^2.0.0", "wrappy": "1" @@ -3561,17 +3539,15 @@ }, "node_modules/diff": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } }, "node_modules/dom-helpers": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", - "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.8.7", "csstype": "^3.0.2" @@ -3579,9 +3555,8 @@ }, "node_modules/dom-serializer": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", "dev": true, + "license": "MIT", "dependencies": { "domelementtype": "^2.0.1", "domhandler": "^4.2.0", @@ -3593,21 +3568,19 @@ }, "node_modules/domelementtype": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "dev": true, "funding": [ { "type": "github", "url": "https://github.com/sponsors/fb55" } - ] + ], + "license": "BSD-2-Clause" }, "node_modules/domhandler": { "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.2.0" }, @@ -3620,9 +3593,8 @@ }, "node_modules/domutils": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^1.0.1", "domelementtype": "^2.2.0", @@ -3632,25 +3604,41 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, + "node_modules/duplexify": { + "version": "3.7.1", + "dev": true, + "license": "MIT", + "dependencies": { + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" + } + }, "node_modules/electron-to-chromium": { - "version": "1.4.139", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.139.tgz", - "integrity": "sha512-lYxzcUCjWxxVug+A7UxBCUiVr13TCjfZFYJS9Lq1VpU/ErwV4a6zUQo9dfojuGpw/L/x9REGuBl6ICQPGgbs3g==" + "version": "1.4.184", + "license": "ISC" }, "node_modules/emojis-list": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "dev": true, + "license": "MIT", + "dependencies": { + "once": "^1.4.0" + } + }, "node_modules/enhanced-resolve": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz", - "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==", + "version": "5.10.0", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -3661,18 +3649,16 @@ }, "node_modules/entities": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", "dev": true, + "license": "BSD-2-Clause", "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } }, "node_modules/envinfo": { "version": "7.8.1", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", - "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", "dev": true, + "license": "MIT", "bin": { "envinfo": "dist/cli.js" }, @@ -3680,56 +3666,60 @@ "node": ">=4" } }, + "node_modules/errno": { + "version": "0.1.8", + "dev": true, + "license": "MIT", + "dependencies": { + "prr": "~1.0.1" + }, + "bin": { + "errno": "cli.js" + } + }, "node_modules/error-ex": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" } }, "node_modules/es-module-lexer": { "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/es6-promise": { "version": "4.2.8", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/es6-promisify": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", - "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==", "dev": true, + "license": "MIT", "dependencies": { "es6-promise": "^4.0.3" } }, "node_modules/escalade": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/escape-string-regexp": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "license": "MIT", "engines": { "node": ">=0.8.0" } }, "node_modules/eslint-scope": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" @@ -3740,9 +3730,8 @@ }, "node_modules/esprima": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true, + "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -3753,9 +3742,8 @@ }, "node_modules/esrecurse": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -3765,85 +3753,54 @@ }, "node_modules/esrecurse/node_modules/estraverse": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } }, "node_modules/estraverse": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } }, "node_modules/esutils": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/events": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.x" } }, - "node_modules/execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" - } - }, "node_modules/fast-deep-equal": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fastest-levenshtein": { "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", - "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fault": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", - "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", + "license": "MIT", "dependencies": { "format": "^0.2.0" }, @@ -3852,11 +3809,15 @@ "url": "https://github.com/sponsors/wooorm" } }, + "node_modules/figgy-pudding": { + "version": "3.5.2", + "dev": true, + "license": "ISC" + }, "node_modules/file-loader": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz", - "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==", "dev": true, + "license": "MIT", "dependencies": { "loader-utils": "^2.0.0", "schema-utils": "^3.0.0" @@ -3874,9 +3835,8 @@ }, "node_modules/file-loader/node_modules/schema-utils": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -3892,9 +3852,8 @@ }, "node_modules/fill-range": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -3904,9 +3863,8 @@ }, "node_modules/find-cache-dir": { "version": "3.3.2", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", - "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", "dev": true, + "license": "MIT", "dependencies": { "commondir": "^1.0.1", "make-dir": "^3.0.2", @@ -3921,14 +3879,12 @@ }, "node_modules/find-root": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", - "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" + "license": "MIT" }, "node_modules/find-up": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -3937,16 +3893,24 @@ "node": ">=8" } }, + "node_modules/flush-write-stream": { + "version": "1.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" + } + }, "node_modules/follow-redirects": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz", - "integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==", + "version": "1.15.1", "funding": [ { "type": "individual", "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -3958,8 +3922,7 @@ }, "node_modules/form-data": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -3971,76 +3934,63 @@ }, "node_modules/format": { "version": "0.2.2", - "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", - "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==", "engines": { "node": ">=0.4.x" } }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "node_modules/from2": { + "version": "2.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" + } }, - "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "node_modules/fs-write-stream-atomic": { + "version": "1.0.10", "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + "license": "ISC", + "dependencies": { + "graceful-fs": "^4.1.2", + "iferr": "^0.1.5", + "imurmurhash": "^0.1.4", + "readable-stream": "1 || 2" } }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "dev": true, + "license": "ISC" + }, "node_modules/function-bind": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "license": "MIT" }, "node_modules/gensync": { "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "version": "1.1.2", "dev": true, + "license": "MIT", "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.1" + "has-symbols": "^1.0.3" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/glob": { "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -4058,9 +4008,8 @@ }, "node_modules/glob-parent": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -4070,22 +4019,19 @@ }, "node_modules/glob-to-regexp": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true + "dev": true, + "license": "BSD-2-Clause" }, "node_modules/globals": { "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/googlers-tools": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/googlers-tools/-/googlers-tools-1.1.7.tgz", - "integrity": "sha512-tbrYhRWBEKV0owsrMqadXogVOVd1atFd/rl6bjoqwLJHwRuil9J02u4kSIQ+weAzJa24IpAHeblpr3JIaZKIsQ==", + "version": "1.2.7", + "license": "GPL-3.0", "dependencies": { "react": "^18.2.0", "react-console": "^1.0.0-rc.2", @@ -4094,23 +4040,20 @@ }, "node_modules/graceful-fs": { "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/growl": { "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4.x" } }, "node_modules/has": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.1" }, @@ -4119,18 +4062,17 @@ } }, "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "version": "4.0.0", + "dev": true, + "license": "MIT", "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/has-property-descriptors": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", "dev": true, + "license": "MIT", "dependencies": { "get-intrinsic": "^1.1.1" }, @@ -4140,9 +4082,8 @@ }, "node_modules/has-symbols": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -4152,8 +4093,7 @@ }, "node_modules/hast-util-parse-selector": { "version": "2.2.5", - "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz", - "integrity": "sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==", + "license": "MIT", "funding": { "type": "opencollective", "url": "https://opencollective.com/unified" @@ -4161,8 +4101,7 @@ }, "node_modules/hastscript": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz", - "integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==", + "license": "MIT", "dependencies": { "@types/hast": "^2.0.0", "comma-separated-tokens": "^1.0.0", @@ -4175,69 +4114,41 @@ "url": "https://opencollective.com/unified" } }, - "node_modules/hastscript/node_modules/comma-separated-tokens": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz", - "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/hastscript/node_modules/property-information": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz", - "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==", - "dependencies": { - "xtend": "^4.0.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, - "node_modules/hastscript/node_modules/space-separated-tokens": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz", - "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/he": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha512-z/GDPjlRMNOa2XJiB4em8wJpuuBfrFOlYKTZxtpkdr1uPdibHI8rYA3MY0KDObpVyaes0e/aunid/t88ZI2EKA==", "dev": true, + "license": "MIT", "bin": { "he": "bin/he" } }, + "node_modules/highlight.js": { + "version": "11.6.0", + "license": "BSD-3-Clause", + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/hoist-non-react-statics": { "version": "3.3.2", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", - "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "license": "BSD-3-Clause", "dependencies": { "react-is": "^16.7.0" } }, "node_modules/hoist-non-react-statics/node_modules/react-is": { "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "license": "MIT" }, "node_modules/hosted-git-info": { "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/http-proxy-agent": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, + "license": "MIT", "dependencies": { "@tootallnate/once": "1", "agent-base": "6", @@ -4249,9 +4160,8 @@ }, "node_modules/https-proxy-agent": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "6", "debug": "4" @@ -4260,25 +4170,14 @@ "node": ">= 6" } }, - "node_modules/human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true, - "engines": { - "node": ">=10.17.0" - } - }, "node_modules/hyphenate-style-name": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz", - "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==" + "license": "BSD-3-Clause" }, "node_modules/icss-utils": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", "dev": true, + "license": "ISC", "engines": { "node": "^10 || ^12 || >= 14" }, @@ -4286,16 +4185,19 @@ "postcss": "^8.1.0" } }, + "node_modules/iferr": { + "version": "0.1.5", + "dev": true, + "license": "MIT" + }, "node_modules/immutable": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", - "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/import-fresh": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -4309,9 +4211,8 @@ }, "node_modules/import-local": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", "dev": true, + "license": "MIT", "dependencies": { "pkg-dir": "^4.2.0", "resolve-cwd": "^3.0.0" @@ -4326,11 +4227,23 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/infer-owner": { + "version": "1.0.4", + "dev": true, + "license": "ISC" + }, "node_modules/inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -4338,23 +4251,20 @@ }, "node_modules/inherits": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/interpret": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", - "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.10" } }, "node_modules/is-alphabetical": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", - "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -4362,8 +4272,7 @@ }, "node_modules/is-alphanumerical": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", - "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", + "license": "MIT", "dependencies": { "is-alphabetical": "^1.0.0", "is-decimal": "^1.0.0" @@ -4375,14 +4284,12 @@ }, "node_modules/is-arrayish": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + "license": "MIT" }, "node_modules/is-binary-path": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -4392,8 +4299,7 @@ }, "node_modules/is-core-module": { "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", + "license": "MIT", "dependencies": { "has": "^1.0.3" }, @@ -4403,8 +4309,7 @@ }, "node_modules/is-decimal": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", - "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -4412,18 +4317,16 @@ }, "node_modules/is-extglob": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/is-glob": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -4433,8 +4336,7 @@ }, "node_modules/is-hexadecimal": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", - "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -4442,23 +4344,20 @@ }, "node_modules/is-in-browser": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz", - "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=" + "license": "MIT" }, "node_modules/is-number": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } }, "node_modules/is-plain-object": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, + "license": "MIT", "dependencies": { "isobject": "^3.0.1" }, @@ -4466,44 +4365,41 @@ "node": ">=0.10.0" } }, - "node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "node_modules/is-wsl": { + "version": "1.1.0", "dev": true, + "license": "MIT", "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=4" } }, + "node_modules/isarray": { + "version": "1.0.0", + "dev": true, + "license": "MIT" + }, "node_modules/isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/isobject": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/javascript-stringify": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz", - "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/jest-worker": { "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*", "merge-stream": "^2.0.0", @@ -4513,40 +4409,14 @@ "node": ">= 10.13.0" } }, - "node_modules/jest-worker/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, "node_modules/js-tokens": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "license": "MIT" }, "node_modules/js-yaml": { "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -4557,9 +4427,8 @@ }, "node_modules/js-yaml-loader": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/js-yaml-loader/-/js-yaml-loader-1.2.2.tgz", - "integrity": "sha512-H+NeuNrG6uOs/WMjna2SjkaCw13rMWiT/D7l9+9x5n8aq88BDsh2sRmdfxckWPIHtViYHWRG6XiCKYvS1dfyLg==", "dev": true, + "license": "MIT", "dependencies": { "js-yaml": "^3.13.1", "loader-utils": "^1.2.3", @@ -4568,9 +4437,8 @@ }, "node_modules/js-yaml-loader/node_modules/json5": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, + "license": "MIT", "dependencies": { "minimist": "^1.2.0" }, @@ -4580,9 +4448,8 @@ }, "node_modules/js-yaml-loader/node_modules/loader-utils": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", "dev": true, + "license": "MIT", "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -4594,8 +4461,7 @@ }, "node_modules/jsesc": { "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, @@ -4605,19 +4471,16 @@ }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" + "license": "MIT" }, "node_modules/json-schema-traverse": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json5": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", - "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "license": "MIT", "bin": { "json5": "lib/cli.js" }, @@ -4627,8 +4490,7 @@ }, "node_modules/jss": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss/-/jss-10.9.0.tgz", - "integrity": "sha512-YpzpreB6kUunQBbrlArlsMpXYyndt9JATbt95tajx0t4MTJJcCJdd4hdNpHmOIDiUJrF/oX5wtVFrS3uofWfGw==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "csstype": "^3.0.2", @@ -4642,8 +4504,7 @@ }, "node_modules/jss-plugin-camel-case": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.0.tgz", - "integrity": "sha512-UH6uPpnDk413/r/2Olmw4+y54yEF2lRIV8XIZyuYpgPYTITLlPOsq6XB9qeqv+75SQSg3KLocq5jUBXW8qWWww==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "hyphenate-style-name": "^1.0.3", @@ -4652,8 +4513,7 @@ }, "node_modules/jss-plugin-compose": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-compose/-/jss-plugin-compose-10.9.0.tgz", - "integrity": "sha512-Q/0FEZhDwGUpf3/b7+PspmMi6MVSlN3YlTDmvrft7I6N346jUpd8MYkYP/6qM1ZMuVj4v8ky/XYqr1v2ganLLg==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -4662,8 +4522,7 @@ }, "node_modules/jss-plugin-default-unit": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.9.0.tgz", - "integrity": "sha512-7Ju4Q9wJ/MZPsxfu4T84mzdn7pLHWeqoGd/D8O3eDNNJ93Xc8PxnLmV8s8ZPNRYkLdxZqKtm1nPQ0BM4JRlq2w==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "jss": "10.9.0" @@ -4671,8 +4530,7 @@ }, "node_modules/jss-plugin-expand": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-expand/-/jss-plugin-expand-10.9.0.tgz", - "integrity": "sha512-QfZ9jld0HpF1OiYU7cGWQ4q+f6+Wu93mV4X+cA1iVRssiUbSbygwdfZkUwX23UOhS1WWRJeQlLK1aJC94K8/0A==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "jss": "10.9.0" @@ -4680,8 +4538,7 @@ }, "node_modules/jss-plugin-extend": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-extend/-/jss-plugin-extend-10.9.0.tgz", - "integrity": "sha512-xvmosUh3RsKVsm9L14ml6PL3i0Ejj5gB6eo/jTMkGW1kIy42gNXV1EthR8cD5xiowWstnvugQ3JF0pI5+QkPMg==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -4690,8 +4547,7 @@ }, "node_modules/jss-plugin-global": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.9.0.tgz", - "integrity": "sha512-4G8PHNJ0x6nwAFsEzcuVDiBlyMsj2y3VjmFAx/uHk/R/gzJV+yRHICjT4MKGGu1cJq2hfowFWCyrr/Gg37FbgQ==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "jss": "10.9.0" @@ -4699,8 +4555,7 @@ }, "node_modules/jss-plugin-nested": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.9.0.tgz", - "integrity": "sha512-2UJnDrfCZpMYcpPYR16oZB7VAC6b/1QLsRiAutOt7wJaaqwCBvNsosLEu/fUyKNQNGdvg2PPJFDO5AX7dwxtoA==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -4709,8 +4564,7 @@ }, "node_modules/jss-plugin-props-sort": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.9.0.tgz", - "integrity": "sha512-7A76HI8bzwqrsMOJTWKx/uD5v+U8piLnp5bvru7g/3ZEQOu1+PjHvv7bFdNO3DwNPC9oM0a//KwIJsIcDCjDzw==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "jss": "10.9.0" @@ -4718,8 +4572,7 @@ }, "node_modules/jss-plugin-rule-value-function": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.9.0.tgz", - "integrity": "sha512-IHJv6YrEf8pRzkY207cPmdbBstBaE+z8pazhPShfz0tZSDtRdQua5jjg6NMz3IbTasVx9FdnmptxPqSWL5tyJg==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -4728,8 +4581,7 @@ }, "node_modules/jss-plugin-rule-value-observable": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-observable/-/jss-plugin-rule-value-observable-10.9.0.tgz", - "integrity": "sha512-/MWVPJVEn41+ofzQdsvH1GR4wusDqFqNnchh/98HVc580MxPy4NVkmUa2SAEpbHhnJ93sCoETZccW3HJKuvH4A==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -4738,8 +4590,7 @@ }, "node_modules/jss-plugin-template": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-template/-/jss-plugin-template-10.9.0.tgz", - "integrity": "sha512-lxThUvdt0drCi7xhuJWxADWTgLLy1IWCeFO5k+dtba900xJsNg0IGZplpP9w9UpaJsYS3WUwWMXw8Sxn1dobfQ==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -4748,8 +4599,7 @@ }, "node_modules/jss-plugin-vendor-prefixer": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.9.0.tgz", - "integrity": "sha512-MbvsaXP7iiVdYVSEoi+blrW+AYnTDvHTW6I6zqi7JcwXdc6I9Kbm234nEblayhF38EftoenbM+5218pidmC5gA==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "css-vendor": "^2.0.8", @@ -4758,8 +4608,7 @@ }, "node_modules/jss-preset-default": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-10.9.0.tgz", - "integrity": "sha512-Zdsj+R+UTn7OOJ1TFQi+l8PfEL7APSAM6vRPaU8mJywT8OrMjgslMKckFLrgq1k+qk1hJR1ePAMesvZ5aAXGOQ==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -4779,27 +4628,24 @@ }, "node_modules/kind-of": { "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/klona": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", - "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/license-checker": { "version": "25.0.1", - "resolved": "https://registry.npmjs.org/license-checker/-/license-checker-25.0.1.tgz", - "integrity": "sha512-mET5AIwl7MR2IAKYYoVBBpV0OnkKQ1xGj2IMMeEFIs42QAkEVjRtFZGWmQ28WeU7MP779iAgOaOy93Mn44mn6g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "chalk": "^2.4.1", "debug": "^3.1.0", @@ -4818,50 +4664,49 @@ }, "node_modules/license-checker/node_modules/debug": { "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "^2.1.1" } }, + "node_modules/license-checker/node_modules/ms": { + "version": "2.1.3", + "dev": true, + "license": "MIT" + }, "node_modules/license-checker/node_modules/semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } }, "node_modules/lilconfig": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz", - "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" } }, "node_modules/lines-and-columns": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" + "license": "MIT" }, "node_modules/loader-runner": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.11.5" } }, "node_modules/loader-utils": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", "dev": true, + "license": "MIT", "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -4873,14 +4718,12 @@ }, "node_modules/localized-strings": { "version": "0.2.4", - "resolved": "https://registry.npmjs.org/localized-strings/-/localized-strings-0.2.4.tgz", - "integrity": "sha512-TKDhqFPkIIN/if2FSvVVZTaM/GP9TzfgdQ2uY65mr32xgFu5nqkKXprXbzy5rfx32DF5LDvS/y1UqYF/mAscYA==" + "license": "MIT" }, "node_modules/locate-path": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -4890,32 +4733,22 @@ }, "node_modules/lodash.debounce": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.memoize": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true - }, - "node_modules/lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.uniq": { "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/loose-envify": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "license": "MIT", "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, @@ -4925,8 +4758,7 @@ }, "node_modules/lowlight": { "version": "1.20.0", - "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz", - "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==", + "license": "MIT", "dependencies": { "fault": "^1.0.0", "highlight.js": "~10.7.0" @@ -4938,17 +4770,15 @@ }, "node_modules/lowlight/node_modules/highlight.js": { "version": "10.7.3", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", - "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", + "license": "BSD-3-Clause", "engines": { "node": "*" } }, "node_modules/lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -4958,9 +4788,8 @@ }, "node_modules/make-dir": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, + "license": "MIT", "dependencies": { "semver": "^6.0.0" }, @@ -4973,14 +4802,22 @@ }, "node_modules/make-error": { "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true + "dev": true, + "license": "ISC" + }, + "node_modules/markdown-to-jsx": { + "version": "7.1.7", + "license": "MIT", + "engines": { + "node": ">= 10" + }, + "peerDependencies": { + "react": ">= 0.14.0" + } }, "node_modules/marked": { "version": "4.0.17", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.17.tgz", - "integrity": "sha512-Wfk0ATOK5iPxM4ptrORkFemqroz0ZDxp5MWfYA7H/F+wO17NRWV5Ypxi6p3g2Xmw2bKeiYOl6oVnLHKxBA0VhA==", + "license": "MIT", "bin": { "marked": "bin/marked.js" }, @@ -4990,8 +4827,7 @@ }, "node_modules/marked-react": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/marked-react/-/marked-react-1.1.2.tgz", - "integrity": "sha512-GeeAB5iIH4FaSxoQn/pb9iXn1/1Go5Jpa9ZTtNHFRcZ6vpfYOhgWakFMK9fCfvUIHNMa1uh6MHcefgW1Ss5yKw==", + "license": "MIT", "dependencies": { "marked": "^4.0.12" }, @@ -5000,27 +4836,23 @@ } }, "node_modules/material-icons": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/material-icons/-/material-icons-1.11.0.tgz", - "integrity": "sha512-t2PNjdF36nFzt82domIwhBm3JCfuEo2EMTiJzb5K1cUR3Sg1aEtcZrkecLHtB26eohtgqvndewL8Zy4cu9DIfg==" + "version": "1.11.4", + "license": "Apache-2.0" }, "node_modules/mdn-data": { "version": "2.0.14", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", - "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", - "dev": true + "dev": true, + "license": "CC0-1.0" }, "node_modules/merge-stream": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/micromatch": { "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, + "license": "MIT", "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -5031,16 +4863,14 @@ }, "node_modules/mime-db": { "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", "dependencies": { "mime-db": "1.52.0" }, @@ -5048,20 +4878,10 @@ "node": ">= 0.6" } }, - "node_modules/mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/mini-css-extract-plugin": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.0.tgz", - "integrity": "sha512-ndG8nxCEnAemsg4FSgS+yNyHKgkTB4nPKqCOgh65j3/30qqC5RaSQQXMm++Y6sb6E1zRSxPkztj9fqxhS1Eo6w==", + "version": "2.6.1", "dev": true, + "license": "MIT", "dependencies": { "schema-utils": "^4.0.0" }, @@ -5078,9 +4898,8 @@ }, "node_modules/mini-css-extract-plugin/node_modules/ajv": { "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -5094,9 +4913,8 @@ }, "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.3" }, @@ -5106,15 +4924,13 @@ }, "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/mini-css-extract-plugin/node_modules/schema-utils": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.9", "ajv": "^8.8.0", @@ -5131,9 +4947,8 @@ }, "node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -5143,15 +4958,33 @@ }, "node_modules/minimist": { "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/mississippi": { + "version": "3.0.0", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + }, + "engines": { + "node": ">=4.0.0" + } }, "node_modules/mkdirp": { "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dev": true, + "license": "MIT", "dependencies": { "minimist": "^1.2.6" }, @@ -5161,9 +4994,8 @@ }, "node_modules/mocha": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", - "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", "dev": true, + "license": "MIT", "dependencies": { "browser-stdout": "1.3.1", "commander": "2.15.1", @@ -5187,33 +5019,29 @@ }, "node_modules/mocha/node_modules/commander": { "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/mocha/node_modules/debug": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "node_modules/mocha/node_modules/diff": { "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.3.1" } }, "node_modules/mocha/node_modules/glob": { "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5226,11 +5054,29 @@ "node": "*" } }, + "node_modules/mocha/node_modules/glob/node_modules/minimatch": { + "version": "3.0.8", + "dev": true, + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mocha/node_modules/has-flag": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/mocha/node_modules/minimatch": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -5240,16 +5086,13 @@ }, "node_modules/mocha/node_modules/minimist": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/mocha/node_modules/mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==", - "deprecated": "Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.)", "dev": true, + "license": "MIT", "dependencies": { "minimist": "0.0.8" }, @@ -5259,15 +5102,13 @@ }, "node_modules/mocha/node_modules/ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/mocha/node_modules/supports-color": { "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -5275,16 +5116,27 @@ "node": ">=4" } }, + "node_modules/move-concurrently": { + "version": "1.0.1", + "dev": true, + "license": "ISC", + "dependencies": { + "aproba": "^1.1.1", + "copy-concurrently": "^1.0.0", + "fs-write-stream-atomic": "^1.0.8", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.3" + } + }, "node_modules/ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "license": "MIT" }, "node_modules/nanoid": { "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", "dev": true, + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -5294,20 +5146,17 @@ }, "node_modules/neo-async": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/node-releases": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", - "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==" + "version": "2.0.6", + "license": "MIT" }, "node_modules/nopt": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", - "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", "dev": true, + "license": "ISC", "dependencies": { "abbrev": "1", "osenv": "^0.1.4" @@ -5318,9 +5167,8 @@ }, "node_modules/normalize-package-data": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", @@ -5330,27 +5178,24 @@ }, "node_modules/normalize-package-data/node_modules/semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } }, "node_modules/normalize-path": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/normalize-url": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -5360,27 +5205,13 @@ }, "node_modules/npm-normalize-package-bin": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", - "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", - "dev": true - }, - "node_modules/npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, - "dependencies": { - "path-key": "^3.0.0" - }, - "engines": { - "node": ">=8" - } + "license": "ISC" }, "node_modules/nth-check": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0" }, @@ -5390,26 +5221,23 @@ }, "node_modules/object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/object-keys": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" } }, "node_modules/object.assign": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.0", "define-properties": "^1.1.3", @@ -5425,59 +5253,39 @@ }, "node_modules/once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, + "license": "ISC", "dependencies": { "wrappy": "1" } }, - "node_modules/onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "dependencies": { - "mimic-fn": "^2.1.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/onsenui": { "version": "2.12.1", - "resolved": "https://registry.npmjs.org/onsenui/-/onsenui-2.12.1.tgz", - "integrity": "sha512-04XpmNFhQEek2qHcISVKd34+El5DfyLd40xiHejmhzFxgJDhJLSySJxYvOrLcgBqlrSEWnqCxLd54Jy8YRCIbA==", + "license": "Apache-2.0", "engines": { "node": ">= 4.0.0" } }, "node_modules/os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/osenv": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, + "license": "ISC", "dependencies": { "os-homedir": "^1.0.0", "os-tmpdir": "^1.0.0" @@ -5485,9 +5293,8 @@ }, "node_modules/p-limit": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, + "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -5500,9 +5307,8 @@ }, "node_modules/p-locate": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -5512,17 +5318,25 @@ }, "node_modules/p-try": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, + "node_modules/parallel-transform": { + "version": "1.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "cyclist": "^1.0.1", + "inherits": "^2.0.3", + "readable-stream": "^2.1.5" + } + }, "node_modules/parent-module": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -5532,8 +5346,7 @@ }, "node_modules/parse-entities": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", + "license": "MIT", "dependencies": { "character-entities": "^1.0.0", "character-entities-legacy": "^1.0.0", @@ -5547,19 +5360,9 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/parse-entities/node_modules/character-entities": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", - "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/wooorm" - } - }, "node_modules/parse-json": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -5575,54 +5378,47 @@ }, "node_modules/path-exists": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/path-key": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/path-parse": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + "license": "MIT" }, "node_modules/path-type": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/picocolors": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -5630,11 +5426,18 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pify": { + "version": "4.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/pkg-dir": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, + "license": "MIT", "dependencies": { "find-up": "^4.0.0" }, @@ -5644,8 +5447,6 @@ }, "node_modules/postcss": { "version": "8.4.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz", - "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==", "dev": true, "funding": [ { @@ -5657,6 +5458,7 @@ "url": "https://tidelift.com/funding/github/npm/postcss" } ], + "license": "MIT", "dependencies": { "nanoid": "^3.3.4", "picocolors": "^1.0.0", @@ -5668,9 +5470,8 @@ }, "node_modules/postcss-calc": { "version": "8.2.4", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz", - "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==", "dev": true, + "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.9", "postcss-value-parser": "^4.2.0" @@ -5681,9 +5482,8 @@ }, "node_modules/postcss-colormin": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz", - "integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==", "dev": true, + "license": "MIT", "dependencies": { "browserslist": "^4.16.6", "caniuse-api": "^3.0.0", @@ -5698,10 +5498,9 @@ } }, "node_modules/postcss-convert-values": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.1.tgz", - "integrity": "sha512-UjcYfl3wJJdcabGKk8lgetPvhi1Et7VDc3sYr9EyhNBeB00YD4vHgPBp+oMVoG/dDWCc6ASbmzPNV6jADTwh8Q==", + "version": "5.1.2", "dev": true, + "license": "MIT", "dependencies": { "browserslist": "^4.20.3", "postcss-value-parser": "^4.2.0" @@ -5714,10 +5513,9 @@ } }, "node_modules/postcss-discard-comments": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz", - "integrity": "sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==", + "version": "5.1.2", "dev": true, + "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" }, @@ -5727,9 +5525,8 @@ }, "node_modules/postcss-discard-duplicates": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", - "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", "dev": true, + "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" }, @@ -5739,9 +5536,8 @@ }, "node_modules/postcss-discard-empty": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", - "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", "dev": true, + "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" }, @@ -5751,9 +5547,8 @@ }, "node_modules/postcss-discard-overridden": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", - "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", "dev": true, + "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" }, @@ -5763,9 +5558,8 @@ }, "node_modules/postcss-loader": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.0.tgz", - "integrity": "sha512-IDyttebFzTSY6DI24KuHUcBjbAev1i+RyICoPEWcAstZsj03r533uMXtDn506l6/wlsRYiS5XBdx7TpccCsyUg==", "dev": true, + "license": "MIT", "dependencies": { "cosmiconfig": "^7.0.0", "klona": "^2.0.5", @@ -5785,9 +5579,8 @@ }, "node_modules/postcss-loader/node_modules/semver": { "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -5799,10 +5592,9 @@ } }, "node_modules/postcss-merge-longhand": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.5.tgz", - "integrity": "sha512-NOG1grw9wIO+60arKa2YYsrbgvP6tp+jqc7+ZD5/MalIw234ooH2C6KlR6FEn4yle7GqZoBxSK1mLBE9KPur6w==", + "version": "5.1.6", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0", "stylehacks": "^5.1.0" @@ -5815,10 +5607,9 @@ } }, "node_modules/postcss-merge-rules": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz", - "integrity": "sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww==", + "version": "5.1.2", "dev": true, + "license": "MIT", "dependencies": { "browserslist": "^4.16.6", "caniuse-api": "^3.0.0", @@ -5834,9 +5625,8 @@ }, "node_modules/postcss-minify-font-values": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz", - "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -5849,9 +5639,8 @@ }, "node_modules/postcss-minify-gradients": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz", - "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==", "dev": true, + "license": "MIT", "dependencies": { "colord": "^2.9.1", "cssnano-utils": "^3.1.0", @@ -5866,9 +5655,8 @@ }, "node_modules/postcss-minify-params": { "version": "5.1.3", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz", - "integrity": "sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg==", "dev": true, + "license": "MIT", "dependencies": { "browserslist": "^4.16.6", "cssnano-utils": "^3.1.0", @@ -5882,10 +5670,9 @@ } }, "node_modules/postcss-minify-selectors": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz", - "integrity": "sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==", + "version": "5.2.1", "dev": true, + "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.5" }, @@ -5898,9 +5685,8 @@ }, "node_modules/postcss-modules-extract-imports": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", "dev": true, + "license": "ISC", "engines": { "node": "^10 || ^12 || >= 14" }, @@ -5910,9 +5696,8 @@ }, "node_modules/postcss-modules-local-by-default": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", "dev": true, + "license": "MIT", "dependencies": { "icss-utils": "^5.0.0", "postcss-selector-parser": "^6.0.2", @@ -5927,9 +5712,8 @@ }, "node_modules/postcss-modules-scope": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", "dev": true, + "license": "ISC", "dependencies": { "postcss-selector-parser": "^6.0.4" }, @@ -5942,9 +5726,8 @@ }, "node_modules/postcss-modules-values": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", - "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", "dev": true, + "license": "ISC", "dependencies": { "icss-utils": "^5.0.0" }, @@ -5957,9 +5740,8 @@ }, "node_modules/postcss-normalize-charset": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", - "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", "dev": true, + "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" }, @@ -5969,9 +5751,8 @@ }, "node_modules/postcss-normalize-display-values": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz", - "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -5983,10 +5764,9 @@ } }, "node_modules/postcss-normalize-positions": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz", - "integrity": "sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==", + "version": "5.1.1", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -5998,10 +5778,9 @@ } }, "node_modules/postcss-normalize-repeat-style": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz", - "integrity": "sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==", + "version": "5.1.1", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -6014,9 +5793,8 @@ }, "node_modules/postcss-normalize-string": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz", - "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -6029,9 +5807,8 @@ }, "node_modules/postcss-normalize-timing-functions": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz", - "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -6044,9 +5821,8 @@ }, "node_modules/postcss-normalize-unicode": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz", - "integrity": "sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==", "dev": true, + "license": "MIT", "dependencies": { "browserslist": "^4.16.6", "postcss-value-parser": "^4.2.0" @@ -6060,9 +5836,8 @@ }, "node_modules/postcss-normalize-url": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz", - "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==", "dev": true, + "license": "MIT", "dependencies": { "normalize-url": "^6.0.1", "postcss-value-parser": "^4.2.0" @@ -6076,9 +5851,8 @@ }, "node_modules/postcss-normalize-whitespace": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz", - "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -6090,10 +5864,9 @@ } }, "node_modules/postcss-ordered-values": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz", - "integrity": "sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw==", + "version": "5.1.3", "dev": true, + "license": "MIT", "dependencies": { "cssnano-utils": "^3.1.0", "postcss-value-parser": "^4.2.0" @@ -6107,9 +5880,8 @@ }, "node_modules/postcss-reduce-initial": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz", - "integrity": "sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==", "dev": true, + "license": "MIT", "dependencies": { "browserslist": "^4.16.6", "caniuse-api": "^3.0.0" @@ -6123,9 +5895,8 @@ }, "node_modules/postcss-reduce-transforms": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz", - "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -6138,9 +5909,8 @@ }, "node_modules/postcss-selector-parser": { "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", "dev": true, + "license": "MIT", "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -6151,9 +5921,8 @@ }, "node_modules/postcss-svgo": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz", - "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0", "svgo": "^2.7.0" @@ -6167,9 +5936,8 @@ }, "node_modules/postcss-unique-selectors": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz", - "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==", "dev": true, + "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.5" }, @@ -6182,22 +5950,29 @@ }, "node_modules/postcss-value-parser": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/prismjs": { "version": "1.28.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.28.0.tgz", - "integrity": "sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw==", + "license": "MIT", "engines": { "node": ">=6" } }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/promise-inflight": { + "version": "1.0.1", + "dev": true, + "license": "ISC" + }, "node_modules/prop-types": { "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "license": "MIT", "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -6206,31 +5981,90 @@ }, "node_modules/prop-types/node_modules/react-is": { "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "license": "MIT" + }, + "node_modules/property-information": { + "version": "5.6.0", + "license": "MIT", + "dependencies": { + "xtend": "^4.0.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, + "node_modules/prr": { + "version": "1.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/pump": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/pumpify": { + "version": "1.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" + } + }, + "node_modules/pumpify/node_modules/pump": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } }, "node_modules/punycode": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/randombytes": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" } }, + "node_modules/randombytes/node_modules/safe-buffer": { + "version": "5.2.1", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, "node_modules/react": { "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "license": "MIT", "dependencies": { "loose-envify": "^1.1.0" }, @@ -6240,8 +6074,7 @@ }, "node_modules/react-console": { "version": "1.0.0-rc.2", - "resolved": "https://registry.npmjs.org/react-console/-/react-console-1.0.0-rc.2.tgz", - "integrity": "sha512-3fxT5x07GImC+1DOGtn8FBwwBgdNrp+HWbVBBcVe/iC5ilFEZWQm2lY8jh+2SYWiJ74TrTSQy909ouGzzeTOYg==", + "license": "MIT", "dependencies": { "react-is": "^16.13.1", "react-reconciler": "^0.25.1" @@ -6252,39 +6085,11 @@ }, "node_modules/react-console/node_modules/react-is": { "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" - }, - "node_modules/react-console/node_modules/react-reconciler": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.25.1.tgz", - "integrity": "sha512-R5UwsIvRcSs3w8n9k3tBoTtUHdVhu9u84EG7E5M0Jk9F5i6DA1pQzPfUZd6opYWGy56MJOtV3VADzy6DRwYDjw==", - "dependencies": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.19.1" - }, - "engines": { - "node": ">=0.10.0" - }, - "peerDependencies": { - "react": "^16.13.1" - } - }, - "node_modules/react-console/node_modules/scheduler": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", - "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", - "dependencies": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } + "license": "MIT" }, "node_modules/react-device-detect": { "version": "2.2.2", - "resolved": "https://registry.npmjs.org/react-device-detect/-/react-device-detect-2.2.2.tgz", - "integrity": "sha512-zSN1gIAztUekp5qUT/ybHwQ9fmOqVT1psxpSlTn1pe0CO+fnJHKRLOWWac5nKxOxvOpD/w84hk1I+EydrJp7SA==", + "license": "MIT", "dependencies": { "ua-parser-js": "^1.0.2" }, @@ -6295,8 +6100,7 @@ }, "node_modules/react-dom": { "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "license": "MIT", "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" @@ -6307,13 +6111,11 @@ }, "node_modules/react-is": { "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" + "license": "MIT" }, "node_modules/react-onsenui": { "version": "1.12.0", - "resolved": "https://registry.npmjs.org/react-onsenui/-/react-onsenui-1.12.0.tgz", - "integrity": "sha512-qRYN+fwudZyaujKHecuohpyBpNCX2IB1gE/9A+FDd+YS+/TwXFC+0NA2IFkwYRYnetqAu3QxJanI/AUB1pq9UQ==", + "license": "Apache-2.0", "dependencies": { "prop-types": "^15.6.0" }, @@ -6323,10 +6125,43 @@ "react-dom": "^17.0.0" } }, + "node_modules/react-onsenuix": { + "version": "1.0.6", + "dependencies": { + "googlers-tools": "^1.2.1", + "jss": "^10.9.0", + "jss-preset-default": "^10.9.0", + "onsenui": "^2.12.1", + "react": "^18.2.0" + } + }, + "node_modules/react-reconciler": { + "version": "0.25.1", + "license": "MIT", + "dependencies": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.19.1" + }, + "engines": { + "node": ">=0.10.0" + }, + "peerDependencies": { + "react": "^16.13.1" + } + }, + "node_modules/react-reconciler/node_modules/scheduler": { + "version": "0.19.1", + "license": "MIT", + "dependencies": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + }, "node_modules/react-syntax-highlighter": { "version": "15.5.0", - "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.5.0.tgz", - "integrity": "sha512-+zq2myprEnQmH5yw6Gqc8lD55QHnpKaU8TOcFeC/Lg/MQSs8UknEA0JC4nTZGFAXC2J2Hyj/ijJ7NlabyPi2gg==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.3.1", "highlight.js": "^10.4.1", @@ -6340,16 +6175,14 @@ }, "node_modules/react-syntax-highlighter/node_modules/highlight.js": { "version": "10.7.3", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", - "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==", + "license": "BSD-3-Clause", "engines": { "node": "*" } }, "node_modules/react-transition-group": { "version": "4.4.2", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz", - "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==", + "license": "BSD-3-Clause", "dependencies": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -6363,9 +6196,8 @@ }, "node_modules/read-installed": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz", - "integrity": "sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=", "dev": true, + "license": "ISC", "dependencies": { "debuglog": "^1.0.1", "read-package-json": "^2.0.0", @@ -6380,18 +6212,16 @@ }, "node_modules/read-installed/node_modules/semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } }, "node_modules/read-package-json": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz", - "integrity": "sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==", "dev": true, + "license": "ISC", "dependencies": { "glob": "^7.1.1", "json-parse-even-better-errors": "^2.3.0", @@ -6399,11 +6229,24 @@ "npm-normalize-package-bin": "^1.0.0" } }, + "node_modules/readable-stream": { + "version": "2.3.7", + "dev": true, + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, "node_modules/readdir-scoped-modules": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz", - "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==", "dev": true, + "license": "ISC", "dependencies": { "debuglog": "^1.0.1", "dezalgo": "^1.0.0", @@ -6413,9 +6256,8 @@ }, "node_modules/readdirp": { "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -6425,9 +6267,8 @@ }, "node_modules/rechoir": { "version": "0.7.1", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", - "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", "dev": true, + "license": "MIT", "dependencies": { "resolve": "^1.9.0" }, @@ -6437,8 +6278,7 @@ }, "node_modules/refractor": { "version": "3.6.0", - "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.6.0.tgz", - "integrity": "sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==", + "license": "MIT", "dependencies": { "hastscript": "^6.0.0", "parse-entities": "^2.0.0", @@ -6451,23 +6291,20 @@ }, "node_modules/refractor/node_modules/prismjs": { "version": "1.27.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.27.0.tgz", - "integrity": "sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==", + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/regenerate": { "version": "1.4.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", - "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/regenerate-unicode-properties": { "version": "10.0.1", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz", - "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==", "dev": true, + "license": "MIT", "dependencies": { "regenerate": "^1.4.2" }, @@ -6477,23 +6314,20 @@ }, "node_modules/regenerator-runtime": { "version": "0.13.9", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + "license": "MIT" }, "node_modules/regenerator-transform": { "version": "0.15.0", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz", - "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/runtime": "^7.8.4" } }, "node_modules/regexpu-core": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz", - "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==", + "version": "5.1.0", "dev": true, + "license": "MIT", "dependencies": { "regenerate": "^1.4.2", "regenerate-unicode-properties": "^10.0.1", @@ -6508,15 +6342,13 @@ }, "node_modules/regjsgen": { "version": "0.6.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz", - "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/regjsparser": { "version": "0.8.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz", - "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "jsesc": "~0.5.0" }, @@ -6526,8 +6358,6 @@ }, "node_modules/regjsparser/node_modules/jsesc": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true, "bin": { "jsesc": "bin/jsesc" @@ -6535,19 +6365,17 @@ }, "node_modules/require-from-string": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/resolve": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "version": "1.22.1", + "license": "MIT", "dependencies": { - "is-core-module": "^2.8.1", + "is-core-module": "^2.9.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -6560,9 +6388,8 @@ }, "node_modules/resolve-cwd": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "dev": true, + "license": "MIT", "dependencies": { "resolve-from": "^5.0.0" }, @@ -6572,31 +6399,46 @@ }, "node_modules/resolve-cwd/node_modules/resolve-from": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/resolve-from": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "license": "MIT", "engines": { "node": ">=4" } }, + "node_modules/rimraf": { + "version": "2.7.1", + "dev": true, + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/run-queue": { + "version": "1.0.3", + "dev": true, + "license": "ISC", + "dependencies": { + "aproba": "^1.1.1" + } + }, "node_modules/safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "license": "MIT" }, "node_modules/sass": { - "version": "1.52.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.1.tgz", - "integrity": "sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==", + "version": "1.53.0", "dev": true, + "license": "MIT", "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -6611,9 +6453,8 @@ }, "node_modules/sass-loader": { "version": "13.0.2", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz", - "integrity": "sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==", "dev": true, + "license": "MIT", "dependencies": { "klona": "^2.0.4", "neo-async": "^2.6.2" @@ -6649,17 +6490,15 @@ }, "node_modules/scheduler": { "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", + "license": "MIT", "dependencies": { "loose-envify": "^1.1.0" } }, "node_modules/schema-utils": { "version": "2.7.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", - "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.5", "ajv": "^6.12.4", @@ -6675,26 +6514,23 @@ }, "node_modules/semver": { "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "license": "ISC", "bin": { "semver": "bin/semver.js" } }, "node_modules/serialize-javascript": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "randombytes": "^2.1.0" } }, "node_modules/shallow-clone": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", - "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, + "license": "MIT", "dependencies": { "kind-of": "^6.0.2" }, @@ -6704,9 +6540,8 @@ }, "node_modules/shebang-command": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -6716,61 +6551,62 @@ }, "node_modules/shebang-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, "node_modules/slide": { "version": "1.1.6", - "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", - "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", "dev": true, + "license": "ISC", "engines": { "node": "*" } }, + "node_modules/source-list-map": { + "version": "2.0.1", + "dev": true, + "license": "MIT" + }, "node_modules/source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/source-map-js": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/source-map-support": { "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dev": true, + "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" } }, + "node_modules/space-separated-tokens": { + "version": "1.1.5", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/wooorm" + } + }, "node_modules/spdx-compare": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/spdx-compare/-/spdx-compare-1.0.0.tgz", - "integrity": "sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==", "dev": true, + "license": "MIT", "dependencies": { "array-find-index": "^1.0.2", "spdx-expression-parse": "^3.0.0", @@ -6779,9 +6615,8 @@ }, "node_modules/spdx-correct": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", "dev": true, + "license": "Apache-2.0", "dependencies": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -6789,15 +6624,13 @@ }, "node_modules/spdx-exceptions": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true + "dev": true, + "license": "CC-BY-3.0" }, "node_modules/spdx-expression-parse": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, + "license": "MIT", "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -6805,21 +6638,18 @@ }, "node_modules/spdx-license-ids": { "version": "3.0.11", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", - "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", - "dev": true + "dev": true, + "license": "CC0-1.0" }, "node_modules/spdx-ranges": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-2.1.1.tgz", - "integrity": "sha512-mcdpQFV7UDAgLpXEE/jOMqvK4LBoO0uTQg0uvXUewmEFhpiZx5yJSZITHB8w1ZahKdhfZqP5GPEOKLyEq5p8XA==", - "dev": true + "dev": true, + "license": "(MIT AND CC-BY-3.0)" }, "node_modules/spdx-satisfies": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-4.0.1.tgz", - "integrity": "sha512-WVzZ/cXAzoNmjCWiEluEA3BjHp5tiUmmhn9MK+X0tBbR9sOqtC6UQwmgCNrAIZvNlMuBUYAaHYfb2oqlF9SwKA==", "dev": true, + "license": "MIT", "dependencies": { "spdx-compare": "^1.0.0", "spdx-expression-parse": "^3.0.0", @@ -6828,30 +6658,48 @@ }, "node_modules/sprintf-js": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/ssri": { + "version": "6.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "figgy-pudding": "^3.5.1" + } }, "node_modules/stable": { "version": "0.1.8", - "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", - "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", - "dev": true + "dev": true, + "license": "MIT" }, - "node_modules/strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "node_modules/stream-each": { + "version": "1.2.3", "dev": true, - "engines": { - "node": ">=6" + "license": "MIT", + "dependencies": { + "end-of-stream": "^1.1.0", + "stream-shift": "^1.0.0" + } + }, + "node_modules/stream-shift": { + "version": "1.0.1", + "dev": true, + "license": "MIT" + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" } }, "node_modules/style-loader": { "version": "3.3.1", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz", - "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 12.13.0" }, @@ -6865,9 +6713,8 @@ }, "node_modules/stylehacks": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz", - "integrity": "sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==", "dev": true, + "license": "MIT", "dependencies": { "browserslist": "^4.16.6", "postcss-selector-parser": "^6.0.4" @@ -6881,24 +6728,25 @@ }, "node_modules/stylis": { "version": "4.0.13", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz", - "integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==" + "license": "MIT" }, "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "version": "8.1.1", + "dev": true, + "license": "MIT", "dependencies": { - "has-flag": "^3.0.0" + "has-flag": "^4.0.0" }, "engines": { - "node": ">=4" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" } }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -6908,9 +6756,8 @@ }, "node_modules/svgo": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", - "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", "dev": true, + "license": "MIT", "dependencies": { "@trysound/sax": "0.2.0", "commander": "^7.2.0", @@ -6929,30 +6776,27 @@ }, "node_modules/symbol-observable": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/tapable": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/terser": { - "version": "5.13.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.13.1.tgz", - "integrity": "sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA==", + "version": "5.14.1", "dev": true, + "license": "BSD-2-Clause", "dependencies": { + "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.8.0-beta.0", "source-map-support": "~0.5.20" }, "bin": { @@ -6963,15 +6807,14 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz", - "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==", + "version": "5.3.3", "dev": true, + "license": "MIT", "dependencies": { + "@jridgewell/trace-mapping": "^0.3.7", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", "serialize-javascript": "^6.0.0", - "source-map": "^0.6.1", "terser": "^5.7.2" }, "engines": { @@ -6998,9 +6841,8 @@ }, "node_modules/terser-webpack-plugin/node_modules/schema-utils": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -7016,40 +6858,33 @@ }, "node_modules/terser/node_modules/commander": { "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true + "dev": true, + "license": "MIT" }, - "node_modules/terser/node_modules/source-map": { - "version": "0.8.0-beta.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz", - "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==", + "node_modules/through2": { + "version": "2.0.5", "dev": true, + "license": "MIT", "dependencies": { - "whatwg-url": "^7.0.0" - }, - "engines": { - "node": ">= 8" + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" } }, "node_modules/tiny-warning": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", - "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" + "license": "MIT" }, "node_modules/to-fast-properties": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/to-regex-range": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -7057,29 +6892,18 @@ "node": ">=8.0" } }, - "node_modules/tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, "node_modules/treeify": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz", - "integrity": "sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.6" } }, "node_modules/ts-loader": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.3.0.tgz", - "integrity": "sha512-2kLLAdAD+FCKijvGKi9sS0OzoqxLCF3CxHpok7rVgCZ5UldRzH0TkbwG9XECKjBzHsAewntC5oDaI/FwKzEUog==", + "version": "9.3.1", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.1.0", "enhanced-resolve": "^5.0.0", @@ -7096,9 +6920,8 @@ }, "node_modules/ts-loader/node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -7111,9 +6934,8 @@ }, "node_modules/ts-loader/node_modules/chalk": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -7127,9 +6949,8 @@ }, "node_modules/ts-loader/node_modules/color-convert": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -7139,24 +6960,13 @@ }, "node_modules/ts-loader/node_modules/color-name": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/ts-loader/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "engines": { - "node": ">=8" - } + "license": "MIT" }, "node_modules/ts-loader/node_modules/semver": { "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -7169,9 +6979,8 @@ }, "node_modules/ts-loader/node_modules/supports-color": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -7180,10 +6989,9 @@ } }, "node_modules/ts-node": { - "version": "10.8.0", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.0.tgz", - "integrity": "sha512-/fNd5Qh+zTt8Vt1KbYZjRHCE9sI5i7nqfD/dzBBRDeVXZXS6kToW6R7tTU6Nd4XavFs0mAVCg29Q//ML7WsZYA==", + "version": "10.8.2", "dev": true, + "license": "MIT", "dependencies": { "@cspotcode/source-map-support": "^0.8.0", "@tsconfig/node10": "^1.0.7", @@ -7222,11 +7030,20 @@ } } }, + "node_modules/tslib": { + "version": "2.4.0", + "dev": true, + "license": "0BSD" + }, + "node_modules/typedarray": { + "version": "0.0.6", + "dev": true, + "license": "MIT" + }, "node_modules/typescript": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz", - "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==", + "version": "4.7.4", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -7237,8 +7054,6 @@ }, "node_modules/ua-parser-js": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.2.tgz", - "integrity": "sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg==", "funding": [ { "type": "opencollective", @@ -7249,30 +7064,165 @@ "url": "https://paypal.me/faisalman" } ], + "license": "MIT", "engines": { "node": "*" } }, + "node_modules/uglify-js": { + "version": "3.16.2", + "dev": true, + "license": "BSD-2-Clause", + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/uglifyjs-webpack-plugin": { + "version": "2.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", + "is-wsl": "^1.1.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^1.7.0", + "source-map": "^0.6.1", + "uglify-js": "^3.6.0", + "webpack-sources": "^1.4.0", + "worker-farm": "^1.7.0" + }, + "engines": { + "node": ">= 6.9.0" + }, + "peerDependencies": { + "webpack": "^4.0.0" + } + }, + "node_modules/uglifyjs-webpack-plugin/node_modules/find-cache-dir": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/uglifyjs-webpack-plugin/node_modules/find-up": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/uglifyjs-webpack-plugin/node_modules/locate-path": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/uglifyjs-webpack-plugin/node_modules/make-dir": { + "version": "2.1.0", + "dev": true, + "license": "MIT", + "dependencies": { + "pify": "^4.0.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/uglifyjs-webpack-plugin/node_modules/p-locate": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/uglifyjs-webpack-plugin/node_modules/path-exists": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/uglifyjs-webpack-plugin/node_modules/pkg-dir": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "find-up": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/uglifyjs-webpack-plugin/node_modules/schema-utils": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + }, + "engines": { + "node": ">= 4" + } + }, + "node_modules/uglifyjs-webpack-plugin/node_modules/semver": { + "version": "5.7.1", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/uglifyjs-webpack-plugin/node_modules/serialize-javascript": { + "version": "1.9.1", + "dev": true, + "license": "BSD-3-Clause" + }, "node_modules/un-eval": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/un-eval/-/un-eval-1.2.0.tgz", - "integrity": "sha512-Wlj/pum6dQtGTPD/lclDtoVPkSfpjPfy1dwnnKw/sZP5DpBH9fLhBgQfsqNhe5/gS1D+vkZUuB771NRMUPA5CA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", - "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/unicode-match-property-ecmascript": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", - "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", "dev": true, + "license": "MIT", "dependencies": { "unicode-canonical-property-names-ecmascript": "^2.0.0", "unicode-property-aliases-ecmascript": "^2.0.0" @@ -7283,36 +7233,72 @@ }, "node_modules/unicode-match-property-value-ecmascript": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", - "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/unicode-property-aliases-ecmascript": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz", - "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, + "node_modules/unique-filename": { + "version": "1.1.1", + "dev": true, + "license": "ISC", + "dependencies": { + "unique-slug": "^2.0.0" + } + }, + "node_modules/unique-slug": { + "version": "2.0.2", + "dev": true, + "license": "ISC", + "dependencies": { + "imurmurhash": "^0.1.4" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.0.4", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + }, + "bin": { + "browserslist-lint": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, "node_modules/uri-js": { "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } }, "node_modules/url-loader": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz", - "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==", "dev": true, + "license": "MIT", "dependencies": { "loader-utils": "^2.0.0", "mime-types": "^2.1.27", @@ -7337,9 +7323,8 @@ }, "node_modules/url-loader/node_modules/schema-utils": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -7355,27 +7340,23 @@ }, "node_modules/util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/util-extend": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz", - "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/v8-compile-cache-lib": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/validate-npm-package-license": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, + "license": "Apache-2.0", "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -7383,10 +7364,8 @@ }, "node_modules/vscode": { "version": "1.1.37", - "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.37.tgz", - "integrity": "sha512-vJNj6IlN7IJPdMavlQa1KoFB3Ihn06q1AiN3ZFI/HfzPNzbKZWPPuiU+XkpNOfGU5k15m4r80nxNPlM7wcc0wg==", - "deprecated": "This package is deprecated in favor of @types/vscode and vscode-test. For more information please read: https://code.visualstudio.com/updates/v1_36#_splitting-vscode-package-into-typesvscode-and-vscodetest", "dev": true, + "license": "MIT", "dependencies": { "glob": "^7.1.2", "http-proxy-agent": "^4.0.1", @@ -7405,10 +7384,8 @@ }, "node_modules/vscode-test": { "version": "0.4.3", - "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-0.4.3.tgz", - "integrity": "sha512-EkMGqBSefZH2MgW65nY05rdRSko15uvzq4VAPM5jVmwYuFQKE7eikKXNJDRxL+OITXHB6pI+a3XqqD32Y3KC5w==", - "deprecated": "This package has been renamed to @vscode/test-electron, please update to the new name", "dev": true, + "license": "MIT", "dependencies": { "http-proxy-agent": "^2.1.0", "https-proxy-agent": "^2.2.1" @@ -7419,9 +7396,8 @@ }, "node_modules/vscode-test/node_modules/agent-base": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", - "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", "dev": true, + "license": "MIT", "dependencies": { "es6-promisify": "^5.0.0" }, @@ -7431,18 +7407,16 @@ }, "node_modules/vscode-test/node_modules/debug": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } }, "node_modules/vscode-test/node_modules/http-proxy-agent": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", - "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "4", "debug": "3.1.0" @@ -7453,9 +7427,8 @@ }, "node_modules/vscode-test/node_modules/https-proxy-agent": { "version": "2.2.4", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz", - "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "^4.3.0", "debug": "^3.1.0" @@ -7464,26 +7437,36 @@ "node": ">= 4.5.0" } }, + "node_modules/vscode-test/node_modules/https-proxy-agent/node_modules/debug": { + "version": "3.2.7", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/vscode-test/node_modules/https-proxy-agent/node_modules/ms": { + "version": "2.1.3", + "dev": true, + "license": "MIT" + }, "node_modules/vscode-test/node_modules/ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/vscode/node_modules/semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } }, "node_modules/watchpack": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", - "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", + "version": "2.4.0", "dev": true, + "license": "MIT", "dependencies": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" @@ -7492,17 +7475,10 @@ "node": ">=10.13.0" } }, - "node_modules/webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", - "dev": true - }, "node_modules/webpack": { "version": "5.73.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz", - "integrity": "sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==", "dev": true, + "license": "MIT", "dependencies": { "@types/eslint-scope": "^3.7.3", "@types/estree": "^0.0.51", @@ -7546,18 +7522,17 @@ } }, "node_modules/webpack-cli": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz", - "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==", + "version": "4.10.0", "dev": true, + "license": "MIT", "dependencies": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.1.1", - "@webpack-cli/info": "^1.4.1", - "@webpack-cli/serve": "^1.6.1", + "@webpack-cli/configtest": "^1.2.0", + "@webpack-cli/info": "^1.5.0", + "@webpack-cli/serve": "^1.7.0", "colorette": "^2.0.14", "commander": "^7.0.0", - "execa": "^5.0.0", + "cross-spawn": "^7.0.3", "fastest-levenshtein": "^1.0.12", "import-local": "^3.0.2", "interpret": "^2.2.0", @@ -7570,6 +7545,10 @@ "engines": { "node": ">=10.13.0" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, "peerDependencies": { "webpack": "4.x.x || 5.x.x" }, @@ -7590,9 +7569,8 @@ }, "node_modules/webpack-merge": { "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", "dev": true, + "license": "MIT", "dependencies": { "clone-deep": "^4.0.1", "wildcard": "^2.0.0" @@ -7602,19 +7580,18 @@ } }, "node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "version": "1.4.3", "dev": true, - "engines": { - "node": ">=10.13.0" + "license": "MIT", + "dependencies": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" } }, "node_modules/webpack/node_modules/schema-utils": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, + "license": "MIT", "dependencies": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", @@ -7628,22 +7605,18 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "node_modules/webpack/node_modules/webpack-sources": { + "version": "3.2.3", "dev": true, - "dependencies": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" + "license": "MIT", + "engines": { + "node": ">=10.13.0" } }, "node_modules/which": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -7656,43 +7629,51 @@ }, "node_modules/wildcard": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/worker-farm": { + "version": "1.7.0", + "dev": true, + "license": "MIT", + "dependencies": { + "errno": "~0.1.7" + } }, "node_modules/wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/xtend": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "license": "MIT", "engines": { "node": ">=0.4" } }, + "node_modules/y18n": { + "version": "4.0.3", + "dev": true, + "license": "ISC" + }, "node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "version": "2.1.1", + "dev": true, + "license": "ISC", "engines": { - "node": ">= 6" + "node": ">= 14" } }, "node_modules/yaml-loader": { "version": "0.8.0", - "resolved": "https://registry.npmjs.org/yaml-loader/-/yaml-loader-0.8.0.tgz", - "integrity": "sha512-LjeKnTzVBKWiQBeE2L9ssl6WprqaUIxCSNs5tle8PaDydgu3wVFXTbMfsvF2MSErpy9TDVa092n4q6adYwJaWg==", "dev": true, + "license": "MIT", "dependencies": { "javascript-stringify": "^2.0.1", "loader-utils": "^2.0.0", @@ -7702,20 +7683,10 @@ "node": ">= 12.13" } }, - "node_modules/yaml-loader/node_modules/yaml": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz", - "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==", - "dev": true, - "engines": { - "node": ">= 14" - } - }, "node_modules/yn": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -7724,41 +7695,33 @@ "dependencies": { "@ampproject/remapping": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", - "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", "requires": { "@jridgewell/gen-mapping": "^0.1.0", "@jridgewell/trace-mapping": "^0.3.9" } }, "@babel/code-frame": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz", - "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==", + "version": "7.18.6", "requires": { - "@babel/highlight": "^7.16.7" + "@babel/highlight": "^7.18.6" } }, "@babel/compat-data": { - "version": "7.17.10", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz", - "integrity": "sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==" + "version": "7.18.8" }, "@babel/core": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.2.tgz", - "integrity": "sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ==", + "version": "7.18.6", "requires": { "@ampproject/remapping": "^2.1.0", - "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.18.2", - "@babel/helper-compilation-targets": "^7.18.2", - "@babel/helper-module-transforms": "^7.18.0", - "@babel/helpers": "^7.18.2", - "@babel/parser": "^7.18.0", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.18.2", - "@babel/types": "^7.18.2", + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.18.6", + "@babel/helper-compilation-targets": "^7.18.6", + "@babel/helper-module-transforms": "^7.18.6", + "@babel/helpers": "^7.18.6", + "@babel/parser": "^7.18.6", + "@babel/template": "^7.18.6", + "@babel/traverse": "^7.18.6", + "@babel/types": "^7.18.6", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -7767,21 +7730,17 @@ } }, "@babel/generator": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz", - "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==", + "version": "7.18.7", "requires": { - "@babel/types": "^7.18.2", - "@jridgewell/gen-mapping": "^0.3.0", + "@babel/types": "^7.18.7", + "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, "dependencies": { "@jridgewell/gen-mapping": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz", - "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==", + "version": "0.3.2", "requires": { - "@jridgewell/set-array": "^1.0.0", + "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", "@jridgewell/trace-mapping": "^0.3.9" } @@ -7789,64 +7748,52 @@ } }, "@babel/helper-annotate-as-pure": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz", - "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.18.6" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz", - "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-explode-assignable-expression": "^7.16.7", - "@babel/types": "^7.16.7" + "@babel/helper-explode-assignable-expression": "^7.18.6", + "@babel/types": "^7.18.6" } }, "@babel/helper-compilation-targets": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz", - "integrity": "sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==", + "version": "7.18.6", "requires": { - "@babel/compat-data": "^7.17.10", - "@babel/helper-validator-option": "^7.16.7", + "@babel/compat-data": "^7.18.6", + "@babel/helper-validator-option": "^7.18.6", "browserslist": "^4.20.2", "semver": "^6.3.0" } }, "@babel/helper-create-class-features-plugin": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz", - "integrity": "sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-function-name": "^7.17.9", - "@babel/helper-member-expression-to-functions": "^7.17.7", - "@babel/helper-optimise-call-expression": "^7.16.7", - "@babel/helper-replace-supers": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7" + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-function-name": "^7.18.6", + "@babel/helper-member-expression-to-functions": "^7.18.6", + "@babel/helper-optimise-call-expression": "^7.18.6", + "@babel/helper-replace-supers": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6" } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz", - "integrity": "sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "regexpu-core": "^5.0.1" + "@babel/helper-annotate-as-pure": "^7.18.6", + "regexpu-core": "^5.1.0" } }, "@babel/helper-define-polyfill-provider": { "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz", - "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==", "dev": true, "requires": { "@babel/helper-compilation-targets": "^7.13.0", @@ -7860,360 +7807,286 @@ } }, "@babel/helper-environment-visitor": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz", - "integrity": "sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==" + "version": "7.18.6" }, "@babel/helper-explode-assignable-expression": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz", - "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.18.6" } }, "@babel/helper-function-name": { - "version": "7.17.9", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz", - "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==", + "version": "7.18.6", "requires": { - "@babel/template": "^7.16.7", - "@babel/types": "^7.17.0" + "@babel/template": "^7.18.6", + "@babel/types": "^7.18.6" } }, "@babel/helper-hoist-variables": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz", - "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==", + "version": "7.18.6", "requires": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.18.6" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.17.7", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz", - "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/types": "^7.17.0" + "@babel/types": "^7.18.6" } }, "@babel/helper-module-imports": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz", - "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==", + "version": "7.18.6", "requires": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.18.6" } }, "@babel/helper-module-transforms": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz", - "integrity": "sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==", + "version": "7.18.8", "requires": { - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-module-imports": "^7.16.7", - "@babel/helper-simple-access": "^7.17.7", - "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/helper-validator-identifier": "^7.16.7", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.18.0", - "@babel/types": "^7.18.0" + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-module-imports": "^7.18.6", + "@babel/helper-simple-access": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/helper-validator-identifier": "^7.18.6", + "@babel/template": "^7.18.6", + "@babel/traverse": "^7.18.8", + "@babel/types": "^7.18.8" } }, "@babel/helper-optimise-call-expression": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz", - "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.18.6" } }, "@babel/helper-plugin-utils": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz", - "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==" + "version": "7.18.6" }, "@babel/helper-remap-async-to-generator": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz", - "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-wrap-function": "^7.16.8", - "@babel/types": "^7.16.8" + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-wrap-function": "^7.18.6", + "@babel/types": "^7.18.6" } }, "@babel/helper-replace-supers": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz", - "integrity": "sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-environment-visitor": "^7.18.2", - "@babel/helper-member-expression-to-functions": "^7.17.7", - "@babel/helper-optimise-call-expression": "^7.16.7", - "@babel/traverse": "^7.18.2", - "@babel/types": "^7.18.2" + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-member-expression-to-functions": "^7.18.6", + "@babel/helper-optimise-call-expression": "^7.18.6", + "@babel/traverse": "^7.18.6", + "@babel/types": "^7.18.6" } }, "@babel/helper-simple-access": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz", - "integrity": "sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==", + "version": "7.18.6", "requires": { - "@babel/types": "^7.18.2" + "@babel/types": "^7.18.6" } }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz", - "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/types": "^7.16.0" + "@babel/types": "^7.18.6" } }, "@babel/helper-split-export-declaration": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz", - "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==", + "version": "7.18.6", "requires": { - "@babel/types": "^7.16.7" + "@babel/types": "^7.18.6" } }, "@babel/helper-validator-identifier": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz", - "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==" + "version": "7.18.6" }, "@babel/helper-validator-option": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz", - "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==" + "version": "7.18.6" }, "@babel/helper-wrap-function": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz", - "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-function-name": "^7.16.7", - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.16.8", - "@babel/types": "^7.16.8" + "@babel/helper-function-name": "^7.18.6", + "@babel/template": "^7.18.6", + "@babel/traverse": "^7.18.6", + "@babel/types": "^7.18.6" } }, "@babel/helpers": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz", - "integrity": "sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==", + "version": "7.18.6", "requires": { - "@babel/template": "^7.16.7", - "@babel/traverse": "^7.18.2", - "@babel/types": "^7.18.2" + "@babel/template": "^7.18.6", + "@babel/traverse": "^7.18.6", + "@babel/types": "^7.18.6" } }, "@babel/highlight": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz", - "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==", + "version": "7.18.6", "requires": { - "@babel/helper-validator-identifier": "^7.16.7", + "@babel/helper-validator-identifier": "^7.18.6", "chalk": "^2.0.0", "js-tokens": "^4.0.0" } }, "@babel/parser": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.3.tgz", - "integrity": "sha512-rL50YcEuHbbauAFAysNsJA4/f89fGTOBRNs9P81sniKnKAr4xULe5AecolcsKbi88xu0ByWYDj/S1AJ3FSFuSQ==" + "version": "7.18.8" }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz", - "integrity": "sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz", - "integrity": "sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0", - "@babel/plugin-proposal-optional-chaining": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-skip-transparent-expression-wrappers": "^7.18.6", + "@babel/plugin-proposal-optional-chaining": "^7.18.6" } }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz", - "integrity": "sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-remap-async-to-generator": "^7.16.8", + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-remap-async-to-generator": "^7.18.6", "@babel/plugin-syntax-async-generators": "^7.8.4" } }, "@babel/plugin-proposal-class-properties": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz", - "integrity": "sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.17.12", - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-create-class-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-proposal-class-static-block": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz", - "integrity": "sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.18.0", - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-create-class-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-class-static-block": "^7.14.5" } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz", - "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.16.7", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-dynamic-import": "^7.8.3" } }, "@babel/plugin-proposal-export-namespace-from": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz", - "integrity": "sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-export-namespace-from": "^7.8.3" } }, "@babel/plugin-proposal-json-strings": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz", - "integrity": "sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-json-strings": "^7.8.3" } }, "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz", - "integrity": "sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" } }, "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz", - "integrity": "sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" } }, "@babel/plugin-proposal-numeric-separator": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz", - "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.16.7", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-numeric-separator": "^7.10.4" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz", - "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/compat-data": "^7.17.10", - "@babel/helper-compilation-targets": "^7.17.10", - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/compat-data": "^7.18.6", + "@babel/helper-compilation-targets": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.17.12" + "@babel/plugin-transform-parameters": "^7.18.6" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz", - "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.16.7", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" } }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz", - "integrity": "sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-skip-transparent-expression-wrappers": "^7.18.6", "@babel/plugin-syntax-optional-chaining": "^7.8.3" } }, "@babel/plugin-proposal-private-methods": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz", - "integrity": "sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.17.12", - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-create-class-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-proposal-private-property-in-object": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz", - "integrity": "sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-create-class-features-plugin": "^7.17.12", - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-create-class-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", "@babel/plugin-syntax-private-property-in-object": "^7.14.5" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz", - "integrity": "sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.17.12", - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-syntax-async-generators": { "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", - "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.0" @@ -8221,8 +8094,6 @@ }, "@babel/plugin-syntax-class-properties": { "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.12.13" @@ -8230,8 +8101,6 @@ }, "@babel/plugin-syntax-class-static-block": { "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", - "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.14.5" @@ -8239,8 +8108,6 @@ }, "@babel/plugin-syntax-dynamic-import": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", - "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.0" @@ -8248,43 +8115,33 @@ }, "@babel/plugin-syntax-export-namespace-from": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", - "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.3" } }, "@babel/plugin-syntax-import-assertions": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz", - "integrity": "sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-syntax-json-strings": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", - "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-jsx": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz", - "integrity": "sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog==", + "version": "7.18.6", "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-syntax-logical-assignment-operators": { "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", - "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" @@ -8292,8 +8149,6 @@ }, "@babel/plugin-syntax-nullish-coalescing-operator": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.0" @@ -8301,8 +8156,6 @@ }, "@babel/plugin-syntax-numeric-separator": { "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", - "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.10.4" @@ -8310,8 +8163,6 @@ }, "@babel/plugin-syntax-object-rest-spread": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.0" @@ -8319,8 +8170,6 @@ }, "@babel/plugin-syntax-optional-catch-binding": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.0" @@ -8328,8 +8177,6 @@ }, "@babel/plugin-syntax-optional-chaining": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", - "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.8.0" @@ -8337,8 +8184,6 @@ }, "@babel/plugin-syntax-private-property-in-object": { "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.14.5" @@ -8346,403 +8191,327 @@ }, "@babel/plugin-syntax-top-level-await": { "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", - "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.14.5" } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz", - "integrity": "sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz", - "integrity": "sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.16.7", - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-remap-async-to-generator": "^7.16.8" + "@babel/helper-module-imports": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-remap-async-to-generator": "^7.18.6" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz", - "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.17.12.tgz", - "integrity": "sha512-jw8XW/B1i7Lqwqj2CbrViPcZijSxfguBWZP2aN59NHgxUyO/OcO1mfdCxH13QhN5LbWhPkX+f+brKGhZTiqtZQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-classes": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.17.12.tgz", - "integrity": "sha512-cvO7lc7pZat6BsvH6l/EGaI8zpl8paICaoGk+7x7guvtfak/TbIf66nYmJOH13EuG0H+Xx3M+9LQDtSvZFKXKw==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-environment-visitor": "^7.16.7", - "@babel/helper-function-name": "^7.17.9", - "@babel/helper-optimise-call-expression": "^7.16.7", - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-replace-supers": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7", + "version": "7.18.8", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-function-name": "^7.18.6", + "@babel/helper-optimise-call-expression": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-replace-supers": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", "globals": "^11.1.0" } }, "@babel/plugin-transform-computed-properties": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz", - "integrity": "sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-destructuring": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz", - "integrity": "sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz", - "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz", - "integrity": "sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz", - "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-for-of": { - "version": "7.18.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz", - "integrity": "sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==", + "version": "7.18.8", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-function-name": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz", - "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-compilation-targets": "^7.16.7", - "@babel/helper-function-name": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-compilation-targets": "^7.18.6", + "@babel/helper-function-name": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-literals": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz", - "integrity": "sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz", - "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz", - "integrity": "sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.18.0", - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-module-transforms": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz", - "integrity": "sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.18.0", - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-simple-access": "^7.18.2", + "@babel/helper-module-transforms": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-simple-access": "^7.18.6", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.0.tgz", - "integrity": "sha512-vwKpxdHnlM5tIrRt/eA0bzfbi7gUBLN08vLu38np1nZevlPySRe6yvuATJB5F/WPJ+ur4OXwpVYq9+BsxqAQuQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.16.7", - "@babel/helper-module-transforms": "^7.18.0", - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-validator-identifier": "^7.16.7", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-module-transforms": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-validator-identifier": "^7.18.6", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz", - "integrity": "sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.18.0", - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-module-transforms": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz", - "integrity": "sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.17.12", - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-new-target": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz", - "integrity": "sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-object-super": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz", - "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.16.7", - "@babel/helper-replace-supers": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-replace-supers": "^7.18.6" } }, "@babel/plugin-transform-parameters": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz", - "integrity": "sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==", + "version": "7.18.8", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-property-literals": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz", - "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-react-display-name": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz", - "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-react-jsx": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz", - "integrity": "sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-module-imports": "^7.16.7", - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/plugin-syntax-jsx": "^7.17.12", - "@babel/types": "^7.17.12" + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-module-imports": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/plugin-syntax-jsx": "^7.18.6", + "@babel/types": "^7.18.6" } }, "@babel/plugin-transform-react-jsx-development": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz", - "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/plugin-transform-react-jsx": "^7.16.7" + "@babel/plugin-transform-react-jsx": "^7.18.6" } }, "@babel/plugin-transform-react-pure-annotations": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.0.tgz", - "integrity": "sha512-6+0IK6ouvqDn9bmEG7mEyF/pwlJXVj5lwydybpyyH3D0A7Hftk+NCTdYjnLNZksn261xaOV5ksmp20pQEmc2RQ==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.16.7", - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-regenerator": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz", - "integrity": "sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12", + "@babel/helper-plugin-utils": "^7.18.6", "regenerator-transform": "^0.15.0" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz", - "integrity": "sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz", - "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-spread": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz", - "integrity": "sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0" + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-skip-transparent-expression-wrappers": "^7.18.6" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz", - "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-template-literals": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz", - "integrity": "sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz", - "integrity": "sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz", - "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz", - "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.16.7", - "@babel/helper-plugin-utils": "^7.16.7" + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" } }, "@babel/preset-env": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz", - "integrity": "sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.17.10", - "@babel/helper-compilation-targets": "^7.18.2", - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-validator-option": "^7.16.7", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12", - "@babel/plugin-proposal-async-generator-functions": "^7.17.12", - "@babel/plugin-proposal-class-properties": "^7.17.12", - "@babel/plugin-proposal-class-static-block": "^7.18.0", - "@babel/plugin-proposal-dynamic-import": "^7.16.7", - "@babel/plugin-proposal-export-namespace-from": "^7.17.12", - "@babel/plugin-proposal-json-strings": "^7.17.12", - "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12", - "@babel/plugin-proposal-numeric-separator": "^7.16.7", - "@babel/plugin-proposal-object-rest-spread": "^7.18.0", - "@babel/plugin-proposal-optional-catch-binding": "^7.16.7", - "@babel/plugin-proposal-optional-chaining": "^7.17.12", - "@babel/plugin-proposal-private-methods": "^7.17.12", - "@babel/plugin-proposal-private-property-in-object": "^7.17.12", - "@babel/plugin-proposal-unicode-property-regex": "^7.17.12", + "version": "7.18.6", + "dev": true, + "requires": { + "@babel/compat-data": "^7.18.6", + "@babel/helper-compilation-targets": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-validator-option": "^7.18.6", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.6", + "@babel/plugin-proposal-async-generator-functions": "^7.18.6", + "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/plugin-proposal-class-static-block": "^7.18.6", + "@babel/plugin-proposal-dynamic-import": "^7.18.6", + "@babel/plugin-proposal-export-namespace-from": "^7.18.6", + "@babel/plugin-proposal-json-strings": "^7.18.6", + "@babel/plugin-proposal-logical-assignment-operators": "^7.18.6", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", + "@babel/plugin-proposal-numeric-separator": "^7.18.6", + "@babel/plugin-proposal-object-rest-spread": "^7.18.6", + "@babel/plugin-proposal-optional-catch-binding": "^7.18.6", + "@babel/plugin-proposal-optional-chaining": "^7.18.6", + "@babel/plugin-proposal-private-methods": "^7.18.6", + "@babel/plugin-proposal-private-property-in-object": "^7.18.6", + "@babel/plugin-proposal-unicode-property-regex": "^7.18.6", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.17.12", + "@babel/plugin-syntax-import-assertions": "^7.18.6", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", @@ -8752,51 +8521,49 @@ "@babel/plugin-syntax-optional-chaining": "^7.8.3", "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", - "@babel/plugin-transform-arrow-functions": "^7.17.12", - "@babel/plugin-transform-async-to-generator": "^7.17.12", - "@babel/plugin-transform-block-scoped-functions": "^7.16.7", - "@babel/plugin-transform-block-scoping": "^7.17.12", - "@babel/plugin-transform-classes": "^7.17.12", - "@babel/plugin-transform-computed-properties": "^7.17.12", - "@babel/plugin-transform-destructuring": "^7.18.0", - "@babel/plugin-transform-dotall-regex": "^7.16.7", - "@babel/plugin-transform-duplicate-keys": "^7.17.12", - "@babel/plugin-transform-exponentiation-operator": "^7.16.7", - "@babel/plugin-transform-for-of": "^7.18.1", - "@babel/plugin-transform-function-name": "^7.16.7", - "@babel/plugin-transform-literals": "^7.17.12", - "@babel/plugin-transform-member-expression-literals": "^7.16.7", - "@babel/plugin-transform-modules-amd": "^7.18.0", - "@babel/plugin-transform-modules-commonjs": "^7.18.2", - "@babel/plugin-transform-modules-systemjs": "^7.18.0", - "@babel/plugin-transform-modules-umd": "^7.18.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12", - "@babel/plugin-transform-new-target": "^7.17.12", - "@babel/plugin-transform-object-super": "^7.16.7", - "@babel/plugin-transform-parameters": "^7.17.12", - "@babel/plugin-transform-property-literals": "^7.16.7", - "@babel/plugin-transform-regenerator": "^7.18.0", - "@babel/plugin-transform-reserved-words": "^7.17.12", - "@babel/plugin-transform-shorthand-properties": "^7.16.7", - "@babel/plugin-transform-spread": "^7.17.12", - "@babel/plugin-transform-sticky-regex": "^7.16.7", - "@babel/plugin-transform-template-literals": "^7.18.2", - "@babel/plugin-transform-typeof-symbol": "^7.17.12", - "@babel/plugin-transform-unicode-escapes": "^7.16.7", - "@babel/plugin-transform-unicode-regex": "^7.16.7", + "@babel/plugin-transform-arrow-functions": "^7.18.6", + "@babel/plugin-transform-async-to-generator": "^7.18.6", + "@babel/plugin-transform-block-scoped-functions": "^7.18.6", + "@babel/plugin-transform-block-scoping": "^7.18.6", + "@babel/plugin-transform-classes": "^7.18.6", + "@babel/plugin-transform-computed-properties": "^7.18.6", + "@babel/plugin-transform-destructuring": "^7.18.6", + "@babel/plugin-transform-dotall-regex": "^7.18.6", + "@babel/plugin-transform-duplicate-keys": "^7.18.6", + "@babel/plugin-transform-exponentiation-operator": "^7.18.6", + "@babel/plugin-transform-for-of": "^7.18.6", + "@babel/plugin-transform-function-name": "^7.18.6", + "@babel/plugin-transform-literals": "^7.18.6", + "@babel/plugin-transform-member-expression-literals": "^7.18.6", + "@babel/plugin-transform-modules-amd": "^7.18.6", + "@babel/plugin-transform-modules-commonjs": "^7.18.6", + "@babel/plugin-transform-modules-systemjs": "^7.18.6", + "@babel/plugin-transform-modules-umd": "^7.18.6", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.18.6", + "@babel/plugin-transform-new-target": "^7.18.6", + "@babel/plugin-transform-object-super": "^7.18.6", + "@babel/plugin-transform-parameters": "^7.18.6", + "@babel/plugin-transform-property-literals": "^7.18.6", + "@babel/plugin-transform-regenerator": "^7.18.6", + "@babel/plugin-transform-reserved-words": "^7.18.6", + "@babel/plugin-transform-shorthand-properties": "^7.18.6", + "@babel/plugin-transform-spread": "^7.18.6", + "@babel/plugin-transform-sticky-regex": "^7.18.6", + "@babel/plugin-transform-template-literals": "^7.18.6", + "@babel/plugin-transform-typeof-symbol": "^7.18.6", + "@babel/plugin-transform-unicode-escapes": "^7.18.6", + "@babel/plugin-transform-unicode-regex": "^7.18.6", "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.18.2", - "babel-plugin-polyfill-corejs2": "^0.3.0", - "babel-plugin-polyfill-corejs3": "^0.5.0", - "babel-plugin-polyfill-regenerator": "^0.3.0", + "@babel/types": "^7.18.6", + "babel-plugin-polyfill-corejs2": "^0.3.1", + "babel-plugin-polyfill-corejs3": "^0.5.2", + "babel-plugin-polyfill-regenerator": "^0.3.1", "core-js-compat": "^3.22.1", "semver": "^6.3.0" } }, "@babel/preset-modules": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", - "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.0.0", @@ -8807,67 +8574,55 @@ } }, "@babel/preset-react": { - "version": "7.17.12", - "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.17.12.tgz", - "integrity": "sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA==", + "version": "7.18.6", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.17.12", - "@babel/helper-validator-option": "^7.16.7", - "@babel/plugin-transform-react-display-name": "^7.16.7", - "@babel/plugin-transform-react-jsx": "^7.17.12", - "@babel/plugin-transform-react-jsx-development": "^7.16.7", - "@babel/plugin-transform-react-pure-annotations": "^7.16.7" + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-validator-option": "^7.18.6", + "@babel/plugin-transform-react-display-name": "^7.18.6", + "@babel/plugin-transform-react-jsx": "^7.18.6", + "@babel/plugin-transform-react-jsx-development": "^7.18.6", + "@babel/plugin-transform-react-pure-annotations": "^7.18.6" } }, "@babel/runtime": { - "version": "7.18.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz", - "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==", + "version": "7.18.6", "requires": { "regenerator-runtime": "^0.13.4" } }, "@babel/template": { - "version": "7.16.7", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz", - "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==", + "version": "7.18.6", "requires": { - "@babel/code-frame": "^7.16.7", - "@babel/parser": "^7.16.7", - "@babel/types": "^7.16.7" + "@babel/code-frame": "^7.18.6", + "@babel/parser": "^7.18.6", + "@babel/types": "^7.18.6" } }, "@babel/traverse": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz", - "integrity": "sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==", - "requires": { - "@babel/code-frame": "^7.16.7", - "@babel/generator": "^7.18.2", - "@babel/helper-environment-visitor": "^7.18.2", - "@babel/helper-function-name": "^7.17.9", - "@babel/helper-hoist-variables": "^7.16.7", - "@babel/helper-split-export-declaration": "^7.16.7", - "@babel/parser": "^7.18.0", - "@babel/types": "^7.18.2", + "version": "7.18.8", + "requires": { + "@babel/code-frame": "^7.18.6", + "@babel/generator": "^7.18.7", + "@babel/helper-environment-visitor": "^7.18.6", + "@babel/helper-function-name": "^7.18.6", + "@babel/helper-hoist-variables": "^7.18.6", + "@babel/helper-split-export-declaration": "^7.18.6", + "@babel/parser": "^7.18.8", + "@babel/types": "^7.18.8", "debug": "^4.1.0", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.18.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.2.tgz", - "integrity": "sha512-0On6B8A4/+mFUto5WERt3EEuG1NznDirvwca1O8UwXQHVY8g3R7OzYgxXdOfMwLO08UrpUD/2+3Bclyq+/C94Q==", + "version": "7.18.8", "requires": { - "@babel/helper-validator-identifier": "^7.16.7", + "@babel/helper-validator-identifier": "^7.18.6", "to-fast-properties": "^2.0.0" } }, "@cspotcode/source-map-support": { "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", "dev": true, "requires": { "@jridgewell/trace-mapping": "0.3.9" @@ -8875,8 +8630,6 @@ "dependencies": { "@jridgewell/trace-mapping": { "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", "dev": true, "requires": { "@jridgewell/resolve-uri": "^3.0.3", @@ -8887,14 +8640,10 @@ }, "@discoveryjs/json-ext": { "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", - "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", "dev": true }, "@emotion/babel-plugin": { "version": "11.9.2", - "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz", - "integrity": "sha512-Pr/7HGH6H6yKgnVFNEj2MVlreu3ADqftqjqwUvDy/OJzKFgxKeTQ+eeUf20FOTuHVkDON2iNa25rAXVYtWJCjw==", "requires": { "@babel/helper-module-imports": "^7.12.13", "@babel/plugin-syntax-jsx": "^7.12.13", @@ -8911,65 +8660,49 @@ }, "dependencies": { "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + "version": "4.0.0" }, "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + "version": "0.5.7" } } }, "@emotion/cache": { - "version": "11.7.1", - "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.7.1.tgz", - "integrity": "sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A==", + "version": "11.9.3", "requires": { "@emotion/memoize": "^0.7.4", - "@emotion/sheet": "^1.1.0", + "@emotion/sheet": "^1.1.1", "@emotion/utils": "^1.0.0", "@emotion/weak-memoize": "^0.2.5", "stylis": "4.0.13" } }, "@emotion/hash": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz", - "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==" + "version": "0.8.0" }, "@emotion/is-prop-valid": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz", - "integrity": "sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ==", + "version": "1.1.3", "requires": { "@emotion/memoize": "^0.7.4" } }, "@emotion/memoize": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz", - "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ==" + "version": "0.7.5" }, "@emotion/react": { - "version": "11.9.0", - "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.9.0.tgz", - "integrity": "sha512-lBVSF5d0ceKtfKCDQJveNAtkC7ayxpVlgOohLgXqRwqWr9bOf4TZAFFyIcNngnV6xK6X4x2ZeXq7vliHkoVkxQ==", + "version": "11.9.3", "requires": { "@babel/runtime": "^7.13.10", "@emotion/babel-plugin": "^11.7.1", - "@emotion/cache": "^11.7.1", - "@emotion/serialize": "^1.0.3", + "@emotion/cache": "^11.9.3", + "@emotion/serialize": "^1.0.4", "@emotion/utils": "^1.1.0", "@emotion/weak-memoize": "^0.2.5", "hoist-non-react-statics": "^3.3.1" } }, "@emotion/serialize": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.3.tgz", - "integrity": "sha512-2mSSvgLfyV3q+iVh3YWgNlUc2a9ZlDU7DjuP5MjK3AXRR0dYigCrP99aeFtaB2L/hjfEZdSThn5dsZ0ufqbvsA==", + "version": "1.0.4", "requires": { "@emotion/hash": "^0.8.0", "@emotion/memoize": "^0.7.4", @@ -8979,162 +8712,143 @@ } }, "@emotion/sheet": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.1.0.tgz", - "integrity": "sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g==" + "version": "1.1.1" }, "@emotion/styled": { - "version": "11.8.1", - "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.8.1.tgz", - "integrity": "sha512-OghEVAYBZMpEquHZwuelXcRjRJQOVayvbmNR0zr174NHdmMgrNkLC6TljKC5h9lZLkN5WGrdUcrKlOJ4phhoTQ==", + "version": "11.9.3", "requires": { "@babel/runtime": "^7.13.10", "@emotion/babel-plugin": "^11.7.1", - "@emotion/is-prop-valid": "^1.1.2", - "@emotion/serialize": "^1.0.2", + "@emotion/is-prop-valid": "^1.1.3", + "@emotion/serialize": "^1.0.4", "@emotion/utils": "^1.1.0" } }, "@emotion/unitless": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", - "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" + "version": "0.7.5" }, "@emotion/utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.1.0.tgz", - "integrity": "sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ==" + "version": "1.1.0" }, "@emotion/weak-memoize": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz", - "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" + "version": "0.2.5" }, "@jridgewell/gen-mapping": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", - "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", "requires": { "@jridgewell/set-array": "^1.0.0", "@jridgewell/sourcemap-codec": "^1.4.10" } }, "@jridgewell/resolve-uri": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz", - "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==" + "version": "3.1.0" }, "@jridgewell/set-array": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz", - "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==" + "version": "1.1.2" + }, + "@jridgewell/source-map": { + "version": "0.3.2", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "dependencies": { + "@jridgewell/gen-mapping": { + "version": "0.3.2", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + } + } }, "@jridgewell/sourcemap-codec": { - "version": "1.4.13", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz", - "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==" + "version": "1.4.14" }, "@jridgewell/trace-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz", - "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==", + "version": "0.3.14", "requires": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" } }, "@js.properties/properties": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/@js.properties/properties/-/properties-0.5.4.tgz", - "integrity": "sha512-4M/Mb2CxzuI1CtQhVFs6OC9ceuGPAP6SOWnpLcrdB1TcUHroXbsYDVJNOm32koRMfuCoRACbojcm4dPPcQxu0w==" + "version": "0.5.4" }, "@mui/base": { - "version": "5.0.0-alpha.82", - "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.82.tgz", - "integrity": "sha512-WUVDjCGnLXzmGxrmfW31blhucg0sRX4YddK2Falq7FlVzwdJaPgWn/xzPZmdLL0+WXon0gQVnDrq2qvggE/GMg==", + "version": "5.0.0-alpha.88", "requires": { "@babel/runtime": "^7.17.2", - "@emotion/is-prop-valid": "^1.1.2", - "@mui/types": "^7.1.3", - "@mui/utils": "^5.8.0", + "@emotion/is-prop-valid": "^1.1.3", + "@mui/types": "^7.1.4", + "@mui/utils": "^5.8.6", "@popperjs/core": "^2.11.5", - "clsx": "^1.1.1", + "clsx": "^1.2.0", "prop-types": "^15.8.1", "react-is": "^17.0.2" } }, "@mui/icons-material": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.8.0.tgz", - "integrity": "sha512-ScwLxa0q5VYV70Jfc60V/9VD0b9SvIeZ0Jddx2Dt2pBUFFO9vKdrbt9LYiT+4p21Au5NdYIb2XSHj46CLN1v3g==", + "version": "5.8.4", "requires": { "@babel/runtime": "^7.17.2" } }, "@mui/material": { - "version": "5.8.1", - "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.8.1.tgz", - "integrity": "sha512-Vl3BHFzOcAT5TJfvzoQUyuo/Xckn+/NSRyJ8upM4Hbz6Y1egW6P8f1RCa4FdkEfPSd5wSSYdmPfAiEh8eI4rPg==", + "version": "5.8.7", "requires": { "@babel/runtime": "^7.17.2", - "@mui/base": "5.0.0-alpha.82", - "@mui/system": "^5.8.1", - "@mui/types": "^7.1.3", - "@mui/utils": "^5.8.0", - "@types/react-transition-group": "^4.4.4", - "clsx": "^1.1.1", - "csstype": "^3.0.11", - "hoist-non-react-statics": "^3.3.2", + "@mui/base": "5.0.0-alpha.88", + "@mui/system": "^5.8.7", + "@mui/types": "^7.1.4", + "@mui/utils": "^5.8.6", + "@types/react-transition-group": "^4.4.5", + "clsx": "^1.2.0", + "csstype": "^3.1.0", "prop-types": "^15.8.1", "react-is": "^17.0.2", "react-transition-group": "^4.4.2" } }, "@mui/private-theming": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.8.0.tgz", - "integrity": "sha512-MjRAneTmCKLR9u2S4jtjLUe6gpHxlbb4g2bqpDJ2PdwlvwsWIUzbc/gVB4dvccljXeWxr5G2M/Co2blXisvFIw==", + "version": "5.8.6", "requires": { "@babel/runtime": "^7.17.2", - "@mui/utils": "^5.8.0", + "@mui/utils": "^5.8.6", "prop-types": "^15.8.1" } }, "@mui/styled-engine": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.8.0.tgz", - "integrity": "sha512-Q3spibB8/EgeMYHc+/o3RRTnAYkSl7ROCLhXJ830W8HZ2/iDiyYp16UcxKPurkXvLhUaILyofPVrP3Su2uKsAw==", + "version": "5.8.7", "requires": { "@babel/runtime": "^7.17.2", - "@emotion/cache": "^11.7.1", + "@emotion/cache": "^11.9.3", + "csstype": "^3.1.0", "prop-types": "^15.8.1" } }, "@mui/system": { - "version": "5.8.1", - "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.8.1.tgz", - "integrity": "sha512-kWJMEN62+HJb4LMRNEAZQYc++FPYsqPsU9dCL7ByLgmz/ZzRrZ8FjDi2r4j0ZeE4kaVvqBXh+RA7tLzmCKqV9w==", + "version": "5.8.7", "requires": { "@babel/runtime": "^7.17.2", - "@mui/private-theming": "^5.8.0", - "@mui/styled-engine": "^5.8.0", - "@mui/types": "^7.1.3", - "@mui/utils": "^5.8.0", - "clsx": "^1.1.1", - "csstype": "^3.0.11", + "@mui/private-theming": "^5.8.6", + "@mui/styled-engine": "^5.8.7", + "@mui/types": "^7.1.4", + "@mui/utils": "^5.8.6", + "clsx": "^1.2.0", + "csstype": "^3.1.0", "prop-types": "^15.8.1" } }, "@mui/types": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.3.tgz", - "integrity": "sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA==", + "version": "7.1.4", "requires": {} }, "@mui/utils": { - "version": "5.8.0", - "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.8.0.tgz", - "integrity": "sha512-7LgUtCvz78676iC0wpTH7HizMdCrTphhBmRWimIMFrp5Ph6JbDFVuKS1CwYnWWxRyYKL0QzXrDL0lptAU90EXg==", + "version": "5.8.6", "requires": { "@babel/runtime": "^7.17.2", "@types/prop-types": "^15.7.5", @@ -9144,112 +8858,92 @@ } }, "@popperjs/core": { - "version": "2.11.5", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz", - "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==" + "version": "2.11.5" }, "@tootallnate/once": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", "dev": true }, "@trysound/sax": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", - "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", "dev": true }, "@tsconfig/node10": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", - "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", + "version": "1.0.9", "dev": true }, "@tsconfig/node12": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", - "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", + "version": "1.0.11", "dev": true }, "@tsconfig/node14": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", - "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", + "version": "1.0.3", "dev": true }, "@tsconfig/node16": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", - "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", + "version": "1.0.3", "dev": true }, "@types/eslint": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.2.tgz", - "integrity": "sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA==", + "version": "8.4.5", "dev": true, "requires": { "@types/estree": "*", "@types/json-schema": "*" + }, + "dependencies": { + "@types/estree": { + "version": "0.0.52", + "dev": true + } } }, "@types/eslint-scope": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz", - "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==", + "version": "3.7.4", "dev": true, "requires": { "@types/eslint": "*", "@types/estree": "*" + }, + "dependencies": { + "@types/estree": { + "version": "0.0.52", + "dev": true + } } }, "@types/estree": { "version": "0.0.51", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz", - "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==", "dev": true }, "@types/hast": { "version": "2.3.4", - "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.4.tgz", - "integrity": "sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==", "requires": { "@types/unist": "*" } }, "@types/json-schema": { "version": "7.0.11", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", - "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==", "dev": true }, "@types/node": { - "version": "18.0.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz", - "integrity": "sha512-HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ==", + "version": "18.0.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.6.tgz", + "integrity": "sha512-/xUq6H2aQm261exT6iZTMifUySEt4GR5KX8eYyY+C4MSNPqSh9oNIP7tz2GLKTlFaiBbgZNxffoR3CVRG+cljw==", "dev": true }, "@types/object-assign": { "version": "4.0.30", - "resolved": "https://registry.npmjs.org/@types/object-assign/-/object-assign-4.0.30.tgz", - "integrity": "sha512-HhE8gFfLj321pa6OE59QmOdL5NgIOhkdYn7MWnZTOcHOms8XFzNgr9+A0/GbN0XEX9wTM58yg4YXKhGr69QIUw==", "dev": true }, "@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" + "version": "4.0.0" }, "@types/prop-types": { - "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" + "version": "15.7.5" }, "@types/react": { - "version": "18.0.9", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.9.tgz", - "integrity": "sha512-9bjbg1hJHUm4De19L1cHiW0Jvx3geel6Qczhjd0qY5VKVE2X5+x77YxAepuCwVh4vrgZJdgEJw48zrhRIeF4Nw==", + "version": "18.0.15", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -9257,9 +8951,7 @@ } }, "@types/react-dom": { - "version": "18.0.5", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.5.tgz", - "integrity": "sha512-OWPWTUrY/NIrjsAPkAk1wW9LZeIjSvkXRhclsFO8CZcZGCOg2G0YZy4ft+rOyYxy8B7ui5iZzi9OkDebZ7/QSA==", + "version": "18.0.6", "dev": true, "requires": { "@types/react": "*" @@ -9267,16 +8959,12 @@ }, "@types/react-is": { "version": "17.0.3", - "resolved": "https://registry.npmjs.org/@types/react-is/-/react-is-17.0.3.tgz", - "integrity": "sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw==", "requires": { "@types/react": "*" } }, "@types/react-onsenui": { - "version": "2.9.17", - "resolved": "https://registry.npmjs.org/@types/react-onsenui/-/react-onsenui-2.9.17.tgz", - "integrity": "sha512-r62+TB80SGCwTQDiMr2dA2zqOVAW7GD1mNv9dSuanmAynViNkw2gAUgeI7MsP7klXr7cflJedrWwvb8ng0OaDg==", + "version": "2.9.18", "dev": true, "requires": { "@types/react": "*" @@ -9284,35 +8972,61 @@ }, "@types/react-syntax-highlighter": { "version": "15.5.2", - "resolved": "https://registry.npmjs.org/@types/react-syntax-highlighter/-/react-syntax-highlighter-15.5.2.tgz", - "integrity": "sha512-cJJvwU8lQv/efGSo/LmPoaOqWi/B0AG4CNKKCn7HPUL25SqiPn1Vl+fV1JiUigJv97ruTZ8mo08+b8/0zoYufA==", "dev": true, "requires": { "@types/react": "*" } }, "@types/react-transition-group": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz", - "integrity": "sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==", + "version": "4.4.5", "requires": { "@types/react": "*" } }, - "@types/scheduler": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz", - "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==" - }, + "@types/scheduler": { + "version": "0.16.2" + }, + "@types/source-list-map": { + "version": "0.1.2", + "dev": true + }, + "@types/tapable": { + "version": "1.0.8", + "dev": true + }, + "@types/uglify-js": { + "version": "3.16.0", + "dev": true, + "requires": { + "source-map": "^0.6.1" + } + }, + "@types/uglifyjs-webpack-plugin": { + "version": "1.1.2", + "dev": true, + "requires": { + "@types/webpack": "^4" + }, + "dependencies": { + "@types/webpack": { + "version": "4.41.32", + "dev": true, + "requires": { + "@types/node": "*", + "@types/tapable": "^1", + "@types/uglify-js": "*", + "@types/webpack-sources": "*", + "anymatch": "^3.0.0", + "source-map": "^0.6.0" + } + } + } + }, "@types/unist": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", - "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==" + "version": "2.0.6" }, "@types/webpack": { "version": "5.28.0", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-5.28.0.tgz", - "integrity": "sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==", "dev": true, "requires": { "@types/node": "*", @@ -9320,10 +9034,23 @@ "webpack": "^5" } }, + "@types/webpack-sources": { + "version": "3.2.0", + "dev": true, + "requires": { + "@types/node": "*", + "@types/source-list-map": "*", + "source-map": "^0.7.3" + }, + "dependencies": { + "source-map": { + "version": "0.7.4", + "dev": true + } + } + }, "@webassemblyjs/ast": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz", - "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==", "dev": true, "requires": { "@webassemblyjs/helper-numbers": "1.11.1", @@ -9332,26 +9059,18 @@ }, "@webassemblyjs/floating-point-hex-parser": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz", - "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==", "dev": true }, "@webassemblyjs/helper-api-error": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz", - "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==", "dev": true }, "@webassemblyjs/helper-buffer": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz", - "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==", "dev": true }, "@webassemblyjs/helper-numbers": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz", - "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==", "dev": true, "requires": { "@webassemblyjs/floating-point-hex-parser": "1.11.1", @@ -9361,14 +9080,10 @@ }, "@webassemblyjs/helper-wasm-bytecode": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz", - "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==", "dev": true }, "@webassemblyjs/helper-wasm-section": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz", - "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==", "dev": true, "requires": { "@webassemblyjs/ast": "1.11.1", @@ -9379,8 +9094,6 @@ }, "@webassemblyjs/ieee754": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz", - "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==", "dev": true, "requires": { "@xtuc/ieee754": "^1.2.0" @@ -9388,8 +9101,6 @@ }, "@webassemblyjs/leb128": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz", - "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==", "dev": true, "requires": { "@xtuc/long": "4.2.2" @@ -9397,14 +9108,10 @@ }, "@webassemblyjs/utf8": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz", - "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==", "dev": true }, "@webassemblyjs/wasm-edit": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz", - "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==", "dev": true, "requires": { "@webassemblyjs/ast": "1.11.1", @@ -9419,8 +9126,6 @@ }, "@webassemblyjs/wasm-gen": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz", - "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==", "dev": true, "requires": { "@webassemblyjs/ast": "1.11.1", @@ -9432,8 +9137,6 @@ }, "@webassemblyjs/wasm-opt": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz", - "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==", "dev": true, "requires": { "@webassemblyjs/ast": "1.11.1", @@ -9444,8 +9147,6 @@ }, "@webassemblyjs/wasm-parser": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz", - "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==", "dev": true, "requires": { "@webassemblyjs/ast": "1.11.1", @@ -9458,8 +9159,6 @@ }, "@webassemblyjs/wast-printer": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz", - "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==", "dev": true, "requires": { "@webassemblyjs/ast": "1.11.1", @@ -9467,69 +9166,49 @@ } }, "@webpack-cli/configtest": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.1.1.tgz", - "integrity": "sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==", + "version": "1.2.0", "dev": true, "requires": {} }, "@webpack-cli/info": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.4.1.tgz", - "integrity": "sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==", + "version": "1.5.0", "dev": true, "requires": { "envinfo": "^7.7.3" } }, "@webpack-cli/serve": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.6.1.tgz", - "integrity": "sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==", + "version": "1.7.0", "dev": true, "requires": {} }, "@xtuc/ieee754": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", "dev": true }, "@xtuc/long": { "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, "abbrev": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true }, "acorn": { "version": "8.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz", - "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==", "dev": true }, "acorn-import-assertions": { "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", "dev": true, "requires": {} }, "acorn-walk": { "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true }, "agent-base": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, "requires": { "debug": "4" @@ -9537,8 +9216,6 @@ }, "ajv": { "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -9547,10 +9224,13 @@ "uri-js": "^4.2.2" } }, + "ajv-errors": { + "version": "1.0.1", + "dev": true, + "requires": {} + }, "ajv-formats": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", - "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", "dev": true, "requires": { "ajv": "^8.0.0" @@ -9558,8 +9238,6 @@ "dependencies": { "ajv": { "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -9570,47 +9248,39 @@ }, "json-schema-traverse": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true } } }, "ajv-keywords": { "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true, "requires": {} }, "ansi-styles": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "requires": { "color-convert": "^1.9.0" } }, "anymatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", "dev": true, "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" } }, + "aproba": { + "version": "1.2.0", + "dev": true + }, "arg": { "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", "dev": true }, "argparse": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { "sprintf-js": "~1.0.2" @@ -9618,25 +9288,17 @@ }, "array-find-index": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==", "dev": true }, "asap": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", "dev": true }, "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + "version": "0.4.0" }, "axios": { "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", "requires": { "follow-redirects": "^1.14.9", "form-data": "^4.0.0" @@ -9644,8 +9306,6 @@ }, "babel-loader": { "version": "8.2.5", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz", - "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==", "dev": true, "requires": { "find-cache-dir": "^3.3.1", @@ -9656,8 +9316,6 @@ }, "babel-plugin-dynamic-import-node": { "version": "2.3.3", - "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz", - "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", "dev": true, "requires": { "object.assign": "^4.1.0" @@ -9665,8 +9323,6 @@ }, "babel-plugin-macros": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz", - "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==", "requires": { "@babel/runtime": "^7.7.2", "cosmiconfig": "^6.0.0", @@ -9675,8 +9331,6 @@ "dependencies": { "cosmiconfig": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", - "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", "requires": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.1.0", @@ -9684,13 +9338,14 @@ "path-type": "^4.0.0", "yaml": "^1.7.2" } + }, + "yaml": { + "version": "1.10.2" } } }, "babel-plugin-polyfill-corejs2": { "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz", - "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==", "dev": true, "requires": { "@babel/compat-data": "^7.13.11", @@ -9700,8 +9355,6 @@ }, "babel-plugin-polyfill-corejs3": { "version": "0.5.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz", - "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==", "dev": true, "requires": { "@babel/helper-define-polyfill-provider": "^0.3.1", @@ -9710,8 +9363,6 @@ }, "babel-plugin-polyfill-regenerator": { "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz", - "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==", "dev": true, "requires": { "@babel/helper-define-polyfill-provider": "^0.3.1" @@ -9719,37 +9370,29 @@ }, "balanced-match": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, "big.js": { "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true }, "binary-extensions": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true + }, + "bluebird": { + "version": "3.7.2", "dev": true }, "boolbase": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", "dev": true }, "bota64": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/bota64/-/bota64-1.0.4.tgz", - "integrity": "sha512-zWjktQnNqBA0tP2EKeOUVMawTYiTa2FXtJi2fr3kpxspMBML7mHLMndJiG5GOwvwnPR/gslODzdLfzd60OZ4Lg==" + "version": "1.0.7" }, "brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { "balanced-match": "^1.0.0", @@ -9758,8 +9401,6 @@ }, "braces": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { "fill-range": "^7.0.1" @@ -9767,32 +9408,57 @@ }, "browser-stdout": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true }, "browserslist": { - "version": "4.20.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz", - "integrity": "sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==", + "version": "4.21.1", "requires": { - "caniuse-lite": "^1.0.30001332", - "electron-to-chromium": "^1.4.118", - "escalade": "^3.1.1", - "node-releases": "^2.0.3", - "picocolors": "^1.0.0" + "caniuse-lite": "^1.0.30001359", + "electron-to-chromium": "^1.4.172", + "node-releases": "^2.0.5", + "update-browserslist-db": "^1.0.4" } }, "buffer-from": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "dev": true }, + "cacache": { + "version": "12.0.4", + "dev": true, + "requires": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "5.1.1", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "yallist": { + "version": "3.1.1", + "dev": true + } + } + }, "call-bind": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", "dev": true, "requires": { "function-bind": "^1.1.1", @@ -9800,14 +9466,10 @@ } }, "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" + "version": "3.1.0" }, "caniuse-api": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", - "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", "dev": true, "requires": { "browserslist": "^4.0.0", @@ -9817,34 +9479,38 @@ } }, "caniuse-lite": { - "version": "1.0.30001343", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001343.tgz", - "integrity": "sha512-8KeCrAtPMabo/XW14B+R9sZYoClx1n0b+WYgwDKZPtWR3TcdvWzdSy7mPyFEmR5WU1St9v1PW6sdO5dkFOEzfA==" + "version": "1.0.30001363" }, "chalk": { "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "requires": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" + }, + "dependencies": { + "has-flag": { + "version": "3.0.0" + }, + "supports-color": { + "version": "5.5.0", + "requires": { + "has-flag": "^3.0.0" + } + } } }, + "character-entities": { + "version": "1.2.4" + }, "character-entities-legacy": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz", - "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==" + "version": "1.1.4" }, "character-reference-invalid": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz", - "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==" + "version": "1.1.4" }, "chokidar": { "version": "3.5.3", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz", - "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==", "dev": true, "requires": { "anymatch": "~3.1.2", @@ -9857,16 +9523,16 @@ "readdirp": "~3.6.0" } }, + "chownr": { + "version": "1.1.4", + "dev": true + }, "chrome-trace-event": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", "dev": true }, "clone-deep": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, "requires": { "is-plain-object": "^2.0.4", @@ -9875,91 +9541,94 @@ } }, "clsx": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz", - "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==" + "version": "1.2.1" }, "color-convert": { "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "requires": { "color-name": "1.1.3" } }, "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + "version": "1.1.3" }, "colord": { "version": "2.9.2", - "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz", - "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==", "dev": true }, "colorette": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.16.tgz", - "integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==", + "version": "2.0.19", "dev": true }, "combined-stream": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "requires": { "delayed-stream": "~1.0.0" } }, + "comma-separated-tokens": { + "version": "1.0.8" + }, "commander": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", "dev": true }, "commondir": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", "dev": true }, "concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, + "concat-stream": { + "version": "1.6.2", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, "convert-source-map": { "version": "1.8.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz", - "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==", "requires": { "safe-buffer": "~5.1.1" } }, + "copy-concurrently": { + "version": "1.0.5", + "dev": true, + "requires": { + "aproba": "^1.1.1", + "fs-write-stream-atomic": "^1.0.8", + "iferr": "^0.1.5", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.0" + } + }, "core-js-compat": { - "version": "3.22.7", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.7.tgz", - "integrity": "sha512-uI9DAQKKiiE/mclIC5g4AjRpio27g+VMRhe6rQoz+q4Wm4L6A/fJhiLtBw+sfOpDG9wZ3O0pxIw7GbfOlBgjOA==", + "version": "3.23.3", "dev": true, "requires": { - "browserslist": "^4.20.3", + "browserslist": "^4.21.0", "semver": "7.0.0" }, "dependencies": { "semver": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", - "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==", "dev": true } } }, + "core-util-is": { + "version": "1.0.3", + "dev": true + }, "cosmiconfig": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", - "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", "dev": true, "requires": { "@types/parse-json": "^4.0.0", @@ -9967,18 +9636,20 @@ "parse-json": "^5.0.0", "path-type": "^4.0.0", "yaml": "^1.10.0" + }, + "dependencies": { + "yaml": { + "version": "1.10.2", + "dev": true + } } }, "create-require": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", "dev": true }, "cross-spawn": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -9987,16 +9658,12 @@ } }, "css-declaration-sorter": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz", - "integrity": "sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==", + "version": "6.3.0", "dev": true, "requires": {} }, "css-loader": { "version": "6.7.1", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz", - "integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==", "dev": true, "requires": { "icss-utils": "^5.1.0", @@ -10011,8 +9678,6 @@ "dependencies": { "semver": { "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -10022,8 +9687,6 @@ }, "css-minimizer-webpack-plugin": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-4.0.0.tgz", - "integrity": "sha512-7ZXXRzRHvofv3Uac5Y+RkWRNo0ZMlcg8e9/OtrqUYmwDWJo+qs67GvdeFrXLsFb7czKNwjQhPkM0avlIYl+1nA==", "dev": true, "requires": { "cssnano": "^5.1.8", @@ -10036,8 +9699,6 @@ "dependencies": { "ajv": { "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -10048,8 +9709,6 @@ }, "ajv-keywords": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", "dev": true, "requires": { "fast-deep-equal": "^3.1.3" @@ -10057,14 +9716,10 @@ }, "json-schema-traverse": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, "schema-utils": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", @@ -10077,8 +9732,6 @@ }, "css-select": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", "dev": true, "requires": { "boolbase": "^1.0.0", @@ -10090,8 +9743,6 @@ }, "css-tree": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", - "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", "dev": true, "requires": { "mdn-data": "2.0.14", @@ -10100,8 +9751,6 @@ }, "css-vendor": { "version": "2.0.8", - "resolved": "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz", - "integrity": "sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==", "requires": { "@babel/runtime": "^7.8.3", "is-in-browser": "^1.0.2" @@ -10109,58 +9758,56 @@ }, "css-what": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", "dev": true }, "cssesc": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true }, "cssnano": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.9.tgz", - "integrity": "sha512-hctQHIIeDrfMjq0bQhoVmRVaSeNNOGxkvkKVOcKpJzLr09wlRrZWH4GaYudp0aszpW8wJeaO5/yBmID9n7DNCg==", + "version": "5.1.12", "dev": true, "requires": { - "cssnano-preset-default": "^5.2.9", + "cssnano-preset-default": "^5.2.12", "lilconfig": "^2.0.3", "yaml": "^1.10.2" + }, + "dependencies": { + "yaml": { + "version": "1.10.2", + "dev": true + } } }, "cssnano-preset-default": { - "version": "5.2.9", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.9.tgz", - "integrity": "sha512-/4qcQcAfFEg+gnXE5NxKmYJ9JcT+8S5SDuJCLYMDN8sM/ymZ+lgLXq5+ohx/7V2brUCkgW2OaoCzOdAN0zvhGw==", + "version": "5.2.12", "dev": true, "requires": { - "css-declaration-sorter": "^6.2.2", + "css-declaration-sorter": "^6.3.0", "cssnano-utils": "^3.1.0", "postcss-calc": "^8.2.3", "postcss-colormin": "^5.3.0", - "postcss-convert-values": "^5.1.1", - "postcss-discard-comments": "^5.1.1", + "postcss-convert-values": "^5.1.2", + "postcss-discard-comments": "^5.1.2", "postcss-discard-duplicates": "^5.1.0", "postcss-discard-empty": "^5.1.1", "postcss-discard-overridden": "^5.1.0", - "postcss-merge-longhand": "^5.1.5", - "postcss-merge-rules": "^5.1.1", + "postcss-merge-longhand": "^5.1.6", + "postcss-merge-rules": "^5.1.2", "postcss-minify-font-values": "^5.1.0", "postcss-minify-gradients": "^5.1.1", "postcss-minify-params": "^5.1.3", - "postcss-minify-selectors": "^5.2.0", + "postcss-minify-selectors": "^5.2.1", "postcss-normalize-charset": "^5.1.0", "postcss-normalize-display-values": "^5.1.0", - "postcss-normalize-positions": "^5.1.0", - "postcss-normalize-repeat-style": "^5.1.0", + "postcss-normalize-positions": "^5.1.1", + "postcss-normalize-repeat-style": "^5.1.1", "postcss-normalize-string": "^5.1.0", "postcss-normalize-timing-functions": "^5.1.0", "postcss-normalize-unicode": "^5.1.0", "postcss-normalize-url": "^5.1.0", "postcss-normalize-whitespace": "^5.1.1", - "postcss-ordered-values": "^5.1.1", + "postcss-ordered-values": "^5.1.3", "postcss-reduce-initial": "^5.1.0", "postcss-reduce-transforms": "^5.1.0", "postcss-svgo": "^5.1.0", @@ -10169,43 +9816,35 @@ }, "cssnano-utils": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", - "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", "dev": true, "requires": {} }, "csso": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", - "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", "dev": true, "requires": { "css-tree": "^1.1.2" } }, "csstype": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz", - "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==" + "version": "3.1.0" + }, + "cyclist": { + "version": "1.0.1", + "dev": true }, "debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "requires": { "ms": "2.1.2" } }, "debuglog": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz", - "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=", "dev": true }, "define-properties": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz", - "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==", "dev": true, "requires": { "has-property-descriptors": "^1.0.0", @@ -10213,14 +9852,10 @@ } }, "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==" + "version": "1.0.0" }, "dezalgo": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", - "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", "dev": true, "requires": { "asap": "^2.0.0", @@ -10229,14 +9864,10 @@ }, "diff": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true }, "dom-helpers": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", - "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", "requires": { "@babel/runtime": "^7.8.7", "csstype": "^3.0.2" @@ -10244,8 +9875,6 @@ }, "dom-serializer": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", "dev": true, "requires": { "domelementtype": "^2.0.1", @@ -10255,14 +9884,10 @@ }, "domelementtype": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "dev": true }, "domhandler": { "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", "dev": true, "requires": { "domelementtype": "^2.2.0" @@ -10270,8 +9895,6 @@ }, "domutils": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", "dev": true, "requires": { "dom-serializer": "^1.0.1", @@ -10279,21 +9902,32 @@ "domhandler": "^4.2.0" } }, + "duplexify": { + "version": "3.7.1", + "dev": true, + "requires": { + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" + } + }, "electron-to-chromium": { - "version": "1.4.139", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.139.tgz", - "integrity": "sha512-lYxzcUCjWxxVug+A7UxBCUiVr13TCjfZFYJS9Lq1VpU/ErwV4a6zUQo9dfojuGpw/L/x9REGuBl6ICQPGgbs3g==" + "version": "1.4.184" }, "emojis-list": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", "dev": true }, + "end-of-stream": { + "version": "1.4.4", + "dev": true, + "requires": { + "once": "^1.4.0" + } + }, "enhanced-resolve": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz", - "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==", + "version": "5.10.0", "dev": true, "requires": { "graceful-fs": "^4.2.4", @@ -10302,59 +9936,48 @@ }, "entities": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", "dev": true }, "envinfo": { "version": "7.8.1", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz", - "integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==", "dev": true }, + "errno": { + "version": "0.1.8", + "dev": true, + "requires": { + "prr": "~1.0.1" + } + }, "error-ex": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "requires": { "is-arrayish": "^0.2.1" } }, "es-module-lexer": { "version": "0.9.3", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz", - "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==", "dev": true }, "es6-promise": { "version": "4.2.8", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", "dev": true }, "es6-promisify": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", - "integrity": "sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==", "dev": true, "requires": { "es6-promise": "^4.0.3" } }, "escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + "version": "3.1.1" }, "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "version": "1.0.5" }, "eslint-scope": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { "esrecurse": "^4.3.0", @@ -10363,14 +9986,10 @@ }, "esprima": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, "esrecurse": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, "requires": { "estraverse": "^5.2.0" @@ -10378,77 +9997,46 @@ "dependencies": { "estraverse": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true } } }, "estraverse": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true }, "esutils": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, "events": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true }, - "execa": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", - "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.3", - "get-stream": "^6.0.0", - "human-signals": "^2.1.0", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.1", - "onetime": "^5.1.2", - "signal-exit": "^3.0.3", - "strip-final-newline": "^2.0.0" - } - }, "fast-deep-equal": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, "fast-json-stable-stringify": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, "fastest-levenshtein": { "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", - "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==", "dev": true }, "fault": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz", - "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==", "requires": { "format": "^0.2.0" } }, + "figgy-pudding": { + "version": "3.5.2", + "dev": true + }, "file-loader": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz", - "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==", "dev": true, "requires": { "loader-utils": "^2.0.0", @@ -10457,8 +10045,6 @@ "dependencies": { "schema-utils": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", @@ -10470,8 +10056,6 @@ }, "fill-range": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, "requires": { "to-regex-range": "^5.0.1" @@ -10479,8 +10063,6 @@ }, "find-cache-dir": { "version": "3.3.2", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", - "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", "dev": true, "requires": { "commondir": "^1.0.1", @@ -10489,29 +10071,29 @@ } }, "find-root": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", - "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" + "version": "1.1.0" }, "find-up": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" } }, + "flush-write-stream": { + "version": "1.1.1", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" + } + }, "follow-redirects": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz", - "integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==" + "version": "1.15.1" }, "form-data": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -10519,54 +10101,47 @@ } }, "format": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz", - "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==" + "version": "0.2.2" + }, + "from2": { + "version": "2.3.0", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" + } + }, + "fs-write-stream-atomic": { + "version": "1.0.10", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "iferr": "^0.1.5", + "imurmurhash": "^0.1.4", + "readable-stream": "1 || 2" + } }, "fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, - "optional": true - }, "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "version": "1.1.1" }, "gensync": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" + "version": "1.0.0-beta.2" }, "get-intrinsic": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", - "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", + "version": "1.1.2", "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.1" + "has-symbols": "^1.0.3" } }, - "get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "dev": true - }, "glob": { "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -10579,8 +10154,6 @@ }, "glob-parent": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, "requires": { "is-glob": "^4.0.1" @@ -10588,19 +10161,13 @@ }, "glob-to-regexp": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", "dev": true }, "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + "version": "11.12.0" }, "googlers-tools": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/googlers-tools/-/googlers-tools-1.1.7.tgz", - "integrity": "sha512-tbrYhRWBEKV0owsrMqadXogVOVd1atFd/rl6bjoqwLJHwRuil9J02u4kSIQ+weAzJa24IpAHeblpr3JIaZKIsQ==", + "version": "1.2.7", "requires": { "react": "^18.2.0", "react-console": "^1.0.0-rc.2", @@ -10609,33 +10176,24 @@ }, "graceful-fs": { "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, "growl": { "version": "1.10.5", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", - "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true }, "has": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "requires": { "function-bind": "^1.1.1" } }, "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + "version": "4.0.0", + "dev": true }, "has-property-descriptors": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", "dev": true, "requires": { "get-intrinsic": "^1.1.1" @@ -10643,78 +10201,45 @@ }, "has-symbols": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true }, "hast-util-parse-selector": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz", - "integrity": "sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==" + "version": "2.2.5" }, "hastscript": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz", - "integrity": "sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==", "requires": { "@types/hast": "^2.0.0", "comma-separated-tokens": "^1.0.0", "hast-util-parse-selector": "^2.0.0", "property-information": "^5.0.0", "space-separated-tokens": "^1.0.0" - }, - "dependencies": { - "comma-separated-tokens": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz", - "integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==" - }, - "property-information": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz", - "integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==", - "requires": { - "xtend": "^4.0.0" - } - }, - "space-separated-tokens": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz", - "integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA==" - } } }, "he": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha512-z/GDPjlRMNOa2XJiB4em8wJpuuBfrFOlYKTZxtpkdr1uPdibHI8rYA3MY0KDObpVyaes0e/aunid/t88ZI2EKA==", "dev": true }, + "highlight.js": { + "version": "11.6.0" + }, "hoist-non-react-statics": { "version": "3.3.2", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", - "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", "requires": { "react-is": "^16.7.0" }, "dependencies": { "react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "version": "16.13.1" } } }, "hosted-git-info": { "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true }, "http-proxy-agent": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, "requires": { "@tootallnate/once": "1", @@ -10724,42 +10249,30 @@ }, "https-proxy-agent": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", "dev": true, "requires": { "agent-base": "6", "debug": "4" } }, - "human-signals": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", - "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true - }, "hyphenate-style-name": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz", - "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==" + "version": "1.0.4" }, "icss-utils": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", "dev": true, "requires": {} }, + "iferr": { + "version": "0.1.5", + "dev": true + }, "immutable": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz", - "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==", "dev": true }, "import-fresh": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -10767,18 +10280,22 @@ }, "import-local": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", "dev": true, "requires": { "pkg-dir": "^4.2.0", "resolve-cwd": "^3.0.0" } }, + "imurmurhash": { + "version": "0.1.4", + "dev": true + }, + "infer-owner": { + "version": "1.0.4", + "dev": true + }, "inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { "once": "^1.3.0", @@ -10787,39 +10304,27 @@ }, "inherits": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, "interpret": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", - "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", "dev": true }, "is-alphabetical": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz", - "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==" + "version": "1.0.4" }, "is-alphanumerical": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz", - "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==", "requires": { "is-alphabetical": "^1.0.0", "is-decimal": "^1.0.0" } }, "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + "version": "0.2.1" }, "is-binary-path": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, "requires": { "binary-extensions": "^2.0.0" @@ -10827,118 +10332,75 @@ }, "is-core-module": { "version": "2.9.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", - "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", "requires": { "has": "^1.0.3" } }, "is-decimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz", - "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==" + "version": "1.0.4" }, "is-extglob": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, "is-glob": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, "requires": { "is-extglob": "^2.1.1" } }, "is-hexadecimal": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz", - "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==" + "version": "1.0.4" }, "is-in-browser": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz", - "integrity": "sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=" + "version": "1.1.3" }, "is-number": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true }, "is-plain-object": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { "isobject": "^3.0.1" } }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "is-wsl": { + "version": "1.1.0", + "dev": true + }, + "isarray": { + "version": "1.0.0", "dev": true }, "isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, "isobject": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, "javascript-stringify": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz", - "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==", "dev": true }, "jest-worker": { "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", "dev": true, "requires": { "@types/node": "*", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" - }, - "dependencies": { - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } } }, "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "version": "4.0.0" }, "js-yaml": { "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", "dev": true, "requires": { "argparse": "^1.0.7", @@ -10947,8 +10409,6 @@ }, "js-yaml-loader": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/js-yaml-loader/-/js-yaml-loader-1.2.2.tgz", - "integrity": "sha512-H+NeuNrG6uOs/WMjna2SjkaCw13rMWiT/D7l9+9x5n8aq88BDsh2sRmdfxckWPIHtViYHWRG6XiCKYvS1dfyLg==", "dev": true, "requires": { "js-yaml": "^3.13.1", @@ -10958,8 +10418,6 @@ "dependencies": { "json5": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "requires": { "minimist": "^1.2.0" @@ -10967,8 +10425,6 @@ }, "loader-utils": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", "dev": true, "requires": { "big.js": "^5.2.2", @@ -10979,30 +10435,20 @@ } }, "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" + "version": "2.5.2" }, "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" + "version": "2.3.1" }, "json-schema-traverse": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, "json5": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", - "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==" + "version": "2.2.1" }, "jss": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss/-/jss-10.9.0.tgz", - "integrity": "sha512-YpzpreB6kUunQBbrlArlsMpXYyndt9JATbt95tajx0t4MTJJcCJdd4hdNpHmOIDiUJrF/oX5wtVFrS3uofWfGw==", "requires": { "@babel/runtime": "^7.3.1", "csstype": "^3.0.2", @@ -11012,8 +10458,6 @@ }, "jss-plugin-camel-case": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.0.tgz", - "integrity": "sha512-UH6uPpnDk413/r/2Olmw4+y54yEF2lRIV8XIZyuYpgPYTITLlPOsq6XB9qeqv+75SQSg3KLocq5jUBXW8qWWww==", "requires": { "@babel/runtime": "^7.3.1", "hyphenate-style-name": "^1.0.3", @@ -11022,8 +10466,6 @@ }, "jss-plugin-compose": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-compose/-/jss-plugin-compose-10.9.0.tgz", - "integrity": "sha512-Q/0FEZhDwGUpf3/b7+PspmMi6MVSlN3YlTDmvrft7I6N346jUpd8MYkYP/6qM1ZMuVj4v8ky/XYqr1v2ganLLg==", "requires": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -11032,8 +10474,6 @@ }, "jss-plugin-default-unit": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.9.0.tgz", - "integrity": "sha512-7Ju4Q9wJ/MZPsxfu4T84mzdn7pLHWeqoGd/D8O3eDNNJ93Xc8PxnLmV8s8ZPNRYkLdxZqKtm1nPQ0BM4JRlq2w==", "requires": { "@babel/runtime": "^7.3.1", "jss": "10.9.0" @@ -11041,8 +10481,6 @@ }, "jss-plugin-expand": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-expand/-/jss-plugin-expand-10.9.0.tgz", - "integrity": "sha512-QfZ9jld0HpF1OiYU7cGWQ4q+f6+Wu93mV4X+cA1iVRssiUbSbygwdfZkUwX23UOhS1WWRJeQlLK1aJC94K8/0A==", "requires": { "@babel/runtime": "^7.3.1", "jss": "10.9.0" @@ -11050,8 +10488,6 @@ }, "jss-plugin-extend": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-extend/-/jss-plugin-extend-10.9.0.tgz", - "integrity": "sha512-xvmosUh3RsKVsm9L14ml6PL3i0Ejj5gB6eo/jTMkGW1kIy42gNXV1EthR8cD5xiowWstnvugQ3JF0pI5+QkPMg==", "requires": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -11060,8 +10496,6 @@ }, "jss-plugin-global": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.9.0.tgz", - "integrity": "sha512-4G8PHNJ0x6nwAFsEzcuVDiBlyMsj2y3VjmFAx/uHk/R/gzJV+yRHICjT4MKGGu1cJq2hfowFWCyrr/Gg37FbgQ==", "requires": { "@babel/runtime": "^7.3.1", "jss": "10.9.0" @@ -11069,8 +10503,6 @@ }, "jss-plugin-nested": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.9.0.tgz", - "integrity": "sha512-2UJnDrfCZpMYcpPYR16oZB7VAC6b/1QLsRiAutOt7wJaaqwCBvNsosLEu/fUyKNQNGdvg2PPJFDO5AX7dwxtoA==", "requires": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -11079,8 +10511,6 @@ }, "jss-plugin-props-sort": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.9.0.tgz", - "integrity": "sha512-7A76HI8bzwqrsMOJTWKx/uD5v+U8piLnp5bvru7g/3ZEQOu1+PjHvv7bFdNO3DwNPC9oM0a//KwIJsIcDCjDzw==", "requires": { "@babel/runtime": "^7.3.1", "jss": "10.9.0" @@ -11088,8 +10518,6 @@ }, "jss-plugin-rule-value-function": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.9.0.tgz", - "integrity": "sha512-IHJv6YrEf8pRzkY207cPmdbBstBaE+z8pazhPShfz0tZSDtRdQua5jjg6NMz3IbTasVx9FdnmptxPqSWL5tyJg==", "requires": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -11098,8 +10526,6 @@ }, "jss-plugin-rule-value-observable": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-rule-value-observable/-/jss-plugin-rule-value-observable-10.9.0.tgz", - "integrity": "sha512-/MWVPJVEn41+ofzQdsvH1GR4wusDqFqNnchh/98HVc580MxPy4NVkmUa2SAEpbHhnJ93sCoETZccW3HJKuvH4A==", "requires": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -11108,8 +10534,6 @@ }, "jss-plugin-template": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-template/-/jss-plugin-template-10.9.0.tgz", - "integrity": "sha512-lxThUvdt0drCi7xhuJWxADWTgLLy1IWCeFO5k+dtba900xJsNg0IGZplpP9w9UpaJsYS3WUwWMXw8Sxn1dobfQ==", "requires": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -11118,8 +10542,6 @@ }, "jss-plugin-vendor-prefixer": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.9.0.tgz", - "integrity": "sha512-MbvsaXP7iiVdYVSEoi+blrW+AYnTDvHTW6I6zqi7JcwXdc6I9Kbm234nEblayhF38EftoenbM+5218pidmC5gA==", "requires": { "@babel/runtime": "^7.3.1", "css-vendor": "^2.0.8", @@ -11128,8 +10550,6 @@ }, "jss-preset-default": { "version": "10.9.0", - "resolved": "https://registry.npmjs.org/jss-preset-default/-/jss-preset-default-10.9.0.tgz", - "integrity": "sha512-Zdsj+R+UTn7OOJ1TFQi+l8PfEL7APSAM6vRPaU8mJywT8OrMjgslMKckFLrgq1k+qk1hJR1ePAMesvZ5aAXGOQ==", "requires": { "@babel/runtime": "^7.3.1", "jss": "10.9.0", @@ -11149,20 +10569,14 @@ }, "kind-of": { "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, "klona": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz", - "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==", "dev": true }, "license-checker": { "version": "25.0.1", - "resolved": "https://registry.npmjs.org/license-checker/-/license-checker-25.0.1.tgz", - "integrity": "sha512-mET5AIwl7MR2IAKYYoVBBpV0OnkKQ1xGj2IMMeEFIs42QAkEVjRtFZGWmQ28WeU7MP779iAgOaOy93Mn44mn6g==", "dev": true, "requires": { "chalk": "^2.4.1", @@ -11179,42 +10593,34 @@ "dependencies": { "debug": { "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { "ms": "^2.1.1" } }, + "ms": { + "version": "2.1.3", + "dev": true + }, "semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true } } }, "lilconfig": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz", - "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==", "dev": true }, "lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" + "version": "1.2.4" }, "loader-runner": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", "dev": true }, "loader-utils": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", "dev": true, "requires": { "big.js": "^5.2.2", @@ -11223,14 +10629,10 @@ } }, "localized-strings": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/localized-strings/-/localized-strings-0.2.4.tgz", - "integrity": "sha512-TKDhqFPkIIN/if2FSvVVZTaM/GP9TzfgdQ2uY65mr32xgFu5nqkKXprXbzy5rfx32DF5LDvS/y1UqYF/mAscYA==" + "version": "0.2.4" }, "locate-path": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { "p-locate": "^4.1.0" @@ -11238,56 +10640,36 @@ }, "lodash.debounce": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, "lodash.memoize": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true - }, - "lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", "dev": true }, "lodash.uniq": { "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", "dev": true }, "loose-envify": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "requires": { "js-tokens": "^3.0.0 || ^4.0.0" } }, "lowlight": { "version": "1.20.0", - "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz", - "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==", "requires": { "fault": "^1.0.0", "highlight.js": "~10.7.0" }, "dependencies": { "highlight.js": { - "version": "10.7.3", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", - "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==" + "version": "10.7.3" } } }, "lru-cache": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { "yallist": "^4.0.0" @@ -11295,8 +10677,6 @@ }, "make-dir": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { "semver": "^6.0.0" @@ -11304,44 +10684,34 @@ }, "make-error": { "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", "dev": true }, + "markdown-to-jsx": { + "version": "7.1.7", + "requires": {} + }, "marked": { - "version": "4.0.17", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.17.tgz", - "integrity": "sha512-Wfk0ATOK5iPxM4ptrORkFemqroz0ZDxp5MWfYA7H/F+wO17NRWV5Ypxi6p3g2Xmw2bKeiYOl6oVnLHKxBA0VhA==" + "version": "4.0.17" }, "marked-react": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/marked-react/-/marked-react-1.1.2.tgz", - "integrity": "sha512-GeeAB5iIH4FaSxoQn/pb9iXn1/1Go5Jpa9ZTtNHFRcZ6vpfYOhgWakFMK9fCfvUIHNMa1uh6MHcefgW1Ss5yKw==", "requires": { "marked": "^4.0.12" } }, "material-icons": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/material-icons/-/material-icons-1.11.0.tgz", - "integrity": "sha512-t2PNjdF36nFzt82domIwhBm3JCfuEo2EMTiJzb5K1cUR3Sg1aEtcZrkecLHtB26eohtgqvndewL8Zy4cu9DIfg==" + "version": "1.11.4" }, "mdn-data": { "version": "2.0.14", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", - "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", "dev": true }, "merge-stream": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, "micromatch": { "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, "requires": { "braces": "^3.0.2", @@ -11349,28 +10719,16 @@ } }, "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==" + "version": "1.52.0" }, "mime-types": { "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "requires": { "mime-db": "1.52.0" } }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, "mini-css-extract-plugin": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.0.tgz", - "integrity": "sha512-ndG8nxCEnAemsg4FSgS+yNyHKgkTB4nPKqCOgh65j3/30qqC5RaSQQXMm++Y6sb6E1zRSxPkztj9fqxhS1Eo6w==", + "version": "2.6.1", "dev": true, "requires": { "schema-utils": "^4.0.0" @@ -11378,8 +10736,6 @@ "dependencies": { "ajv": { "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -11390,8 +10746,6 @@ }, "ajv-keywords": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", "dev": true, "requires": { "fast-deep-equal": "^3.1.3" @@ -11399,14 +10753,10 @@ }, "json-schema-traverse": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true }, "schema-utils": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz", - "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", @@ -11419,8 +10769,6 @@ }, "minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -11428,14 +10776,26 @@ }, "minimist": { "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, + "mississippi": { + "version": "3.0.0", + "dev": true, + "requires": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + } + }, "mkdirp": { "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dev": true, "requires": { "minimist": "^1.2.6" @@ -11443,8 +10803,6 @@ }, "mocha": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", - "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", "dev": true, "requires": { "browser-stdout": "1.3.1", @@ -11462,14 +10820,10 @@ "dependencies": { "commander": { "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", "dev": true }, "debug": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { "ms": "2.0.0" @@ -11477,14 +10831,10 @@ }, "diff": { "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "dev": true }, "glob": { "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -11493,12 +10843,23 @@ "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" + }, + "dependencies": { + "minimatch": { + "version": "3.0.8", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + } } }, + "has-flag": { + "version": "3.0.0", + "dev": true + }, "minimatch": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -11506,14 +10867,10 @@ }, "minimist": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==", "dev": true }, "mkdirp": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==", "dev": true, "requires": { "minimist": "0.0.8" @@ -11521,14 +10878,10 @@ }, "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true }, "supports-color": { "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { "has-flag": "^3.0.0" @@ -11536,32 +10889,34 @@ } } }, + "move-concurrently": { + "version": "1.0.1", + "dev": true, + "requires": { + "aproba": "^1.1.1", + "copy-concurrently": "^1.0.0", + "fs-write-stream-atomic": "^1.0.8", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.3" + } + }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + "version": "2.1.2" }, "nanoid": { "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", "dev": true }, "neo-async": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, "node-releases": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz", - "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==" + "version": "2.0.6" }, "nopt": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz", - "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==", "dev": true, "requires": { "abbrev": "1", @@ -11570,8 +10925,6 @@ }, "normalize-package-data": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, "requires": { "hosted-git-info": "^2.1.4", @@ -11582,63 +10935,38 @@ "dependencies": { "semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true } } }, "normalize-path": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, "normalize-url": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", "dev": true }, "npm-normalize-package-bin": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", - "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", "dev": true }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, "nth-check": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", "dev": true, "requires": { "boolbase": "^1.0.0" } }, "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "version": "4.1.1" }, "object-keys": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true }, "object.assign": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", - "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", "dev": true, "requires": { "call-bind": "^1.0.0", @@ -11649,43 +10977,24 @@ }, "once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { "wrappy": "1" } }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, "onsenui": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/onsenui/-/onsenui-2.12.1.tgz", - "integrity": "sha512-04XpmNFhQEek2qHcISVKd34+El5DfyLd40xiHejmhzFxgJDhJLSySJxYvOrLcgBqlrSEWnqCxLd54Jy8YRCIbA==" + "version": "2.12.1" }, "os-homedir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, "os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, "osenv": { "version": "0.1.5", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "requires": { "os-homedir": "^1.0.0", @@ -11694,8 +11003,6 @@ }, "p-limit": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -11703,8 +11010,6 @@ }, "p-locate": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { "p-limit": "^2.2.0" @@ -11712,22 +11017,25 @@ }, "p-try": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, + "parallel-transform": { + "version": "1.2.0", + "dev": true, + "requires": { + "cyclist": "^1.0.1", + "inherits": "^2.0.3", + "readable-stream": "^2.1.5" + } + }, "parent-module": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "requires": { "callsites": "^3.0.0" } }, "parse-entities": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz", - "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==", "requires": { "character-entities": "^1.0.0", "character-entities-legacy": "^1.0.0", @@ -11735,19 +11043,10 @@ "is-alphanumerical": "^1.0.0", "is-decimal": "^1.0.0", "is-hexadecimal": "^1.0.0" - }, - "dependencies": { - "character-entities": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz", - "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==" - } } }, "parse-json": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "requires": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -11757,47 +11056,35 @@ }, "path-exists": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, "path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, "path-key": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true }, "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + "version": "1.0.7" }, "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" + "version": "4.0.0" }, "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + "version": "1.0.0" }, "picomatch": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true + }, + "pify": { + "version": "4.0.1", "dev": true }, "pkg-dir": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { "find-up": "^4.0.0" @@ -11805,8 +11092,6 @@ }, "postcss": { "version": "8.4.14", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz", - "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==", "dev": true, "requires": { "nanoid": "^3.3.4", @@ -11816,8 +11101,6 @@ }, "postcss-calc": { "version": "8.2.4", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz", - "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==", "dev": true, "requires": { "postcss-selector-parser": "^6.0.9", @@ -11826,8 +11109,6 @@ }, "postcss-colormin": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz", - "integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==", "dev": true, "requires": { "browserslist": "^4.16.6", @@ -11837,9 +11118,7 @@ } }, "postcss-convert-values": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.1.tgz", - "integrity": "sha512-UjcYfl3wJJdcabGKk8lgetPvhi1Et7VDc3sYr9EyhNBeB00YD4vHgPBp+oMVoG/dDWCc6ASbmzPNV6jADTwh8Q==", + "version": "5.1.2", "dev": true, "requires": { "browserslist": "^4.20.3", @@ -11847,37 +11126,27 @@ } }, "postcss-discard-comments": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz", - "integrity": "sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==", + "version": "5.1.2", "dev": true, "requires": {} }, "postcss-discard-duplicates": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", - "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", "dev": true, "requires": {} }, "postcss-discard-empty": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", - "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", "dev": true, "requires": {} }, "postcss-discard-overridden": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", - "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", "dev": true, "requires": {} }, "postcss-loader": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.0.tgz", - "integrity": "sha512-IDyttebFzTSY6DI24KuHUcBjbAev1i+RyICoPEWcAstZsj03r533uMXtDn506l6/wlsRYiS5XBdx7TpccCsyUg==", "dev": true, "requires": { "cosmiconfig": "^7.0.0", @@ -11887,8 +11156,6 @@ "dependencies": { "semver": { "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -11897,9 +11164,7 @@ } }, "postcss-merge-longhand": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.5.tgz", - "integrity": "sha512-NOG1grw9wIO+60arKa2YYsrbgvP6tp+jqc7+ZD5/MalIw234ooH2C6KlR6FEn4yle7GqZoBxSK1mLBE9KPur6w==", + "version": "5.1.6", "dev": true, "requires": { "postcss-value-parser": "^4.2.0", @@ -11907,9 +11172,7 @@ } }, "postcss-merge-rules": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz", - "integrity": "sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww==", + "version": "5.1.2", "dev": true, "requires": { "browserslist": "^4.16.6", @@ -11920,8 +11183,6 @@ }, "postcss-minify-font-values": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz", - "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" @@ -11929,8 +11190,6 @@ }, "postcss-minify-gradients": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz", - "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==", "dev": true, "requires": { "colord": "^2.9.1", @@ -11940,8 +11199,6 @@ }, "postcss-minify-params": { "version": "5.1.3", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz", - "integrity": "sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg==", "dev": true, "requires": { "browserslist": "^4.16.6", @@ -11950,9 +11207,7 @@ } }, "postcss-minify-selectors": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz", - "integrity": "sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==", + "version": "5.2.1", "dev": true, "requires": { "postcss-selector-parser": "^6.0.5" @@ -11960,15 +11215,11 @@ }, "postcss-modules-extract-imports": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", - "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", "dev": true, "requires": {} }, "postcss-modules-local-by-default": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz", - "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==", "dev": true, "requires": { "icss-utils": "^5.0.0", @@ -11978,8 +11229,6 @@ }, "postcss-modules-scope": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz", - "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==", "dev": true, "requires": { "postcss-selector-parser": "^6.0.4" @@ -11987,8 +11236,6 @@ }, "postcss-modules-values": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", - "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", "dev": true, "requires": { "icss-utils": "^5.0.0" @@ -11996,33 +11243,25 @@ }, "postcss-normalize-charset": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", - "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", "dev": true, "requires": {} }, "postcss-normalize-display-values": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz", - "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-normalize-positions": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz", - "integrity": "sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==", + "version": "5.1.1", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-normalize-repeat-style": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz", - "integrity": "sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==", + "version": "5.1.1", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" @@ -12030,8 +11269,6 @@ }, "postcss-normalize-string": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz", - "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" @@ -12039,8 +11276,6 @@ }, "postcss-normalize-timing-functions": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz", - "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" @@ -12048,8 +11283,6 @@ }, "postcss-normalize-unicode": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz", - "integrity": "sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==", "dev": true, "requires": { "browserslist": "^4.16.6", @@ -12058,8 +11291,6 @@ }, "postcss-normalize-url": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz", - "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==", "dev": true, "requires": { "normalize-url": "^6.0.1", @@ -12068,17 +11299,13 @@ }, "postcss-normalize-whitespace": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz", - "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" } }, "postcss-ordered-values": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz", - "integrity": "sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw==", + "version": "5.1.3", "dev": true, "requires": { "cssnano-utils": "^3.1.0", @@ -12087,8 +11314,6 @@ }, "postcss-reduce-initial": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz", - "integrity": "sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==", "dev": true, "requires": { "browserslist": "^4.16.6", @@ -12097,8 +11322,6 @@ }, "postcss-reduce-transforms": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz", - "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0" @@ -12106,8 +11329,6 @@ }, "postcss-selector-parser": { "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", "dev": true, "requires": { "cssesc": "^3.0.0", @@ -12116,8 +11337,6 @@ }, "postcss-svgo": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz", - "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==", "dev": true, "requires": { "postcss-value-parser": "^4.2.0", @@ -12126,8 +11345,6 @@ }, "postcss-unique-selectors": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz", - "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==", "dev": true, "requires": { "postcss-selector-parser": "^6.0.5" @@ -12135,19 +11352,21 @@ }, "postcss-value-parser": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "dev": true }, "prismjs": { - "version": "1.28.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.28.0.tgz", - "integrity": "sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw==" + "version": "1.28.0" + }, + "process-nextick-args": { + "version": "2.0.1", + "dev": true + }, + "promise-inflight": { + "version": "1.0.1", + "dev": true }, "prop-types": { "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "requires": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -12155,105 +11374,134 @@ }, "dependencies": { "react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "version": "16.13.1" + } + } + }, + "property-information": { + "version": "5.6.0", + "requires": { + "xtend": "^4.0.0" + } + }, + "prr": { + "version": "1.0.1", + "dev": true + }, + "pump": { + "version": "3.0.0", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "pumpify": { + "version": "1.5.1", + "dev": true, + "requires": { + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" + }, + "dependencies": { + "pump": { + "version": "2.0.1", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } } } }, "punycode": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, "randombytes": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, "requires": { "safe-buffer": "^5.1.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "dev": true + } } }, "react": { "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", "requires": { "loose-envify": "^1.1.0" } }, "react-console": { "version": "1.0.0-rc.2", - "resolved": "https://registry.npmjs.org/react-console/-/react-console-1.0.0-rc.2.tgz", - "integrity": "sha512-3fxT5x07GImC+1DOGtn8FBwwBgdNrp+HWbVBBcVe/iC5ilFEZWQm2lY8jh+2SYWiJ74TrTSQy909ouGzzeTOYg==", "requires": { "react-is": "^16.13.1", "react-reconciler": "^0.25.1" }, "dependencies": { "react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" - }, - "react-reconciler": { - "version": "0.25.1", - "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.25.1.tgz", - "integrity": "sha512-R5UwsIvRcSs3w8n9k3tBoTtUHdVhu9u84EG7E5M0Jk9F5i6DA1pQzPfUZd6opYWGy56MJOtV3VADzy6DRwYDjw==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.19.1" - } - }, - "scheduler": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", - "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1" - } + "version": "16.13.1" } } }, "react-device-detect": { "version": "2.2.2", - "resolved": "https://registry.npmjs.org/react-device-detect/-/react-device-detect-2.2.2.tgz", - "integrity": "sha512-zSN1gIAztUekp5qUT/ybHwQ9fmOqVT1psxpSlTn1pe0CO+fnJHKRLOWWac5nKxOxvOpD/w84hk1I+EydrJp7SA==", "requires": { "ua-parser-js": "^1.0.2" } }, "react-dom": { "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", "requires": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" } }, "react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" + "version": "17.0.2" }, "react-onsenui": { "version": "1.12.0", - "resolved": "https://registry.npmjs.org/react-onsenui/-/react-onsenui-1.12.0.tgz", - "integrity": "sha512-qRYN+fwudZyaujKHecuohpyBpNCX2IB1gE/9A+FDd+YS+/TwXFC+0NA2IFkwYRYnetqAu3QxJanI/AUB1pq9UQ==", "requires": { "prop-types": "^15.6.0" } }, + "react-onsenuix": { + "version": "1.0.6", + "requires": { + "googlers-tools": "^1.2.1", + "jss": "^10.9.0", + "jss-preset-default": "^10.9.0", + "onsenui": "^2.12.1", + "react": "^18.2.0" + } + }, + "react-reconciler": { + "version": "0.25.1", + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.19.1" + }, + "dependencies": { + "scheduler": { + "version": "0.19.1", + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + } + } + }, "react-syntax-highlighter": { "version": "15.5.0", - "resolved": "https://registry.npmjs.org/react-syntax-highlighter/-/react-syntax-highlighter-15.5.0.tgz", - "integrity": "sha512-+zq2myprEnQmH5yw6Gqc8lD55QHnpKaU8TOcFeC/Lg/MQSs8UknEA0JC4nTZGFAXC2J2Hyj/ijJ7NlabyPi2gg==", "requires": { "@babel/runtime": "^7.3.1", "highlight.js": "^10.4.1", @@ -12263,16 +11511,12 @@ }, "dependencies": { "highlight.js": { - "version": "10.7.3", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", - "integrity": "sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==" + "version": "10.7.3" } } }, "react-transition-group": { "version": "4.4.2", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz", - "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==", "requires": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -12282,8 +11526,6 @@ }, "read-installed": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz", - "integrity": "sha1-/5uLZ/GH0eTCm5/rMfayI6zRkGc=", "dev": true, "requires": { "debuglog": "^1.0.1", @@ -12297,16 +11539,12 @@ "dependencies": { "semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true } } }, "read-package-json": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz", - "integrity": "sha512-D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==", "dev": true, "requires": { "glob": "^7.1.1", @@ -12315,10 +11553,21 @@ "npm-normalize-package-bin": "^1.0.0" } }, + "readable-stream": { + "version": "2.3.7", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, "readdir-scoped-modules": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz", - "integrity": "sha512-asaikDeqAQg7JifRsZn1NJZXo9E+VwlyCfbkZhwyISinqk5zNS6266HS5kah6P0SaQKGF6SkNnZVHUzHFYxYDw==", "dev": true, "requires": { "debuglog": "^1.0.1", @@ -12329,8 +11578,6 @@ }, "readdirp": { "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, "requires": { "picomatch": "^2.2.1" @@ -12338,8 +11585,6 @@ }, "rechoir": { "version": "0.7.1", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", - "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", "dev": true, "requires": { "resolve": "^1.9.0" @@ -12347,8 +11592,6 @@ }, "refractor": { "version": "3.6.0", - "resolved": "https://registry.npmjs.org/refractor/-/refractor-3.6.0.tgz", - "integrity": "sha512-MY9W41IOWxxk31o+YvFCNyNzdkc9M20NoZK5vq6jkv4I/uh2zkWcfudj0Q1fovjUQJrNewS9NMzeTtqPf+n5EA==", "requires": { "hastscript": "^6.0.0", "parse-entities": "^2.0.0", @@ -12356,45 +11599,33 @@ }, "dependencies": { "prismjs": { - "version": "1.27.0", - "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.27.0.tgz", - "integrity": "sha512-t13BGPUlFDR7wRB5kQDG4jjl7XeuH6jbJGt11JHPL96qwsEHNX2+68tFXqc1/k+/jALsbSWJKUOT/hcYAZ5LkA==" + "version": "1.27.0" } } }, "regenerate": { "version": "1.4.2", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", - "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", "dev": true }, "regenerate-unicode-properties": { "version": "10.0.1", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz", - "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==", "dev": true, "requires": { "regenerate": "^1.4.2" } }, "regenerator-runtime": { - "version": "0.13.9", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + "version": "0.13.9" }, "regenerator-transform": { "version": "0.15.0", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz", - "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==", "dev": true, "requires": { "@babel/runtime": "^7.8.4" } }, "regexpu-core": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz", - "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==", + "version": "5.1.0", "dev": true, "requires": { "regenerate": "^1.4.2", @@ -12407,14 +11638,10 @@ }, "regjsgen": { "version": "0.6.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz", - "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==", "dev": true }, "regjsparser": { "version": "0.8.4", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz", - "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==", "dev": true, "requires": { "jsesc": "~0.5.0" @@ -12422,32 +11649,24 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", "dev": true } } }, "require-from-string": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true }, "resolve": { - "version": "1.22.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", - "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", + "version": "1.22.1", "requires": { - "is-core-module": "^2.8.1", + "is-core-module": "^2.9.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } }, "resolve-cwd": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "dev": true, "requires": { "resolve-from": "^5.0.0" @@ -12455,26 +11674,32 @@ "dependencies": { "resolve-from": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true } } }, "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==" + "version": "4.0.0" + }, + "rimraf": { + "version": "2.7.1", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "run-queue": { + "version": "1.0.3", + "dev": true, + "requires": { + "aproba": "^1.1.1" + } }, "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "version": "5.1.2" }, "sass": { - "version": "1.52.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.1.tgz", - "integrity": "sha512-fSzYTbr7z8oQnVJ3Acp9hV80dM1fkMN7mSD/25mpcct9F7FPBMOI8krEYALgU1aZoqGhQNhTPsuSmxjnIvAm4Q==", + "version": "1.53.0", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", @@ -12484,8 +11709,6 @@ }, "sass-loader": { "version": "13.0.2", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz", - "integrity": "sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==", "dev": true, "requires": { "klona": "^2.0.4", @@ -12494,16 +11717,12 @@ }, "scheduler": { "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", "requires": { "loose-envify": "^1.1.0" } }, "schema-utils": { "version": "2.7.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", - "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", "dev": true, "requires": { "@types/json-schema": "^7.0.5", @@ -12512,14 +11731,10 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + "version": "6.3.0" }, "serialize-javascript": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", - "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", "dev": true, "requires": { "randombytes": "^2.1.0" @@ -12527,8 +11742,6 @@ }, "shallow-clone": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", - "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, "requires": { "kind-of": "^6.0.2" @@ -12536,8 +11749,6 @@ }, "shebang-command": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { "shebang-regex": "^3.0.0" @@ -12545,48 +11756,37 @@ }, "shebang-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true }, "slide": { "version": "1.1.6", - "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", - "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=", + "dev": true + }, + "source-list-map": { + "version": "2.0.1", "dev": true }, "source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, "source-map-js": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true }, "source-map-support": { "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dev": true, "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" } }, + "space-separated-tokens": { + "version": "1.1.5" + }, "spdx-compare": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/spdx-compare/-/spdx-compare-1.0.0.tgz", - "integrity": "sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==", "dev": true, "requires": { "array-find-index": "^1.0.2", @@ -12596,8 +11796,6 @@ }, "spdx-correct": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", "dev": true, "requires": { "spdx-expression-parse": "^3.0.0", @@ -12606,14 +11804,10 @@ }, "spdx-exceptions": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", "dev": true }, "spdx-expression-parse": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, "requires": { "spdx-exceptions": "^2.1.0", @@ -12622,20 +11816,14 @@ }, "spdx-license-ids": { "version": "3.0.11", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", - "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", "dev": true }, "spdx-ranges": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-2.1.1.tgz", - "integrity": "sha512-mcdpQFV7UDAgLpXEE/jOMqvK4LBoO0uTQg0uvXUewmEFhpiZx5yJSZITHB8w1ZahKdhfZqP5GPEOKLyEq5p8XA==", "dev": true }, "spdx-satisfies": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-4.0.1.tgz", - "integrity": "sha512-WVzZ/cXAzoNmjCWiEluEA3BjHp5tiUmmhn9MK+X0tBbR9sOqtC6UQwmgCNrAIZvNlMuBUYAaHYfb2oqlF9SwKA==", "dev": true, "requires": { "spdx-compare": "^1.0.0", @@ -12645,33 +11833,45 @@ }, "sprintf-js": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, + "ssri": { + "version": "6.0.2", + "dev": true, + "requires": { + "figgy-pudding": "^3.5.1" + } + }, "stable": { "version": "0.1.8", - "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", - "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", "dev": true }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "stream-each": { + "version": "1.2.3", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "stream-shift": "^1.0.0" + } + }, + "stream-shift": { + "version": "1.0.1", "dev": true }, + "string_decoder": { + "version": "1.1.1", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, "style-loader": { "version": "3.3.1", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz", - "integrity": "sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==", "dev": true, "requires": {} }, "stylehacks": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz", - "integrity": "sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==", "dev": true, "requires": { "browserslist": "^4.16.6", @@ -12679,27 +11879,20 @@ } }, "stylis": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz", - "integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==" + "version": "4.0.13" }, "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "version": "8.1.1", + "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "^4.0.0" } }, "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" + "version": "1.0.0" }, "svgo": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", - "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", "dev": true, "requires": { "@trysound/sax": "0.2.0", @@ -12712,62 +11905,41 @@ } }, "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==" + "version": "1.2.0" }, "tapable": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", "dev": true }, "terser": { - "version": "5.13.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.13.1.tgz", - "integrity": "sha512-hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA==", + "version": "5.14.1", "dev": true, "requires": { + "@jridgewell/source-map": "^0.3.2", "acorn": "^8.5.0", "commander": "^2.20.0", - "source-map": "~0.8.0-beta.0", "source-map-support": "~0.5.20" }, "dependencies": { "commander": { "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true - }, - "source-map": { - "version": "0.8.0-beta.0", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz", - "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==", - "dev": true, - "requires": { - "whatwg-url": "^7.0.0" - } } } }, "terser-webpack-plugin": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz", - "integrity": "sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==", + "version": "5.3.3", "dev": true, "requires": { + "@jridgewell/trace-mapping": "^0.3.7", "jest-worker": "^27.4.5", "schema-utils": "^3.1.1", "serialize-javascript": "^6.0.0", - "source-map": "^0.6.1", "terser": "^5.7.2" }, "dependencies": { "schema-utils": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", @@ -12777,44 +11949,33 @@ } } }, + "through2": { + "version": "2.0.5", + "dev": true, + "requires": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + }, "tiny-warning": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", - "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" + "version": "1.0.3" }, "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" + "version": "2.0.0" }, "to-regex-range": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { "is-number": "^7.0.0" } }, - "tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, "treeify": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/treeify/-/treeify-1.1.0.tgz", - "integrity": "sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==", "dev": true }, "ts-loader": { - "version": "9.3.0", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.3.0.tgz", - "integrity": "sha512-2kLLAdAD+FCKijvGKi9sS0OzoqxLCF3CxHpok7rVgCZ5UldRzH0TkbwG9XECKjBzHsAewntC5oDaI/FwKzEUog==", + "version": "9.3.1", "dev": true, "requires": { "chalk": "^4.1.0", @@ -12825,8 +11986,6 @@ "dependencies": { "ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { "color-convert": "^2.0.1" @@ -12834,8 +11993,6 @@ }, "chalk": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -12844,8 +12001,6 @@ }, "color-convert": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { "color-name": "~1.1.4" @@ -12853,20 +12008,10 @@ }, "color-name": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, "semver": { "version": "7.3.7", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", - "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -12874,8 +12019,6 @@ }, "supports-color": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { "has-flag": "^4.0.0" @@ -12884,9 +12027,7 @@ } }, "ts-node": { - "version": "10.8.0", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.8.0.tgz", - "integrity": "sha512-/fNd5Qh+zTt8Vt1KbYZjRHCE9sI5i7nqfD/dzBBRDeVXZXS6kToW6R7tTU6Nd4XavFs0mAVCg29Q//ML7WsZYA==", + "version": "10.8.2", "dev": true, "requires": { "@cspotcode/source-map-support": "^0.8.0", @@ -12904,33 +12045,119 @@ "yn": "3.1.1" } }, + "tslib": { + "version": "2.4.0", + "dev": true + }, + "typedarray": { + "version": "0.0.6", + "dev": true + }, "typescript": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz", - "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==", + "version": "4.7.4", "dev": true }, "ua-parser-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.2.tgz", - "integrity": "sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg==" + "version": "1.0.2" + }, + "uglify-js": { + "version": "3.16.2", + "dev": true + }, + "uglifyjs-webpack-plugin": { + "version": "2.2.0", + "dev": true, + "requires": { + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", + "is-wsl": "^1.1.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^1.7.0", + "source-map": "^0.6.1", + "uglify-js": "^3.6.0", + "webpack-sources": "^1.4.0", + "worker-farm": "^1.7.0" + }, + "dependencies": { + "find-cache-dir": { + "version": "2.1.0", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" + } + }, + "find-up": { + "version": "3.0.0", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "make-dir": { + "version": "2.1.0", + "dev": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + } + }, + "p-locate": { + "version": "3.0.0", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "path-exists": { + "version": "3.0.0", + "dev": true + }, + "pkg-dir": { + "version": "3.0.0", + "dev": true, + "requires": { + "find-up": "^3.0.0" + } + }, + "schema-utils": { + "version": "1.0.0", + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + }, + "semver": { + "version": "5.7.1", + "dev": true + }, + "serialize-javascript": { + "version": "1.9.1", + "dev": true + } + } }, "un-eval": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/un-eval/-/un-eval-1.2.0.tgz", - "integrity": "sha512-Wlj/pum6dQtGTPD/lclDtoVPkSfpjPfy1dwnnKw/sZP5DpBH9fLhBgQfsqNhe5/gS1D+vkZUuB771NRMUPA5CA==", "dev": true }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", - "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", "dev": true }, "unicode-match-property-ecmascript": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", - "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", "dev": true, "requires": { "unicode-canonical-property-names-ecmascript": "^2.0.0", @@ -12939,20 +12166,35 @@ }, "unicode-match-property-value-ecmascript": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", - "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==", "dev": true }, "unicode-property-aliases-ecmascript": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz", - "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==", "dev": true }, + "unique-filename": { + "version": "1.1.1", + "dev": true, + "requires": { + "unique-slug": "^2.0.0" + } + }, + "unique-slug": { + "version": "2.0.2", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4" + } + }, + "update-browserslist-db": { + "version": "1.0.4", + "requires": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + } + }, "uri-js": { "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, "requires": { "punycode": "^2.1.0" @@ -12960,8 +12202,6 @@ }, "url-loader": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz", - "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==", "dev": true, "requires": { "loader-utils": "^2.0.0", @@ -12971,8 +12211,6 @@ "dependencies": { "schema-utils": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", @@ -12984,26 +12222,18 @@ }, "util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, "util-extend": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz", - "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=", "dev": true }, "v8-compile-cache-lib": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", "dev": true }, "validate-npm-package-license": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, "requires": { "spdx-correct": "^3.0.0", @@ -13012,8 +12242,6 @@ }, "vscode": { "version": "1.1.37", - "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.37.tgz", - "integrity": "sha512-vJNj6IlN7IJPdMavlQa1KoFB3Ihn06q1AiN3ZFI/HfzPNzbKZWPPuiU+XkpNOfGU5k15m4r80nxNPlM7wcc0wg==", "dev": true, "requires": { "glob": "^7.1.2", @@ -13027,16 +12255,12 @@ "dependencies": { "semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true } } }, "vscode-test": { "version": "0.4.3", - "resolved": "https://registry.npmjs.org/vscode-test/-/vscode-test-0.4.3.tgz", - "integrity": "sha512-EkMGqBSefZH2MgW65nY05rdRSko15uvzq4VAPM5jVmwYuFQKE7eikKXNJDRxL+OITXHB6pI+a3XqqD32Y3KC5w==", "dev": true, "requires": { "http-proxy-agent": "^2.1.0", @@ -13045,8 +12269,6 @@ "dependencies": { "agent-base": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", - "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", "dev": true, "requires": { "es6-promisify": "^5.0.0" @@ -13054,8 +12276,6 @@ }, "debug": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { "ms": "2.0.0" @@ -13063,8 +12283,6 @@ }, "http-proxy-agent": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz", - "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==", "dev": true, "requires": { "agent-base": "4", @@ -13073,42 +12291,41 @@ }, "https-proxy-agent": { "version": "2.2.4", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz", - "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==", "dev": true, "requires": { "agent-base": "^4.3.0", "debug": "^3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.2.7", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.3", + "dev": true + } } }, "ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true } } }, "watchpack": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.3.1.tgz", - "integrity": "sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==", + "version": "2.4.0", "dev": true, "requires": { "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" } }, - "webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", - "dev": true - }, "webpack": { "version": "5.73.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz", - "integrity": "sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.3", @@ -13139,30 +12356,30 @@ "dependencies": { "schema-utils": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz", - "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", "ajv": "^6.12.5", "ajv-keywords": "^3.5.2" } + }, + "webpack-sources": { + "version": "3.2.3", + "dev": true } } }, "webpack-cli": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.9.2.tgz", - "integrity": "sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==", + "version": "4.10.0", "dev": true, "requires": { "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.1.1", - "@webpack-cli/info": "^1.4.1", - "@webpack-cli/serve": "^1.6.1", + "@webpack-cli/configtest": "^1.2.0", + "@webpack-cli/info": "^1.5.0", + "@webpack-cli/serve": "^1.7.0", "colorette": "^2.0.14", "commander": "^7.0.0", - "execa": "^5.0.0", + "cross-spawn": "^7.0.3", "fastest-levenshtein": "^1.0.12", "import-local": "^3.0.2", "interpret": "^2.2.0", @@ -13172,8 +12389,6 @@ }, "webpack-merge": { "version": "5.8.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz", - "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==", "dev": true, "requires": { "clone-deep": "^4.0.1", @@ -13181,26 +12396,15 @@ } }, "webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true - }, - "whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "version": "1.4.3", "dev": true, "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" } }, "which": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -13208,55 +12412,45 @@ }, "wildcard": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz", - "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==", "dev": true }, + "worker-farm": { + "version": "1.7.0", + "dev": true, + "requires": { + "errno": "~0.1.7" + } + }, "wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" + "version": "4.0.2" + }, + "y18n": { + "version": "4.0.3", + "dev": true }, "yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, "yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==" + "version": "2.1.1", + "dev": true }, "yaml-loader": { "version": "0.8.0", - "resolved": "https://registry.npmjs.org/yaml-loader/-/yaml-loader-0.8.0.tgz", - "integrity": "sha512-LjeKnTzVBKWiQBeE2L9ssl6WprqaUIxCSNs5tle8PaDydgu3wVFXTbMfsvF2MSErpy9TDVa092n4q6adYwJaWg==", "dev": true, "requires": { "javascript-stringify": "^2.0.1", "loader-utils": "^2.0.0", "yaml": "^2.0.0" - }, - "dependencies": { - "yaml": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz", - "integrity": "sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==", - "dev": true - } } }, "yn": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", "dev": true } } diff --git a/Website/package.json b/Website/package.json index aa627c7de..1ce58a59f 100644 --- a/Website/package.json +++ b/Website/package.json @@ -42,7 +42,7 @@ "@babel/core": "^7.16.5", "@babel/preset-env": "^7.16.5", "@babel/preset-react": "^7.16.5", - "@types/node": "^18.0.3", + "@types/node": "^18.0.6", "@types/object-assign": "^4.0.30", "@types/react-dom": "^18.0.2", "@types/react-onsenui": "^2.9.17", @@ -71,4 +71,4 @@ "webpack-cli": "^4.9.1", "yaml-loader": "^0.8.0" } -} +} \ No newline at end of file diff --git a/Website/tsconfig.json b/Website/tsconfig.json index 22fde7f7a..3c96f5c5d 100644 --- a/Website/tsconfig.json +++ b/Website/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "outDir": "./../Android/app/src/main/assets", - "typeRoots": ["src/typings/global.d.ts"], + "typeRoots": ["node_modules/@types"], "sourceMap": false, "experimentalDecorators": true, "declaration": false, From 87d861133feb053a8cbeb6a200a7769b906200c0 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Tue, 19 Jul 2022 00:36:32 +0200 Subject: [PATCH 33/44] Better support for native libraries --- Android/app/build.gradle | 52 +++++++++++++++++-- Android/gradle.properties | 1 - Website/package.json | 2 +- .../activitys/AcknowledgementsActivity.tsx | 3 +- Website/src/utils/native-licenses.json | 34 ++++++++++++ 5 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 Website/src/utils/native-licenses.json diff --git a/Android/app/build.gradle b/Android/app/build.gradle index dcac5175b..6fb359b56 100755 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -1,5 +1,9 @@ +import groovy.json.* +import org.json.* +import com.google.gson.*; + apply plugin: 'com.android.application' -// apply plugin: 'com.github.node-gradle.node' +apply plugin: 'com.github.node-gradle.node' android { compileSdk 32 @@ -8,8 +12,8 @@ android { applicationId 'com.dergoogler.mmrl' minSdk 26 targetSdk 32 - versionName "1.4.2" - versionCode "142".toInteger() + versionName "1.4.1" + versionCode "141".toInteger() } buildTypes { release { @@ -23,6 +27,7 @@ android { minifyEnabled false multiDexEnabled false applicationIdSuffix '.debug' + buildConfigField "String", "BASE_URL", "\"leer\"" } } compileOptions { @@ -48,3 +53,44 @@ dependencies { implementation "androidx.appcompat:appcompat:1.4.2" // implementation 'com.google.android.material:material:1.6.0' } + +configurations.implementation.setCanBeResolved(true) + +task printDepsTreeInJson { + doLast { + configurations.implementation.incoming.getResolutionResult().getAllDependencies().each { depResult -> + println "{\"from\":\"" + depResult.getFrom() + "\"," + "\"requested\":\"" + depResult.getRequested() + "\"}" + } + } +} + +task printSolvedDepsTreeInJson { + doLast { + def jsonOutput = "[" + configurations.implementation.resolvedConfiguration.firstLevelModuleDependencies.each { dep -> + def addToJson + addToJson = { resolvedDep -> + jsonOutput += "\n{" + jsonOutput += "\"name\":\"${resolvedDep.module.id.group}:${resolvedDep.module.id.name}\"," + jsonOutput += "\"description\":\"${resolvedDep.module.id}\"," + jsonOutput += "\"version\":\"${resolvedDep.module.id.version}\"," + jsonOutput += "\"license\":\"null\"," + jsonOutput += "\"author\":\"null\"," + jsonOutput += "\"repository\":\"https://mvnrepository.com/artifact/${resolvedDep.module.id.group}/${resolvedDep.module.id.name}/${resolvedDep.module.id.version}\"" + jsonOutput += "}," + } + addToJson(dep) + } + if(jsonOutput[-1] == ','){ + jsonOutput = jsonOutput[0..-2] + } + jsonOutput += "]" + + // This took me more than two hours to make -_- + def jsonFile =new JsonSlurper().parseText(jsonOutput) + def json = JsonOutput.toJson(jsonFile) + def pretty = JsonOutput.prettyPrint(json) + def myFile = new File('./../Website/src/utils/native-licenses.json') + myFile.write(pretty) + } +} diff --git a/Android/gradle.properties b/Android/gradle.properties index f8e55fb6e..5a568caea 100755 --- a/Android/gradle.properties +++ b/Android/gradle.properties @@ -18,4 +18,3 @@ # org.gradle.parallel=true android.useAndroidX=true android.enableJetifier=true -android.enableUnitTestBinaryResources=false diff --git a/Website/package.json b/Website/package.json index 1ce58a59f..4639739f2 100644 --- a/Website/package.json +++ b/Website/package.json @@ -10,7 +10,7 @@ "scripts": { "dev": "bun run licenses && webpack --config webpack.dev.ts", "prod": "bun run licenses && bun run dev && webpack --config webpack.prod.ts && rm ./../Android/app/src/main/assets/**/*.map", - "licenses": "bun license.ts > ./src/utils/licenses.json" + "licenses": "bun license.ts > ./src/utils/licenses.json && cd ../Android && ./gradlew app:printSolvedDepsTreeInJson" }, "typings": "types/onsenui.d.ts", "dependencies": { diff --git a/Website/src/activitys/AcknowledgementsActivity.tsx b/Website/src/activitys/AcknowledgementsActivity.tsx index 1d8776b05..28dde450d 100644 --- a/Website/src/activitys/AcknowledgementsActivity.tsx +++ b/Website/src/activitys/AcknowledgementsActivity.tsx @@ -2,6 +2,7 @@ import Toolbar from "@Builders/ToolbarBuilder"; import { string } from "@Strings"; import { ActivityXRenderData, Card } from "react-onsenuix"; import dep from "./../utils/licenses.json"; +import depNative from "./../utils/native-licenses.json"; import AppCompatActivity from "./AppCompatActivity"; interface Props { @@ -22,7 +23,7 @@ class AcknowledgementsActivity extends AppCompatActivity { public componentDidMount = () => { super.componentDidMount; - this.setState({ libs: dep }); + this.setState({ libs: dep.concat(depNative) }); }; public onCreateToolbar(): Toolbar.Props { diff --git a/Website/src/utils/native-licenses.json b/Website/src/utils/native-licenses.json new file mode 100644 index 000000000..b9711cec2 --- /dev/null +++ b/Website/src/utils/native-licenses.json @@ -0,0 +1,34 @@ +[ + { + "name": "androidx.browser:browser", + "description": "androidx.browser:browser:1.4.0", + "version": "1.4.0", + "license": "null", + "author": "null", + "repository": "https://mvnrepository.com/artifact/androidx.browser/browser/1.4.0" + }, + { + "name": "com.github.topjohnwu.libsu:core", + "description": "com.github.topjohnwu.libsu:core:5.0.2", + "version": "5.0.2", + "license": "null", + "author": "null", + "repository": "https://mvnrepository.com/artifact/com.github.topjohnwu.libsu/core/5.0.2" + }, + { + "name": "com.github.topjohnwu.libsu:io", + "description": "com.github.topjohnwu.libsu:io:5.0.1", + "version": "5.0.1", + "license": "null", + "author": "null", + "repository": "https://mvnrepository.com/artifact/com.github.topjohnwu.libsu/io/5.0.1" + }, + { + "name": "androidx.appcompat:appcompat", + "description": "androidx.appcompat:appcompat:1.4.2", + "version": "1.4.2", + "license": "null", + "author": "null", + "repository": "https://mvnrepository.com/artifact/androidx.appcompat/appcompat/1.4.2" + } +] \ No newline at end of file From 8018d48aec7972e09940b4f6b4338b7456fe75ce Mon Sep 17 00:00:00 2001 From: Der_Googler <54764558+DerGoogler@users.noreply.github.com> Date: Tue, 19 Jul 2022 02:15:40 +0200 Subject: [PATCH 34/44] Add bun 1.2.4 --- .github/workflows/webpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/webpack.yml b/.github/workflows/webpack.yml index fec6c2754..dd9b4975f 100644 --- a/.github/workflows/webpack.yml +++ b/.github/workflows/webpack.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - bun-version: ["0.1.2"] + bun-version: ["0.1.2", "0.1.4"] steps: - uses: actions/checkout@v2 From 63d65df87eabb2f65017da41cf4ddcfb0135aad1 Mon Sep 17 00:00:00 2001 From: Der_Googler <54764558+DerGoogler@users.noreply.github.com> Date: Tue, 19 Jul 2022 02:24:35 +0200 Subject: [PATCH 35/44] Try change action --- .github/workflows/webpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/webpack.yml b/.github/workflows/webpack.yml index dd9b4975f..c8291d31b 100644 --- a/.github/workflows/webpack.yml +++ b/.github/workflows/webpack.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: xhyrom/setup-bun@v0.1.0 + - uses: antongolub/action-setup-bun@v1 with: bun-version: ${{ matrix.bun-version }} From 11e2cba896805ff25ffdfb50320d4f364fd7de67 Mon Sep 17 00:00:00 2001 From: Der_Googler Date: Tue, 19 Jul 2022 12:26:20 +0200 Subject: [PATCH 36/44] . --- Website/bun.lockb | Bin 205092 -> 204654 bytes Website/package.json | 1 - .../activitys/AcknowledgementsActivity.tsx | 15 +-- Website/src/activitys/AppCompatActivity.tsx | 49 +++++-- Website/src/activitys/MainActivity.tsx | 3 +- Website/src/activitys/MainApplication.tsx | 12 +- Website/src/activitys/NoRootActivity.tsx | 5 +- Website/src/activitys/RepoActivity.tsx | 41 +++--- .../src/activitys/RepoGeneratorActivity.tsx | 4 +- Website/src/activitys/SettingsActivity.tsx | 9 +- Website/src/activitys/ViewModuleActivity.tsx | 13 +- .../fragments/DeviceModuleFragment.tsx | 1 - Website/src/builders/AlertDialog.tsx | 121 ++++++------------ Website/src/builders/ListViewBuilder.tsx | 7 +- Website/src/builders/ToolbarBuilder.tsx | 64 +++++---- Website/src/components/ContentBody.tsx | 10 +- Website/src/components/DeviceModule.tsx | 16 +-- Website/src/components/ErrorBoundary.tsx | 14 +- Website/src/components/ExploreModule.tsx | 8 +- Website/src/components/Gesture.tsx | 6 +- Website/src/components/HighlightMarkdown.tsx | 6 +- Website/src/components/Icon.tsx | 9 +- Website/src/components/Searchbar.tsx | 14 +- Website/src/components/TabWrapper.tsx | 16 ++- Website/src/components/ViewX.tsx | 27 ++++ Website/src/components/WebView.tsx | 4 +- Website/src/components/dapi/Anchor.tsx | 6 +- Website/src/components/dapi/DiscordWidget.tsx | 6 +- Website/src/components/dapi/Video.tsx | 6 +- Website/src/components/icons/Checkmark.tsx | 2 +- Website/src/components/icons/Dangermark.tsx | 2 +- Website/src/components/icons/Warnmark.tsx | 2 +- Website/src/styles/Md3Fab.ts | 4 +- Website/src/styles/Md3Switch.ts | 4 +- Website/src/typings/declaration.d.ts | 1 + Website/src/utils/licenses.json | 8 -- 36 files changed, 255 insertions(+), 261 deletions(-) create mode 100644 Website/src/components/ViewX.tsx diff --git a/Website/bun.lockb b/Website/bun.lockb index 68f077508d764b23b3ef297421029f5263dad043..294595056f24eb994dd6cd628dd9975de62edf30 100755 GIT binary patch delta 61376 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 IBt;MY2Td^C761SM delta 61593 zcmeF4d4SE;|Nrm3mS(E4WF2EI+h8!(nHW)#rBRBI27_S+W0|qc6z-)Ip>XNgLuh2D z1!ZlclC<(ErR@`yN_{?sQoqOZ-t%s*`;l*p>i0*ddEVDKkMlaq`@GNlywCeRn)}7} zOPB4wbb8&`J?}oVDeI@aTMHk5s+aGTyRs)AK3t|mW}jNoKXm-I#IXw7r&ccDQplUp zwUW1Tq$iLFew1;!e2)UkV*iDW#16~K$j%&??fRB<5z=XtmhFMP7~39O9Gi_Timiu@ z!Is8GV+&$0!+uVA`R^xP8v7)+WK|+LBhrTSqy2{fYIvG;n1H>6^vC{acRlY*w)qp# z63`Vkot2i_cLb#i7Ie8Tg;&O^+e3$BrwtjI;i`(CnlE0+8|N5OQsTihK@*W(#YjX&B++50r@XZYBj2Gu+q$o%(S?EeOy1nbymy3 zb=Fg}bBFXDlriFCcrnsv+`-P|kgv148mmT~PW2s}oul#Y0k5E8TuekA*n?FCPhd5C zov=EZPqAw7I-72eRfSO(1&1#VtBzE%ma{fEgCiI~TEp7i@($KE!>XNA)Kiji@iio( zBb{j-#`w1ssN{W&l+Ml(th)0WR)f44t7->C1iRN0tJ3YUI(rFNm8*u;pl79J4;?%z z&GjJZN~C9Fby)Xc)$R0Djke3RowVv7j^*&YzTDKz!OHj=paza&RWO!>I&>+P0raJ1 zWev@WOUt>Ew8rIo{FL9Cw2rfHdg|ao)H8v!Z7{C?;M4(5hez9T)3NHnLhQvZuglkk z$mM`{s8A>9QPQ#xTgRPPeta+52BWaLT=xQXVVz*4%40tyt#V&tH8PJfL)4M79F02a z#_D=l3D*Gx4*WKH+>Q(t9GE?HNMq7nNXwy5#(=u4Kd#24HROwI!3Z*S1fw$s_v@RQ z)$a<@xcHh|J}6^Izqq0OU2*;mg~~+#M3%b$4OXoT#)}`{qyF~`m5H2SQ=|Rv!j-&7 z@X^V911q1==^1^~=}|^@T22~v8c=ieajbeUEOkVB+@Q4FmuwqPTe|_PAy|ynp{ETQ zl`*9MP}gMA8iEm6O|H>teTJp>9ppMi$Eerq`-+GRY(R+A$Ns}cK>`qbenw%-4l zrK;D9LmMhp!y{6MrS=(|=6a6SG$LEDl=Y>JN*gkQ24|60M|x3^(e&Mdm7kNINTwPd zi49yHSaqN)mLK0k_-kZdu;tUT`=)var}j&G0HB5@V09#;uqx1!4-Hv$td6WbwQH_4 z#_H6hVAYXISXDd#t9pK*{1w>4SS<`caCGX(2=aAZ&%oBi7P-{bGjLs1qq{msMX+k{ zI~-)UV0E3nfz|c;B^9ZGcd+V+lWs{l@ln}2AuiWs(i+hm|B1*l(X&XYn~SX1Dw~_` zkBzM1p5X5kStjuln8xxnmd1Q#n8PX)iRCDK>ADsO1G0vW9xOX}Xdk8P_?Lu~&KQ!O zmX$Fgo0&g2V?g?dDwI|~`epR*FK=hA9-0dgOA767y@#AyaaQZfj#Xx;Z zv3(j#TB9_~HxKj6xwz|Hl{Kxp@#wQF>vk{!?zz|~PeYv&S z*;yINf0A-KSy>sGS*Z-mNzyv(Pq6&>I{V`T-BMw zD1MpiF)}n-7Pt=k-@l|x?2Ax-e0jE5VWy#m?lqc`cW&xnZqXxLd;C={ZR+hn57o(5 ze8|h02MtNJ`FyN8veM><-%tJIozX7W=QPIC7s*Kle0(^Dt3q-n!f5vy|@fmMg+12qg^&@ts7!m9iZn|>IJt8WIjv}=&dH=c-2_DHN2ftvyu zoOI5kDk?zlRPl1BVyr5B8LJMj!|F!$I{qr}Ov=pEK|C2`umK5PUxWOuidU-A#@6QS zL~gU`CRp{Nrhk0#rrrpKvM#A6SUp3%O>P`^E4B)DI<^)z3#)uaHZap-YXr}Z(`E!| z`8UN@#}3A7LZ?`(Yc6$gw(DZsSdFC(UmYA&a0+Qvcn4P99T=Q} zuKsjXyfaoy+-J0=@-JJv1*<_z%MQ#%*H84gD(P#fw>EYtR)hC4wgxTw)(}yJm1Be3 zf&W^^rTzn#mGMp_rRwj%>KvtW0yI9eXr>xA6H5<$ZEd;|mWq7elc{D8V>NEczy{b2 zr0Za(U~%=OW3>tKlCN%GMOx)6VClKncZyn6(JUy3?0W~Rg6pxW=q)le-5!uqhP z(8F2NWT}GHxORhc48G>1HJNV1>O|a!4P18CW?{9I%*B?~#&ZJ^Ic8uZvGr|5QMRGC zX-!A=BvutafTi=k9ITGK9kw2JJLMCw-(qzlu7K-6{zdQQzYZ%t9jlHH6892GBBCi; z0!vw66}(jNI;@WDbIzVl!5%Dq^3BDn!ECJj+G1646|DTerLT7#N(JfW56{{Z4wzer&74)GM`4=ax299y~8uF*GnlpYZXU#Xr@Z@6Ga*`F@4+TxSx*AzazNS;y%caQ zp+j0ir(!j^?)Gme^U$G~_{PfTq>zZ;au||7Td9B@ zg;kI(;E&o>#w#zMQs_>k^h9g#!HVB&?KG@{toU?m{a790ESol19m4{o`W7JtS(RI& z1OeM1a2U%;C?ijla4xHg9#N)$8{Jl9l|Bfv%3Xt0%X*~lY(NUKN^ewxa4uU6z8mS3 z??I~X1*8yaRnLp83W0`R4rIGrp;i^>_AJLYtbG&99mn+nx(FRZ>geZ4<8%Tk{2D9& zZ)snbxy!9qtX0&*ho(hg%Vi@-7s0Av3Clxm6uh$K=d#MG!iPFs)!G_fTcAdWRkS7_ zvay!Ss$uP-6+*2#+Q9NqE7Z_(Sw$Q1p$;^)w(*rVqnUCEp;oB5%}=uV0qajbR3^~# zmX?NEo$;$JmsRu{KEzvFF3TOz)e$RngS9te)xDbqtyTIKn+~yk0uCWSw^mnQ9Mw>o zEg-83(y>Armdh%t2Py?wMF-imtjC}9ui#-0Rf^ocALVKvwB-HZ98r+4X=;%PN14O@~@tSbEKa6>M2aY*2v)3^KK>7@p)D;x z|M5MQ0+U$39TF&KOP|lmr92;MwSx7RRk|Wp<6XsaS+!Qf=GVk(oa1ah_F_HoxSGnr zKXz|$uh7h9pUbNH7V^ekW&LEuueSUeYp=!f<7%T1YgO(#%iCEVV!e7Sbak^CvMSKs z+FLD`74KowvP$1()3Q45K9={jTvmSlY+6?HEFG(9G}L3)l%dv9zw=W#pH)Mn@Y6W@ zuqraa+Pjn>$g1IqSdG*qn}07>9k|b?r)#e!2R~LpR?*qk8mtP;7qnItFR1SW1S0|PmUWPo!$F&tRr(NC=xsi9 zi5;=_W6M9m29`9e{Pk;jrN6=|gj%7mJvRrZ)DPA{R!8uYP0K3k77VjO`u)Fxto#aN zFY+(^ppvGTtAx!Bwdzh8%Vm|0!OFja<+4gwvbKul=d#MGYV&0ktxi0GGHbOt%@bYB&R{ zf`crV)rlNt^M_k5tLO;JM_MkcXpT+)qV0@>8oJ#U7>m`BjJE|ttZKe%@Lt=DX84OXS+*z`QCT3cl8QmlfkYF~!cVXwq0YqhoOu&QUhwHvJ6 zXzeDQSmLh7`A`M=cP2`2=R*Z|V70H_gH=N>SpK3-@58EN2P}UTs|DjAmLJ#KmcOF} zK~~ZCto=YIRtHG)N0~<2Upf<>-RlY2Xw|u zL=6|G zHZ7}DGTNqPm47={XdEBv_+3g^tNeRN%ie4Ar`vp4H9XU%t@Q?gdgiwop;mmB<+7^S zSgU`_qY4*TyU5zb)-J`$e>qn5tgt-K+D8KUoc}e}VXe(rZ|%l_1ABR_Mq(>g6+LO~ zQ&@FiJ5~+tvi2FQZVxYE<-ZTBk$TOhU&r#}I;aor9Rd++RpGy^ zQcC;x9UaA`_Bu#e_rUh{&}JI&kMa`>?^bv`R9cmgAno} zPYb2e|Gdx(?wJ31q4&=Vy?+pB0ap|~SKNkIwYpA^6{asi8(Ql&s z%m35CUD1EyKVAKE{uAX-`>un#vOnWgSAX08M)~)h>fpZIAAP#3|0Jogr#rZ-`uCE` z`!>oS_k9O8GOn$4S-oC;r&gU-opAf8mcE-1Ys(NbMn&{8I;a1OMEgy83gzkMf@()oAt-cUOPS zAENwS{@cOb#J}XfUHu1th%$xT?hft*)5%Tlq%%?GF{Q8cx8g7oex%xOI=GwrkA1@- zl4?z=h5r;q=lm4qPx-ckyQP2Sw_Rtqbw~NPallvmBTsgneUen>$qw#o{aa3UHF<85 z6*&Gjv)j45nr2&S7RW3BxZZ3LNG}MeP!Q13WE2FH zEd45)b#;IP0gCiWu0L4j!(0lJw(0+S*D zNfCfs&EyC`LL}h0z-=Zm5^z*tVI-iZIVLdYVnFi6fZk^A#elY#0L}>XG3_n^oD^7d z380@jC6IS1Amvg(f3xyZK({DBR1_fHbdLf=6aj1#7-%Ak05%I`76A-4TLjXJ0xA>* z3^5r+0cDE;_6ZC#(Zv9J1jZHvWSPAJImH2S#Q`HsZgD`(%K(Q3Mw!^l00#x8T?WW8 zhXf{-03?+F+-@e903?(I92Xd45=#P(3M?!M7-x88$Y{W3fy`*YRI^1O zy&RxIIlz4;qa2`Y3}BzYbQ2u|*ds7D1~Aj?704+Mh$|16Wpc{{YE}Ro7I?tKRsb9n zm{tKW#~c!vR1uI=5irk8t_Vn|1UN3Rz$8`z92Hnt39!f<6PQyOkX#wC*vzdAXj=tv zMqsIFR|RlVU`-XkGIL5G?{YxO<$x7t<>i2GR{)}}0OXnOR{$ca0=5Y}Vj`;oHVb4{ z1*|q(1k$SkDpUikH5t_aWvc`B39L8K)d711##RSxGPHtp&FP718419--q63B}Kq{IQ9Gb`f&-Rc6O>H_wd?sWkX^#I!hUNDjM z0GkCe>j7ReTLjYU11i)9ylgV+1Ioq&_6fXVqT>O31jfb#UNw6KavA{Q8US85xeWj{ z8v+gsylG+^0uBmHYX~@K4hc+Z1W0NG_?Ma72$0Yia9rRWlh_z=RA6Caz`N#{z?>$4 zB>++q0RJ{C69C;30a1y7qo#WzAmU2E zHi1t~2-E#qKtyZ6Hi3&xWNW}?fy~x`OU)L6^frJBZ2(0~MjJrc>j3)%ikax^0DA<+ zUI)0$>=nr2mS^JH0!o_Pwt$-L0EY!in^@iG4hl?b2PkU}2~27aNNNu#XC}7?By<2A z7btHMI{=OfEbIWNXpRZYxgL;wJ)p9gdp)3SGT@BB<)&RS;H1EsWI$DON+7QzAf+Rq zx>?x~(Cr35)D3`|ruz+mh#NV~?KimFyK9-q8v&bd#3S=YJnEP&0_mLq6*>Xxnv70> zvNr+t3Dh^yHv#qtjJ*la!0Z*sxfu|5GoX>ly%|umGvKg56BFARa8O`cXF!5EBrvH9 zAgK%BN;A0&AmJ9kae?M0@fN^QfrYmKT9{)3bGibOy8>F8xm^Kmy8+G!Ty5HQ1Dq6C z(+zN~IVF(S9gxx;(8jFn4(N6(AnH~?ThskkKtvC~Hi7mgvIk(ZKxPlX^=6Ae`fY#; zw*fkujN1TZQvmw}ZZy#;fIR|ZQvf%ay#hHs0dYM6olR~}K+Rr&!veRM*j|8x0@Hc{ zx|u@)lX?S^dIN4XlY0XaQUS*WZZnCgfTIEnQvp5AF@ZUK0Lgs-z0KS{fVO=BX9W6~ zc6|XS1=jQh^fRXf^7;W%`T_czmHhzS(g0CufOOM64G_^EuuWi~iR=&9ERfkBFxYGn zNFM;GFaR*bWDEe5O$Y1~7-pi=0eb|-rUSCfUV)qpKwJi3gvreS)Eo#nEHKK%4g?$& zm^KiQV-5*S8U#oh1i0Ny9t21j3^*<@#v~2~92HnN7%s+aZ86 z0uxNTA%K$tYlZ;sGN%Och5}NC0`4{|hXT3{14Io2Ofubv0V0M2wh7#8B8LMu3uF!l zOf_2s(z5^+vHX2>iu$1rA24%x{$WG^;z za{z5~0cQl3ns&K>lLBjU0n5xOfxO!RDYpYwn3cB!y4?YYx&x4By59ka7z5ZQ@Q8^V z1K2E(IR>!WY!OHw3#c#_u-0UZ1(Y2J*e9^wM2`dP5g0oTu+i)l$ngT=ynshdt`|_# z2RJP7xQX=v4hl^30XCaM0+YrAlEwqJn#tn<2@?Rv1)egA697jA7ES$$fWrcBn%F6Tg96j001lc%0+Xf!lBNRwWhPGrBuoPw7kI}cP6HejSU3&v zt~n+!=RQF4eSjlo?tOr^_XExdd|=w$4>&2X=6=9O=9EC*bU?~40uC08ujl zM@{z`fQXrZZ33T~$eDo60+}-bpPMZL>3%>3Ki~_K;RlqR1=uI>m5H7O*ds7@7T{~M zS0HCLAZ|9`KPGoJpymUB!vf!$*arXy1*Sa!IB5UzhWgi6W6DVe)9|Y_X z82cdLGP748XE7jdF`%T$T@0wX1aMfOw255;I4Ce}381VwBrs_yAZaO}oSD27knj-T zxIlT6_z>Wzz`}KuE;sF#15OI8Sq`XbP6_0#0Hmw{ zR5vSE0J=R4hn<^eVfWaa_tm@NY7D*+W&0_vKKm4LF30QL#g zH_?v(_6Ur91kk|j706iyh+73{WO7#lYOV$x7HDE(R|5_TOj`{|Foy&ttpOyh0bFS& zuK^^i1soS>ZW7l5jtVSX3us}E3CvjsNL~kMY38m2v|SH4BXG58w;pg(V9k2KwdRyS z-UdL*20$CLas!~-MnKd?KwHy&BOqcEV4FaD6S)bnSs-&0;Ciz~ApKE5g+~D$O~#{u zvX24w3EXI+9|P01gUFdjinS91@tc z8IZIYaI2ZT8IZ6Aa9rRvleh(NRAAv2Ku>c_V9r)R@>W1^Gj}VX?UR5r0)0%oCjln~ z);tO5XHE&^Jq1X43eexIdMAl-D|28h@W*d{R0L~aLc7RcNV7;Lr(r0)P! z*Z~+~GIjvU?gZ=;7-ph(0`>@u-3iDtdj)cK0pfN6Mwr}PfSS7jhXqEN*xi7G0@HQ_ za?BxtNlycko(9}*CO-{Gcm{A>V2nw825?kh;WL17=9s{oX93C20(@rfvw*hG0nP|a zFzucLoD^8|9N;ca!cR?Rx*@cW_4Fughu9 z{95MywT^$1pV#+$dVS$Kqkmxj8;0w`HEi4U^7~5uANRj)6uf`$@arG=|AFDx?9WWi z8kE+L|4o2@(at|1^{KvJ&%A%6@C7LA{awAj01exAy}xa^E?mR5UGE<_cNd~F%)j40 zX)Z*=wq5UUnynYGVcV|v_g^{}q%+>%H2k{Woj*%EhW~kn|BpOyz5jmZz0ei@#`?Vc zf!zypB)_p?+phPI58>}?*tYAvz~}R~cE(ha><0wjUASu|Q>^}lSb2j`7nXbS5-dy;G zb;Jv3LvvsSmOt1OIADi)&jtTN<~^%7PQ&W8^B1O{rq}!g{C*8nS?8}%zf8d*w(Pl? zH~8nO|8K|t+fNNUf6cljn+oT$J1_J8T1V@rMw~x|Jr>6Qj~W=6-^&8~zu#L}d$>PX z)*JYv-WTFXeqU!;fB)zZ{=SB7yW0Q#!6E!ZBj_E%gXmv5{F=bdUo7X@(;IkWA-IJL zl|P?y)|2p`&)EO{`Hh^X4c-4kAHo0X&T#(^zKQs&8@BCwfA{cf&Lnd?)B4^6%VHQ< z34a^o{{Q<6Ux2dC{x7`OIy&c11V7Hv=^ar)7$?hBP-o0CEk5B)Witoyca4YfH*oNC zZbau|-gCj<%hWJ`DLxSTWDKbnh@YQ%UBA-tPx52@HH5#h*B7ocJb(O_;ks}Q+jhMd zV)%95oo^=yUCe$3WBkuiSQU;OFql68KQMa%HwDdp`CWMC{VN(dPaEDp_2|yiux&T6 z|NFhes?+3r%|qRK%p~2+e;e}#z9Zs%h1JOKU69n7^Ot4*oo{(Of8h&IHt_!MSFY86 zMrXXg<|grHG;G`T{=LKhIQzfwqtk6xw^%9k_8HFPr$6As;&hhZZ(_Rtgf{Y<3SWS- zUT60I*$wM5b~ZG3@W#V#*SzO~e<5T1LwfTUHf-Ca{lJ~=97FS~IujVy)ZiBZW@7`7 zQyS`D$-KYT@lW#ex_(cuFI;E5JpTNK;ks}QXS;OjD(Md%^LM&@_wh9Y`lbPOrqW-? zynk22w%y?SzrXT`&pu$TzuzKhysp2gVcV|#{qJw=^@Z!SH|*Snp5wpb!Nlt{;${+-sTtga zI!u%6PiDdWUw9)L1?PL~n$aoeS9BMic>`b1==yUTIZqqj-*|KynWdD`Z^W;O&EKf} z-jNBs|NFg#H9!7fS#NeazyHqRkEH#;9`5g&g#7;hSFBQh-Xi7wdxxKw z_rCN<{T+Lkt8+`!Kf=?3UySjMFg7Tj_QZw=PwkTCs|ZiYRt0%C_fXJZd4W&}RyU04 zD+KiwQK8`?SalO$!Be7IwXm#6vZ{u$i%lzBy_b-6d05t^uo%nIu!=^(oG-Z=03aFo z0>e_)&*@1~GKyNJFKLorF+Q9x6w81WgcXOq<_$~dN*0bvdNZJ zCjE54i*NFP@e}y6$0e3I=5qYz1rxm9vf&D#F{zc927?@CZ8fq6hOz2qIIe|ikaeTk zK-9b*=P6bymbCNT3r>kzW>;NL33qL?OK!y~dkQ99?&Mh;N3qIbOn;2Nbr`D$yVi87 z>?x6Sby!wBS*^mDzKHV5Fs3h|tYnr@MIv9bdsb*nR*SO;-#`It9LAcODjZN!0$Duo zo)vWJ_z8rmjKAVn^07kaA|y03sr9I$Ia$qZ)->y$1k?Afg@zU|T~VRoD&wxgcrLEu zDd@d2EUy**jl$T~u-Ty%5Z6~?>R(!ghHGK} z3MM`nR-hdP7KO3)u!Ui)gK2d+bxchP(K`@{0OMkMyrMd$gyp5+uS-2N^n__i2o1f=0o75tDs|iwmY0hE-C?W`Y+@MeYpPVG zj$zbM?ar_~eZ}d7FxKC=>vP=?FvC@Br=;X=bG z(}~N$J=$!b*aOvRxlfo!E~R>gG2Jdw!q^?gU7eP1q>iLp!}7-B-#v_tgLMmI`mNqA zW(M^nb_vTGPgdtJHUV~X7`xLfQ8&KQp>zt%n~49_VeD>L;QNL`M&%xJf;y6Pql^!8 zpA4&KnJx{Iu6y~Y6XrL?w5mZjrq^KYs}+_v4gZ>9>^|5nAze`Pepq?@v}Ed(k$|dht)9~_67!kJ>E9eI@CQVN3@tX*cMERm7dI5uRnM)z=1Va7%^wts$;~3k_>Y zYeGaj+frq&1AH0kMO@p_sVFpTAgx9y{Bux;b>S%Jrlja5K9Vid&5IwG4pw*T3YG`H znCvkUy8Y)vSKy0`lYVwmwR|ln=_|w7X4370**|}7f$8j54Dr1e7G&E63F3WH$V?X zp+R4ge9F9En`v?~loNlJtP^2OGw;(d_B>33Q5oxmJ;e9eM4s)_Uf8pagS9Wfb_L`4 zyKX(T>@ef&ux@M*^Vg;Hco=&bwknM2GF)j6P=$ACSk?iuqQls$u)r^m;VbDbKYE~Y z^$PQQ9X2?OX$hNa*(!UeZ^F`pEdQ{y{`5D)K z!~8!s#d)TP{x=?V!m>Vr)ixVcs#aLmF_WrNpW;y?EbB8^731bH!CN6L>o{3W!q^uu z{;5tNthLAbC5&hwth4MZm@b{ra02#9C?Nhd?5-fwx2*=lH^A43>bb=U|1nG0;}rTY zsK41;&r`#lXim`U;t64`oHCub??<1;(HEAbZ}0Y-R%{m&W5cq}kkvYj{RrzF#(pxL zC~g+lXM?2Y_|V`ct(OX+!9%)77%M=!fq9>LQfG$x5-&tn$8mJ_xI#C``An(0jY~4(r00 z_9?pcDQqOpk4yWGHv`1g)Ac9`<(I%}H3<#cyl6qXEQIT|&g4)h;`+j*yRq5}I6<4I z=gsg29HZ9n(4hU7?h&D(985Q?(4aR>I>yl3xb|~8#!#j+G%d6s@rtlKKnWC^1 zbD#->c57HxC$eq|V>iLB4`X_qO|Wb`aScXiZ1pg|E-?P_-&x@n*rh>Ynl<%AdbV&1JA}7GYa`wZR>W{0E@2)` z^c0I#Cv*o14Sh&o8pe3hqcX!1c*xfcDm0{#jtpb{N$VaL8hGoYI(AZrSNG1)paUux z#s-qs?Kd53A4zyFcKU|DoAEK0g_VO^{z$**jsg zVWD@uyI{l5^5eHM6HTjT?1b(nFa4}M?uM{oCZ25X(6Fq@WMzi2dtrma*c4cXWjl#0 zIu+YL%x@YjEsWg<>lwjm^~=)N)!V{2doVVZtUSWEmm7*iqt{a9fl3RD$UL$RnK(y#PdqE_e{)EeoR zjvY`k>WFSYol#fR4fRH;s1NFk`k?`6Aj(8T&~P*gjYhX?Z5&HPSD6n@KvU6lGz0n3 z185O?5G_Uzp%o|(J%S!ZkD<+ID|!-bLp#xK^c;E~y@Xyy2hgkNb@Yy22)s+=J#++p zg#L{_K}XRs^ac9LoM_36{*LHr^aJ`4{e*Pk6hINE6snA>pv%z}s2Zw)Vo_~W7d1lq z&88mlTcE4ZHK+r+9(6>W(9Ng|>V{I>oReNedZSd-2Ms_&P!<}AMxoIt2j!wW&=@q< zY-{C-@lGT<4b4Dv(R{Q3EkcXYQnU=MK^u@Bh#o_aqs{0^^c2!!xfAV1&m#7?uD$35 z^b&dny^7vM2hls|JuRjm5cwD#MV}(QfB768M<>wN=sV=`uzI5^s2YkxdV*<;w0dh1 zz6xD~w5M)|+9NHT+QMq5GYBn1TGZ;I8Xl%ubs|;K73gvlgUX>&s3>}!#$Q7(qV;Gc zdKk?^bC5xk(CsJ@HAO|x(@caVXdW_1zuwP4H=?$v5o*($kIPYIbS=6X>G$I;P-B#Y zVi5HO*48_*&FNGNq&=b5;46`y+h&uOjq2mP5L*_u)Ev0g(=1ZA!yC~IbNm|5Rc^0| zyVg@C@>+;CKBG+XwVs&R0Yv+uzNin<-d3AlZH8|}+E8~x{4R^q-m8hWLRvlIQ9V=# z)kd|D9+z*S8_`((BBu)x)`}pL39d!5}iPwqCMzY zvt*hN50*Fq(_fQGawB>VdkWE~pv08FfPKP*c8xU z5XnIqXdM}c(c5SWjTeFa2OH%vFI?v-7gdOKK~w;_&57$gHN4-F{a^GA`VxJC4x@je z52@x}^fdA9=zik&q4DT`(!p(qm#Mj5C-N<)2757ZUih$^A|)RCh*?88Ks zqsvecbP?)E|2iPOf*6Xl!P@{|kG`UCVbbqnr;vUIJ00DIN}^ntHb$9fBk>Pm@1rBA zC)x!21p9CFk(&v8j7WK$KPE$(O!^VD8m&WX(Lwk=?8~S)ibj{Aa6gruiDYLXKbnmm zK-Z#Hs3mHTTBB$$A8pWes2ysH)R-EOeFl|Auc7*Matv0Tyc^wvECJo4w;qS@D;1^$oR2ymAzM?c>v&5RD7JG?6E6mwiE zz$&6>o7VvQTb5dt(;A?96|aV>qAP4#aa*_dXDH{`{EV}>(-Efvr()T2v2g!}_{mqt zuX{&hq=Rgto05VOnmq|9%BD4Fy743;1^I|MR{qM@LZDCpwM17Tg=>N)@OcBD?NCRg zRkA(mfRgL*q28YBuGbl^p;IF_qfY)-waaA6`zEArD8~un^1cOiLtSlJTxl)RPEAAu ze(JLF(@+ZPfx4rgTc*VlUU~FFPG1TU?}-%T>4bhn`l3E474=3cs~Xj^Q${QuIjs#K zu6jayM=}tovuB_Z2gs^|p-7bsMrtrL3?ZS;WFqCMn!CZkEnSr2u)(p`aD zl{av&noh!x6lNn8egHYgtCQdyuLgK7nuDC68MzoOK=aXqXc1b7cB5Tr2ilIdp{LN} z=rMJ96_H2KO0*OyEJF{WhtUeO+}b>>MrSQrjkIvCL(Y9~Bk@h>QS>C*f}TK|(N?6e zGw^9YX#bqM%a`FN(Fybw`VxJCK1IjS^XNI`Lr0OWt548D^l!8WJ&T?}j_)hP-$(L! z1MNlLo_y>_YH%NV0lkD?M6V$gdKDc&uUjkjCVC4ULH|OBkivWDU33_|jov{YqmR%B z=tJ~5`V1Y{`PWgX$KRoE(SOm`=s)Niq~Jkrw?2Z8&1Z;yk4~c>(2q#_x}UHGte?2b zL|7h)y$BUXr^wU3&#kRRsG}T|se-C3w4u<-%h1quQtzibcBHS4Y)Q4J1FM z71wUKKJv!fNTU!KT1gYQQ;8~AK%<&$nnVet6_T;qI9-EUp_WMV=PGOx(&JSh(%O?Z zM=g-@nK$0RX5E=Q*OTGwy4n!G4mlexT~-}PYgk94QRrr*Vb>fQiPh$+AL@>7L0wR1 zbQ8J(bwoF!PAFKG^WT?5H>Az43aUU?B&MekRo(}yLfXHkA`NeE)C*ljzV@ssHty7= zGNJViC;dMgaW8N%%0T^*cH(NJD3zvT2Otf<3aU}<%EZNF#pEwPhYtziPQGJxX*=;O z{2Gto<8Cw&-G%N%6Oh(}@mL>HC&!_&Xbif;bn4}2GGdx=j$ z_n~R%el#7;K(mk^X-SxkeE=!U#eSk&zIP$91!z86fmF+K^blHt7NZBzBBa`vqGia* z6U#%YF|=3bx{*DCkHQhOnmA7t-oO*867K=mV%H$8YDz0iM8#n`&(EQ)C>m`+kD`re z1A4-yH(?(~kD<*WOuk|}(Jr(NMQd?-ipY~llTex4ZCvMn2daS@qo>hs)w5FQEtVUxZ#Ju1S9Yz0!q`SCOuHUGEBSk$xZh23A9+8;P!E zg*QoS$=2yQgbt!Hft)}5l&f0araFapu)5feqjxR)9Qzb`A7bA}N07Smo=ty%RX0Dz zeuh3l|3)7nv12;hM~Nsy)`@>gTn#A%ZpI;T-Lk$WeFFUlIezkW;@??5$Ch{a|60zr zLU@LlbL8qkXhR-ujG<|#tkY5DIc1fnM{)(_i(iekh)Xf4!9`x>gx8{0#4fX?oP3hM z_=-+G&K0NEcusJ7Bc^z0UA+GDp7s9EDdg-gjsWzk@_GvD9pPHi+FNM*@HBE>5L6+r zGICx*1x`HqdMT_&Vx?~hk)OC;64&wcIQyj}Jn+U#4hpl8URo;XO_=u9%A1Llr{MVN z4YS_8I+g#)?^o4)E1GMGoOi4mD+QfYy_e7nIt6vh>AGGAYa^f+SVm7#);lhUsty>(zcc#EXo;>wTw!(8?57r3&Y> zdKIdm4*l$B+YbP}2UUnhKRX0SFx|`MYgkiJZ{)m@SEZp9hjug#Kc_yG)#>Yx)hY2# zB@y~+UzH?~;S^H7UeYS)4W#q7ZV++(vO{m-Wc5bwc6@S?@)Q?y>QRGEJq{xsJbtHl zj@2a7#BtKHBm-}Z9hL(KKWZn>u{y`jB-Ch$YZP_lnt+;rXEh?^%x+)6AvjS~$#|p& z71X)VQF9vn%{KJ>tG&<)G)qI%YWSDZI#Ru3SN>h9h!A@8&U|r>UitF(s(}1uHA5%b z!b;z5(&bDIq?SLgJG{;`fHcr-a0(g~ads`TPUb;QdafO@jjGPkA~WGn{g?>0w0u{Pb`~FXSQBkI(wY)_y0Y=rBDBm?KmV6lp$-pIKu@Z#qXVdB9{^#`*H4`8 z?a3+>UxW_%798#Q^?SqL@wj`&*R5Z-3EMWj%969D?%G$1HmrBAavIldT(`dKC9`X& zC)zCN@9D^QN`KbhQ#4D$H)Y9>eNp}}|Xh(X!Uz+(6hsN1B@I>H?Ykh4(*+aL? z%Xj$Yq7zI~I(1K@XlaU$9zCY}$Z6kRlwb5AGaLu^lV*y{ezQE?)6o5~Ih5`h;67nm zWq6`XU(DfYlqxOsy?we_=Q{(18<-o1cuJeA(>#}(5gDFh=G!z+RlffD{ed)BxnOWW zj^^E4^vyR55A(Q-L5fjFVDuWgW6jt>__cttpYZMcddQGFYSk_7amUxMo5&#Re^$nU z|0(fB`Q_kO9KWl+e!6r0E=S_?{U)2AaA-WwIy8Rx{hlXU?%bX4u!@{g6pg&7pZC(T zxx657n%HTQ2UGN294h1RK>b-S#@@DiRldWI z|Ht(H!3>(6809lPKu-gkG!wEtB`<1HH@;!r_*v%EF!~*w4Q9`9PdU%BLT2YkPszef zI4%l~8J=HI`9a^3=B*4*qT_3ZWq5A#tSw|_4fND~qRVlFT6V5h~6J`SFVMs*Wi|21cZ)5#xAe3mEL z6IIx(pW`WIQnNf2++~ax#u*(xlG)d=aBw!CxO~%?zNyO|_qeM;bVW2b`{Z|>xqlR< zlW}KbdYG7OPqICT27GVw!fa2&5{oHvDMiYas#bjb6*s?Bl5ZvEe}HI+8GE}YI`Tg9 zbtwc+NXg2qH9UaAE`d$Gx$Cky>*nsD@2o&|VMjl{4)1BkGqx@K*AoAG?E?!57YgGnZnVQ{}gwvGJB7d z>+SmBvu`}^gSKnIhOYg&tG52|BP;fE{kGy$rU%0l6LnGW2w(rG%KpjQ>a!?tGzoQ^ z@`5LH{LJoAo)MJ>`CJ?0)WvZK#rYay(1(YRddv!I9CPHjHtN98VW_GxH!r z9n*o1=i(B zXxQACX^!P`YY2{HgI}yGd{P8EZco(zl+slC_;ydjkm0Cu2Tdp4yJ>o(PN433WJHipZUTf+fe zH4)~%F`lyYEYMuPHuGw#7aldO#;3pdp|IozBY%L%*3#Es+p z&ZZ{aNbg*qw!c>54O;?ja16ZPFsbA4+ir@#M};q%b+|Wv2X|eW?>@e&Xy2QbFUFlE zObs8k6{R=swW3~~ULK) zZXbOeZDKGn=NKeySQzOE<^~^KnNEFC)YoTt)ufh}6iuMM_~0FNp;@RJ9<~mvs&rd= zdg4!20}g>>dej_HOFPYHGJDO8gEar4+3*^vKxd-eUz$wKD0{Z;{0d%m?z84s;lTI> zuA^v=`(jgdg6Dc}`okyC#m1Z)o#-2`d$7sTZgt+H2MvO&T0662f+v~AqVA;W5vJ9h zG&b4vz{D)3l%{37cfM}F>_q*q0{sq5oDJrF92!531IOlz{AtF6y+^$7cB*aUddcRz zStN1DWu-c_Bd2NbG`?XDtL`H>=q}Q%&4AbUY`BcwLtq;i-++JpUHmTk@RO;17ng0s zC8qaXo?4NmIG0*Lt}uSEJI*{W)7*T2muI|tuo*j%B99s~5jfhssMG}W@kH{bnE`im zfRCHU?)K!mOPPB2aQVGsI^BcImu8U652pAGOcC>-Qq@f_Qs&irxa3-z<3e4HdzYtF zp+=l^{s(|bkddYtCT1d&SPOT{#e?@opB(&Oj>2xHW|^Ur=*wcWYclR@%{ICJ!lY$R zZZRituy@3=?&nNq9>w;Xt0r^y-lmmOv{K~NAHII{)NCyejk#Lb*?eWDQGLuQ+l`0Q zj?cLE(CO|tG-R&h@N@fX7U37cH0Al&mwV!|gKuB;)VM%*8|o^pVv64DG+4SI9jarl zxtC#UZ)V&}56*Eq8`N!}Dcsww<0f5iin(7mbMIqv2d8t)VXCV{buVU5dnmJ0&6E<^n+(qR|_U3&#q~M?<8*yo!G1J#=8Q^g@ zVsdc{aPfb#+)qU#%oG`0?F_SnRO4T6{+H{s7vdIETi2tl?+w#~-o|`KFUru1o=Ht| zPL%JmF29>a%>6o?;B^~Qjio&XzcEu5O}pubN>Aqd*>U-m&7Y^iU`x)j@!LkzDRtH{ zHvZ*gqlf(YmY?#S~nvOd^z6NDhSHC@e%sqiw z7}&n%n4e~HLH9PvenxXLPP%CBf98y7eWZ9P{OW72@tVnu$AK;Me3@D1F~27{W|8g1 z>AiP;aP&-}G~Df7d6lU!E8y337Ji5DW7_$ajC(urnz328Xz;nQ)8m)SgE(+C9iPQT z^@-^+o0&YpOr8xqZQg!>K1CJ}7Vg^V_2iVV_r4#P|A9-fjJX5{cNO!V!Tl4H{Q!mQ znAAC}(>otvoetEHOm9~iPeXH?@igMrFvA2oCX`<^ZqCm|ZM*KkEiixW-EYopq}~ta zc#7>|)*t1zIj$kpAVF@r!BhF*9FgyE(BG^P<_mm>wNA1(wjiFHNTvXnn3wZlh=4 zfK9&@Tvj8EcLha#Tx6?nRa-bsQKjR z6c+5(p!2@Mk336`77KD#nuQdN8O_C^>D95`?xoQ$Jgp75rY++)!5ny)iF%G5wcV~R zG?nt`LvVjo;!Rr8g;sF&CDGSR88^5jSIyi!F4*_XlX;$AO+L3hIc@zKc09VKTlG3E z0u2UEWpVC&T3&0v@le)*K^xgT6ewkGTs7vq9 ze>y!q^;;_9^y$!An^uqDeuL@pNWlGmQs;JOoz>IR(~o$1Mf9e5oo91o6~i5TIO1yU zwTi<3$CFUq!n{&^<-auFuL|yS>aS*Q3^VOklXP}EO*kiX-*;$I^&eaG zm=xSz1P0*_vmxKHl=*(OXCixz@oP8}8|a{>`t2=if6y?l^CcWG4_P`@+syto9Pq2= z7=G>}roviM7JhCzDfOKhgo!E4TTmTj^%tvd*>U9PnEX0Qn+N~5RIm&w>gjjpM%g2w z+5c;t%%~0AllGZa8#tD?%(EL9vv%gx2D%z}^r~aBH+s6n#IVEBMdiQcVRzf*?xzB) zU*NT5@FvB+n46P^A$AkfJg{poWqNP&R3t|eA*K$qS!emS!x@9`ZrJcKy2zbJCoFh# zGB0hSBf%}CySRyACmGX_Ryi_X>?bduJ~nNA9Az47RyT09GdDa+7jH5P@naxUcVI@E z14@lIpQ-Q+Te!z%D>}tA8B-!qI9}VshfSr&8224GXovk{T5i)?;~$x89q7>^a!AANk@nc+Bixca6(&XYtrs<|A;_Xci+y z%rCmpw8DXe7a9c6@O8siqXwrNa3sW{Pj- zdfSpDkZSj;dWBA}5*7&WSl4jKwZg#EBi(6>F zqxoqIy}8XKZ^Z;0oK(zh%mv*Y+Vvc8^v;J0zCeHM+8*$0=nix%+Ejjux&sg1(e8mJ zW*5U;{z(UwEF759{0+e;X<(!ogo(M6nzbm5d9&DtGfSIPq-LJjbp&?e+M0K6;|d6E z<(1@#%`uve%H%Z4(t(@Q2A)WQ3#z&F8OD6Ssqu`5=i1;40-9X;3sG5xmtTfyg(ibZ2UTz(o_FiKiP zlL8B)r~y1cG@daL6gGh3g+~-Gii|rPHK8%%h4UH8O5H-C=->05Fj|`lyQj z9P3>q1DeRM288;OLopr`X#NvC@Vg(Zl}bCISjs|>9)Q6o)~EJfT5*i;B+H%FQZ{fd zJ>Vso4u_5K>*%H!_p7uHmVb9gk0W~e-Zy#ta71vS+!IOvVW=`00G88gE{(T8*L}xf z8IVm*CE(!(O~OO@9yrFs@*g_gUDbYZwT$ae%K>ni2swQLz@xX#p1s2Gv$48uh({0h zQXSN>OKK=B)YFomsD#lz4gfQ9{p0U>bUQ`C^3Y0BXmHTF3?M5F0)k=Sfa#3S^}y4r zVi&!2&ZemVx~KtQ`<4A}p~cK@5uIg9yU>FjSBF?Fi`sK=)>ygcD(%Ejh*~)-h z=wX6z2~1iObY+L$Ic}n83|00SD4n~L31Np1WsSWi51l~i04SpAIKyoPj%l=4+NSAK zn{MGsuT}X1YG63Yj3_n0v67CE`F6z0Va6;BWp`7YmKt&|1tH@>lHMkncuk>KFYro& z7JxEGDSUpM3bzaIn65*+T$J`R|eY`MSIH- z-!xITa`2Q$)(t|>b}FL{H2OZ;`ziMyuy7tMFdj!0Y?#qx9-?=A?^AR&Hs92aek+GN z6W7#}ZkG!qwFMns*BMG@7(w2WrsKmb+Kn{g-%H~$|5|!*2^X=}t*Yc1v}+H%EV%Kt zv*J&wU``h<3%y$z59vB_L0MHGDk>tM3h)+Ak$ALxibgO~Bywj)hbl1HI4Y~e817HF z2ZrHgs-bww~+g73@a+Nl>XFLAE(yDcx zH<(;kvBY)f7IwrRHlC$cMowNb#POE~M@+!8JQ398Huf|Y0EB1i3Fq7`ykos*iOM0C zwN{Y_04T91FO+@`{cWirPSk1X2j#mymd@S-g<)LVVF&1vHUBqzkLbe~~k%;?ku7-`Yo zwD=iZo0I=TajZVRjqjbcva>iA**Uyp~E@B6>o&TvYVw**vWHs$>RH@2#MLP zU*D5kN-=zT7;~n6Hl?ZALrG@*aUZGv6QVX zY@2@mTrgsP+g^}kqu>e7@fLVYaCjh|CVNUAs{@|;o~0Fy(BKkEZ^RG5bfvp!Ew@5R zfO*Q4JnI~bbvd?!csrpW&(5d#>9yf#GkfmsIZG3J)-B0{_q&?7Wn}Cd?>L$F=iFM{ z!(*JX$PaCnhl%Q!Y_aT2WJUzq-O;9Xr!xz4oivGPvwLh-dHv4^=GgZ;y%}FHK^Irw zIh*+1mJ7SlX36&%VKe+qS06r`P3g~sKBMX}h~1M5*B@;DW17$IcW9fUUA1s!MAwjs zmBvW=VWc`U(r-hUmxop13rQfWZSwzpCX@@tF>@D$&W($Rr<~`4W&WL)f=WR)uLaxu zHLryrMgIlC;h`aMQK7No`-cv(p}{e8gCo$M7aKFrVPV3&&;{iET2SS`ej_X%_&*%C B=nnt@ diff --git a/Website/package.json b/Website/package.json index 4639739f2..20b1093a5 100644 --- a/Website/package.json +++ b/Website/package.json @@ -35,7 +35,6 @@ "react-device-detect": "^2.2.2", "react-dom": "^18.2.0", "react-onsenui": "^1.12.0", - "react-onsenuix": "^1.0.6", "react-syntax-highlighter": "^15.5.0" }, "devDependencies": { diff --git a/Website/src/activitys/AcknowledgementsActivity.tsx b/Website/src/activitys/AcknowledgementsActivity.tsx index 28dde450d..a7f75f63a 100644 --- a/Website/src/activitys/AcknowledgementsActivity.tsx +++ b/Website/src/activitys/AcknowledgementsActivity.tsx @@ -1,6 +1,6 @@ -import Toolbar from "@Builders/ToolbarBuilder"; + import { string } from "@Strings"; -import { ActivityXRenderData, Card } from "react-onsenuix"; +import { Card } from "react-onsenui"; import dep from "./../utils/licenses.json"; import depNative from "./../utils/native-licenses.json"; import AppCompatActivity from "./AppCompatActivity"; @@ -26,24 +26,23 @@ class AcknowledgementsActivity extends AppCompatActivity { this.setState({ libs: dep.concat(depNative) }); }; - public onCreateToolbar(): Toolbar.Props { + public onCreateToolbar() { return { title: string.acknowledgements, onBackButton: this.props.popPage, }; } - public onCreate(data: ActivityXRenderData) { + public onCreate() { return ( - {data.s.libs.map((item: any) => { + {this.state.libs.map((item: any) => { return ( { window.open(item.repository); }} @@ -54,14 +53,14 @@ class AcknowledgementsActivity extends AppCompatActivity { {item.name} {item.author} - +

{item.description}
{item.version} {item.license} - +
); diff --git a/Website/src/activitys/AppCompatActivity.tsx b/Website/src/activitys/AppCompatActivity.tsx index 435bf25f8..b3d8ecea8 100644 --- a/Website/src/activitys/AppCompatActivity.tsx +++ b/Website/src/activitys/AppCompatActivity.tsx @@ -1,14 +1,11 @@ -import Toolbar from "@Builders/ToolbarBuilder"; +import { ToolbarBuilder } from "@Builders/ToolbarBuilder"; import ErrorBoundary from "@Components/ErrorBoundary"; -import Constants from "@Native/Constants"; import { os } from "@Native/os"; import SharedPreferences from "@Native/SharedPreferences"; -import React, { Context, createContext, CSSProperties } from "react"; -import { ActivityX, Page } from "react-onsenuix"; - -class AppCompatActivity

extends ActivityX { - public readonly isAndroid: bool = Constants.isAndroid; +import React, { CSSProperties } from "react"; +import { Page } from "react-onsenui"; +abstract class AppCompatActivity

extends React.Component { public pageStyle: React.CSSProperties = {}; private darkColor: string = "#1f1f1f"; @@ -66,10 +63,42 @@ class AppCompatActivity

extends ActivityX { } } + /** + * Creates the activity + */ + public onCreate(): JSX.Element { + return <>; + } + + public onCreateModal(): JSX.Element { + return <>; + } + + public onCreateBottomToolbar(): JSX.Element { + return <>; + } + + public onCreateFAB(): JSX.Element { + return <>; + } + + public onInit(): void {} + + public onShow(): void {} + + public onHide(): void {} + + public onInfiniteScroll(): void {} + + //@ts-ignore + public get pageModifier(): string { + return ""; + } + /** * Renders the Toolbar */ - public onCreateToolbar(): Toolbar.Props | any { + public onCreateToolbar() { return { title: "Default", }; @@ -89,10 +118,10 @@ class AppCompatActivity

extends ActivityX { onShow={this.onShow} onInit={this.onInit} renderToolbar={() => { - return ; + return ; }} > - + ); diff --git a/Website/src/activitys/MainActivity.tsx b/Website/src/activitys/MainActivity.tsx index 90d8fa30e..ce0aab984 100644 --- a/Website/src/activitys/MainActivity.tsx +++ b/Website/src/activitys/MainActivity.tsx @@ -1,6 +1,5 @@ import { Component } from "react"; -import { RouterUtil } from "react-onsenui"; -import { Page, RouterNavigator } from "react-onsenui"; +import { Page, RouterNavigator, RouterUtil } from "react-onsenui"; import MainApplication from "@Activitys/MainApplication"; import Constants from "@Native/Constants"; import NoRootActivity from "./NoRootActivity"; diff --git a/Website/src/activitys/MainApplication.tsx b/Website/src/activitys/MainApplication.tsx index 30725a129..2c144c3da 100644 --- a/Website/src/activitys/MainApplication.tsx +++ b/Website/src/activitys/MainApplication.tsx @@ -4,7 +4,7 @@ import { SettingsRounded } from "@mui/icons-material"; import { os } from "@Native/os"; import SharedPreferences from "@Native/SharedPreferences"; import { string } from "@Strings"; -import { ActivityXRenderData, Tab, Tabbar, TabbarRenderTab, Toolbar } from "react-onsenuix"; +import { Tab, Tabbar, TabbarRenderTab, ToolbarButton } from "react-onsenui"; import AppCompatActivity from "./AppCompatActivity"; import DeviceModuleFragment from "./fragments/DeviceModuleFragment"; import ExploreModuleFragment from "./fragments/ExploreModuleFragment"; @@ -50,9 +50,9 @@ class MainApplication extends AppCompatActivity { title: "Magisk Module Repo Loader", addToolbarButtonPosition: "right", addToolbarButton: ( - + - + ), }; } @@ -75,17 +75,17 @@ class MainApplication extends AppCompatActivity { private renderTabs(): TabbarRenderTab[] { return [ { - content: } />, + content: , tab: , }, { - content: } />, + content: , tab: , }, ]; } - public onCreate(data: ActivityXRenderData) { + public onCreate() { return ( <> {os.isAndroid ? ( diff --git a/Website/src/activitys/NoRootActivity.tsx b/Website/src/activitys/NoRootActivity.tsx index 55afbdf7a..1d16b0f37 100644 --- a/Website/src/activitys/NoRootActivity.tsx +++ b/Website/src/activitys/NoRootActivity.tsx @@ -1,14 +1,13 @@ -import { Button, Card } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; import Toast from "@Native/Toast"; -import Toolbar from "@Builders/ToolbarBuilder"; import { string } from "@Strings"; +import { Button, Card } from "react-onsenui"; class NoRootActivity extends AppCompatActivity { private readonly magiskPackageName: string = "com.topjohnwu.magisk"; private readonly magiskDeltaPackageName: string = "io.github.huskydg.magisk"; - public onCreateToolbar(): Toolbar.Props { + public onCreateToolbar() { return { title: string.no_root, }; diff --git a/Website/src/activitys/RepoActivity.tsx b/Website/src/activitys/RepoActivity.tsx index 8eaefb2ed..bd1655a6e 100644 --- a/Website/src/activitys/RepoActivity.tsx +++ b/Website/src/activitys/RepoActivity.tsx @@ -1,4 +1,3 @@ -import { ActivityXRenderData, AlertDialog, List, Toolbar } from "react-onsenuix"; import AppCompatActivity from "./AppCompatActivity"; import SharedPreferences, { ISharedPreferences } from "@Native/SharedPreferences"; import { @@ -13,7 +12,7 @@ import { import { link, util } from "googlers-tools"; import ons from "onsenui"; import Icon from "@Components/Icon"; -import { AlertDialog as Dialog, Input, Switch, ToolbarButton } from "react-onsenui"; +import { AlertDialog as Dialog, Input, List, ListHeader, ListItem, Switch, ToolbarButton } from "react-onsenui"; import Toast from "@Native/Toast"; import { os } from "@Native/os"; import { OverridableComponent } from "@mui/material/OverridableComponent"; @@ -22,6 +21,7 @@ import axios from "axios"; import { string } from "@Strings"; import { Fragment } from "react"; import { Searchbar } from "@Components/Searchbar"; +import AlertDialog from "@Builders/AlertDialog"; interface Props { pushPage: any; @@ -151,7 +151,7 @@ class RepoActivity extends AppCompatActivity { SharedPreferences.setBoolean(_, true); }); builder.setCancelable(true); - builder.showAlert(); + builder.show(); } } @@ -225,9 +225,9 @@ class RepoActivity extends AppCompatActivity { onBackButton: this.props.popPage, addToolbarButtonPosition: "right", addToolbarButton: ( - + - + ), }; } @@ -264,21 +264,18 @@ class RepoActivity extends AppCompatActivity { } // Some layout atr inspired from @Fox2Code - public onCreate(data: ActivityXRenderData): JSX.Element { - const ListItem = (props: ListItemProps) => { + public onCreate(): JSX.Element { + const MListItem = (props: ListItemProps) => { return ( <> {props.part && ( - +

{props.text}
- + )} ); @@ -289,7 +286,7 @@ class RepoActivity extends AppCompatActivity { }; const filteredRepos = roReposOption() - .concat(data.s.repos) + .concat(this.state.repos) .filter((item) => item.name.toLowerCase().includes(this.state.finalSearchValue.toLowerCase())); return ( @@ -298,11 +295,11 @@ class RepoActivity extends AppCompatActivity { {filteredRepos.map((repo: RepoInterface, index: number) => ( - + {repo.name} {repo.readonly ? " (Read-Only)" : ""} - - + {}} > @@ -330,8 +327,8 @@ class RepoActivity extends AppCompatActivity { }} />
- - + { } }} /> - { } }} /> - { } }} /> - { } }} /> - { super(props); } - public onCreateToolbar(): Toolbar.Props { + public onCreateToolbar() { return { title: "Repo Generator", onBackButton: this.props.popPage, diff --git a/Website/src/activitys/SettingsActivity.tsx b/Website/src/activitys/SettingsActivity.tsx index 1c02ab1ff..6f39840b2 100644 --- a/Website/src/activitys/SettingsActivity.tsx +++ b/Website/src/activitys/SettingsActivity.tsx @@ -1,13 +1,10 @@ -import { List } from "react-onsenuix"; import ListViewBuilder from "@Builders/ListViewBuilder"; import pkg from "@Package"; import AppCompatActivity from "./AppCompatActivity"; import { string } from "@Strings"; -import ons from "onsenui"; import AcknowledgementsActivity from "@Activitys/AcknowledgementsActivity"; import AlertDialog from "@Builders/AlertDialog"; import SharedPreferences, { ISharedPreferences } from "@Native/SharedPreferences"; -import { link } from "googlers-tools"; import { Brightness2Rounded, BugReportRounded, @@ -21,9 +18,9 @@ import BuildConfig from "@Native/BuildConfig"; import { os } from "@Native/os"; import Icon from "@Components/Icon"; import Magisk from "@Native/Magisk"; -import Toolbar from "@Builders/ToolbarBuilder"; import RepoGeneratorActivity from "./RepoGeneratorActivity"; import RepoActivity from "./RepoActivity"; +import { List } from "react-onsenui"; interface Props { pushPage: any; @@ -55,7 +52,7 @@ class SettingsActivity extends AppCompatActivity { this.setState({ libs: Object.keys(pkg.dependencies) }); }; - public onCreateToolbar(): Toolbar.Props { + public onCreateToolbar() { return { title: string.settings, onBackButton: this.props.popPage, @@ -122,7 +119,7 @@ class SettingsActivity extends AppCompatActivity { .setPositiveButton("Yes", (input: string) => { keepDefaultFuntion; }) - .showAlert(); + .show(); }, }, { diff --git a/Website/src/activitys/ViewModuleActivity.tsx b/Website/src/activitys/ViewModuleActivity.tsx index 26cb06ae1..479a1da57 100644 --- a/Website/src/activitys/ViewModuleActivity.tsx +++ b/Website/src/activitys/ViewModuleActivity.tsx @@ -1,5 +1,4 @@ -import { Toolbar as gae, Button, AlertDialog } from "react-onsenuix"; -import { Dialog } from "react-onsenui"; +import { Button, Dialog, ToolbarButton } from "react-onsenui"; import ons from "onsenui"; import axios from "axios"; import { DownloadRounded, InfoRounded, InstallMobileRounded, VerifiedRounded } from "@mui/icons-material"; @@ -10,10 +9,10 @@ import Alert from "@mui/material/Alert"; import AppCompatActivity from "./AppCompatActivity"; import { string } from "@Strings"; import Magisk from "@Native/Magisk"; -import Toolbar from "@Builders/ToolbarBuilder"; import { CSSProperties } from "react"; import { link, util } from "googlers-tools"; import ModuleProps from "@Types/ModuleProps"; +import AlertDialog from "@Builders/AlertDialog"; interface Props { extra: { @@ -70,11 +69,11 @@ class ViewModuleActivity extends AppCompatActivity { builder.setMessage("This module target api is higher than your device api."); builder.setPositiveButton("Ok"); builder.setCancelable(false); - builder.showAlert(); + builder.show(); } }; - public onCreateToolbar = (): Toolbar.Props => { + public onCreateToolbar = () => { // Normal props const { name } = this.state.mProps; // FoxProps @@ -90,9 +89,9 @@ class ViewModuleActivity extends AppCompatActivity { (needRamdisk && needRamdisk) || (changeBoot && changeBoot)) != (null || undefined) ? (
- + - +
) : null} diff --git a/Website/src/activitys/fragments/DeviceModuleFragment.tsx b/Website/src/activitys/fragments/DeviceModuleFragment.tsx index c6d09120c..b9d190e0b 100644 --- a/Website/src/activitys/fragments/DeviceModuleFragment.tsx +++ b/Website/src/activitys/fragments/DeviceModuleFragment.tsx @@ -1,7 +1,6 @@ import { Component } from "react"; import DeviceModule from "@Components/DeviceModule"; import { PushProps } from "@Activitys/MainActivity"; -import { Page } from "react-onsenuix"; import File from "@Native/File"; interface Props { diff --git a/Website/src/builders/AlertDialog.tsx b/Website/src/builders/AlertDialog.tsx index 12b8bd014..27b6928ca 100644 --- a/Website/src/builders/AlertDialog.tsx +++ b/Website/src/builders/AlertDialog.tsx @@ -2,44 +2,41 @@ import ons from "onsenui"; import { isValidElement } from "react"; import { renderToStaticMarkup } from "react-dom/server"; -namespace AlertDialog { - interface Alert { - title: string; - messageHTML: string | JSX.Element; - cancelable: boolean; - callback: Function; - buttons: AlertButtons; - } +interface Alert { + title: string; + messageHTML: string | JSX.Element; + cancelable: boolean; + callback: Function; + buttons: AlertButtons; +} - interface AlertButtons { - positive: AlertButton; - negative: AlertButton; - } +interface AlertButtons { + positive: AlertButton; + negative: AlertButton; +} - interface AlertButton { - title: string; - callback: Function | undefined; - } +interface AlertButton { + title: string; + callback: Function | undefined; +} - interface AlertOptions { - message?: string; - messageHTML?: string | JSX.Element; - buttonLabel?: string; - buttonLabels?: string[]; - primaryButtonIndex?: number; - cancelable?: boolean; - animation?: string; - title?: string; - modifier?: string; - callback?: any; - id?: string; - } +interface AlertOptions { + message?: string; + messageHTML?: string | JSX.Element; + buttonLabel?: string; + buttonLabels?: string[]; + primaryButtonIndex?: number; + cancelable?: boolean; + animation?: string; + title?: string; + modifier?: string; + callback?: any; + id?: string; +} - /** - * Building dialogs - */ - export class Builder { - private dialog: Alert; +abstract class AlertDialog { + public static Builder = class { + dialog: Alert; public constructor() { this.dialog = { @@ -60,15 +57,12 @@ namespace AlertDialog { }; } - /** - * @prompt Not supported - */ - public setTitle(value: string): Builder { + public setTitle(value: string): this { this.dialog.title = value; return this; } - public setMessage(value: string | JSX.Element): Builder { + public setMessage(value: string | JSX.Element): this { if (isValidElement(value)) { this.dialog.messageHTML = renderToStaticMarkup(value); } else { @@ -77,40 +71,24 @@ namespace AlertDialog { return this; } - /** - * @prompt Not supported - */ - public setPositiveButton(title: string, callback?: Function): Builder { + public setPositiveButton(title: string, callback?: Function): this { this.dialog.buttons.positive.title = title; this.dialog.buttons.positive.callback = callback; return this; } - /** - * @prompt Not supported - */ - public setNegativeButtom(title: string, callback?: Function): Builder { + public setNegativeButtom(title: string, callback?: Function): this { this.dialog.buttons.negative.title = title; this.dialog.buttons.negative.callback = callback; return this; } - /** - * Creates an custom callback for an prompt dialog - * @alert Not supported - * @deprecated - */ - public setPromptCallback(callback: Function): Builder { - this.dialog.callback = callback; - return this; - } - - public setCancelable(cancel: boolean): Builder { + public setCancelable(cancel: boolean): this { this.dialog.cancelable = cancel; return this; } - public showAlert(): Alert & Void { + public show(): void { const { positive, negative } = this.dialog.buttons; const { title, messageHTML } = this.dialog; const pla: AlertOptions = { @@ -143,30 +121,7 @@ namespace AlertDialog { // @ts-ignore ons.notification.confirm(pla); } - - public showPrompt(): Alert & Void { - const { positive, negative } = this.dialog.buttons; - const { title, callback, messageHTML, cancelable } = this.dialog; - ons.notification - .prompt({ - // @ts-ignore - messageHTML: messageHTML, - buttonLabels: [negative.title, positive.title], - title: title, - // @ts-ignore - isPrompt: true, - // @ts-ignore - autofocus: true, - // @ts-ignore - submitOnEnter: true, - }) - .then((input) => { - if (typeof positive.callback == "function") { - positive.callback(input); - } - }); - } - } + }; } export default AlertDialog; diff --git a/Website/src/builders/ListViewBuilder.tsx b/Website/src/builders/ListViewBuilder.tsx index a2b0cf3e2..f9c266264 100644 --- a/Website/src/builders/ListViewBuilder.tsx +++ b/Website/src/builders/ListViewBuilder.tsx @@ -1,6 +1,5 @@ import { Component, isValidElement } from "react"; import { ListItem, ListTitle, Select, Switch } from "react-onsenui"; -import { List } from "react-onsenuix"; import ons from "onsenui"; import Gesture from "@Components/Gesture"; import SharedPreferences, { ISharedPreferences } from "@Native/SharedPreferences"; @@ -95,10 +94,10 @@ class ListViewBuilder extends Component { return data.map((header: IListInterface) => ( <>
- {header.title} + {header.title} {header.content.map((item: IListOptions) => ( <> - { } })()}
- + ))} diff --git a/Website/src/builders/ToolbarBuilder.tsx b/Website/src/builders/ToolbarBuilder.tsx index d24c99729..092a29b3c 100644 --- a/Website/src/builders/ToolbarBuilder.tsx +++ b/Website/src/builders/ToolbarBuilder.tsx @@ -1,40 +1,38 @@ import { Component } from "react"; -import { BackButton, Toolbar as Cockbar } from "react-onsenuix"; +import { BackButton, Toolbar } from "react-onsenui"; -namespace Toolbar { - export interface Props { - /** - * It's used to display a title on the toolbar - */ - title: string; - /** - * Due not use it with `addToolbarButton="left"`! - * - * Remove the `onBackButton` attr or put `false` inside! - */ - onBackButton?: boolean; - addToolbarButton?: React.ReactNode; - addToolbarButtonPosition?: "left" | "right"; - modifier?: string; - } +interface Props { + /** + * It's used to display a title on the toolbar + */ + title: string; + /** + * Due not use it with `addToolbarButton="left"`! + * + * Remove the `onBackButton` attr or put `false` inside! + */ + onBackButton?: boolean; + addToolbarButton?: React.ReactNode; + addToolbarButtonPosition?: "left" | "right"; + modifier?: string; +} - export class Builder extends Component { - public render() { - const { title, onBackButton, addToolbarButton, addToolbarButtonPosition, modifier } = this.props; - return ( - -
- {/** +export class ToolbarBuilder extends Component { + public render() { + const { title, onBackButton, addToolbarButton, addToolbarButtonPosition, modifier } = this.props; + return ( + +
+ {/** // @ts-ignore */} - {onBackButton ? : null} - {addToolbarButtonPosition === "left" ? addToolbarButton : null} -
-
{title}
-
{addToolbarButtonPosition === "right" ? addToolbarButton : null}
- - ); - } + {onBackButton ? : null} + {addToolbarButtonPosition === "left" ? addToolbarButton : null} +
+
{title}
+
{addToolbarButtonPosition === "right" ? addToolbarButton : null}
+ + ); } } -export default Toolbar; +export default ToolbarBuilder; diff --git a/Website/src/components/ContentBody.tsx b/Website/src/components/ContentBody.tsx index 5edb43b44..449b5c1ae 100644 --- a/Website/src/components/ContentBody.tsx +++ b/Website/src/components/ContentBody.tsx @@ -2,7 +2,7 @@ import { os } from "@Native/os"; import SharedPreferences from "@Native/SharedPreferences"; import { CSSProperties } from "react"; import { isMobile } from "react-device-detect"; -import { ViewX, ViewXRenderData } from "react-onsenuix"; +import ViewX from "./ViewX"; /** * ContentBody is an optional component, to make the view better on desktop @@ -28,19 +28,19 @@ class ContentBody extends ViewX { } } - public createView(data: ViewXRenderData<{}, {}, HTMLElement>): JSX.Element { + public createView(): JSX.Element { return ( - {data.p.children} + {this.props.children} ); } diff --git a/Website/src/components/DeviceModule.tsx b/Website/src/components/DeviceModule.tsx index 836266849..3ee572dee 100644 --- a/Website/src/components/DeviceModule.tsx +++ b/Website/src/components/DeviceModule.tsx @@ -5,7 +5,7 @@ import Log from "@Native/Log"; import { DeleteRounded, RefreshRounded } from "@mui/icons-material"; import SharedPreferences from "@Native/SharedPreferences"; import { string } from "@Strings"; -import { ViewX, ViewXRenderData } from "react-onsenuix"; +import ViewX from "./ViewX"; interface Props { module: string; @@ -66,18 +66,14 @@ class DeviceModule extends ViewX { } }; - public createView(data: ViewXRenderData): JSX.Element { - const module = data.p.module; - const { id, name, version, versionCode, author, description } = data.s.props; - const { isEnabled, isSwitchDisabled } = data.s; + public createView(): JSX.Element { + const module = this.props.module; + const { id, name, version, versionCode, author, description } = this.state.props; + const { isEnabled, isSwitchDisabled } = this.state; return ( <>
- + diff --git a/Website/src/components/ErrorBoundary.tsx b/Website/src/components/ErrorBoundary.tsx index 056f7fa47..c2aeff7e1 100644 --- a/Website/src/components/ErrorBoundary.tsx +++ b/Website/src/components/ErrorBoundary.tsx @@ -1,6 +1,7 @@ import Log from "@Native/Log"; import { ErrorInfo, ReactNode } from "react"; -import { Page, Toolbar, ViewX, ViewXRenderData } from "react-onsenuix"; +import { Page, Toolbar } from "react-onsenui"; +import ViewX from "./ViewX"; interface Props { children: ReactNode; @@ -47,21 +48,22 @@ class ErrorBoundary extends ViewX { ); } - public createView(data: ViewXRenderData): JSX.Element { - if (data.s.hasError) { + public createView(): JSX.Element { + const { hasError, errorInfo } = this.state; + if (hasError) { return ( ( - Something went wrong +
Something went wrong
 )} > -

{data.s.errorInfo?.componentStack}

+

{errorInfo?.componentStack}

 ); } - return data.p.children as any; + return this.props.children as any; } } diff --git a/Website/src/components/ExploreModule.tsx b/Website/src/components/ExploreModule.tsx index 64875090a..b498bc679 100644 --- a/Website/src/components/ExploreModule.tsx +++ b/Website/src/components/ExploreModule.tsx @@ -8,7 +8,7 @@ import { VerifiedRounded } from "@mui/icons-material"; import { os } from "@Native/os"; import { isDesktop, isTablet } from "react-device-detect"; import { dom, link } from "googlers-tools"; -import { ViewX, ViewXRenderData } from "react-onsenuix"; +import ViewX from "./ViewX"; import { string } from "@Strings"; import ModuleProps from "@Types/ModuleProps"; @@ -108,9 +108,9 @@ class ExploreModule extends ViewX { } } - public createView(data: ViewXRenderData): JSX.Element { - const { notesUrl, downloadUrl, pushPage, moduleOptions, stars, last_update, getId } = data.p; - const { props } = data.s; + public createView(): JSX.Element { + const { notesUrl, downloadUrl, pushPage, moduleOptions, stars, last_update, getId } = this.props; + const { props } = this.state; const isVerified = moduleOptions[getId]?.verified; const _display = moduleOptions[getId]?.display; diff --git a/Website/src/components/Gesture.tsx b/Website/src/components/Gesture.tsx index a0ab8ff36..e8d19b024 100644 --- a/Website/src/components/Gesture.tsx +++ b/Website/src/components/Gesture.tsx @@ -1,6 +1,6 @@ import { createRef, RefObject, ReactNode } from "react"; import { dom } from "googlers-tools"; -import { ViewX, ViewXRenderData } from "react-onsenuix"; +import ViewX from "./ViewX"; interface Props { event: @@ -42,8 +42,8 @@ class Gesture extends ViewX { }); } - public createView(data: ViewXRenderData): JSX.Element { - return
{data.p.children}
; + public createView(): JSX.Element { + return
{this.props.children}
; } } diff --git a/Website/src/components/HighlightMarkdown.tsx b/Website/src/components/HighlightMarkdown.tsx index 80b564b3a..b54e16211 100644 --- a/Website/src/components/HighlightMarkdown.tsx +++ b/Website/src/components/HighlightMarkdown.tsx @@ -1,6 +1,6 @@ import Markdown from "markdown-to-jsx"; import { createRef, RefObject } from "react"; -import { ViewX, ViewXRenderData } from "react-onsenuix"; +import ViewX from "./ViewX"; import Anchor from "./dapi/Anchor"; import Video from "./dapi/Video"; import DiscordWidget from "./dapi/DiscordWidget"; @@ -30,7 +30,7 @@ class HighlightedMarkdown extends ViewX { }); } - public createView(data: ViewXRenderData): JSX.Element { + public createView(): JSX.Element { return (
{ }, }, }} - children={data.p.children} + children={this.props.children} />
); diff --git a/Website/src/components/Icon.tsx b/Website/src/components/Icon.tsx index 246943408..f7bb8ad89 100644 --- a/Website/src/components/Icon.tsx +++ b/Website/src/components/Icon.tsx @@ -1,7 +1,7 @@ import { OverridableComponent } from "@mui/material/OverridableComponent"; import { SvgIconProps, SvgIconTypeMap } from "@mui/material/SvgIcon"; import SharedPreferences, { ISharedPreferences } from "@Native/SharedPreferences"; -import { ViewX, ViewXRenderData } from "react-onsenuix"; +import ViewX from "./ViewX"; interface IProps extends SvgIconProps { icon: OverridableComponent; @@ -26,14 +26,15 @@ class Icon extends ViewX { this.createView = this.createView.bind(this); } - public createView(data: ViewXRenderData): JSX.Element { + public createView(): JSX.Element { + const { keepLight, ...rest } = this.props; return ( ); } diff --git a/Website/src/components/Searchbar.tsx b/Website/src/components/Searchbar.tsx index 3142838b0..d9d27a012 100644 --- a/Website/src/components/Searchbar.tsx +++ b/Website/src/components/Searchbar.tsx @@ -1,6 +1,6 @@ import { SearchRounded } from "@mui/icons-material"; -import { SearchInput } from "react-onsenui"; -import { Button, ViewX, ViewXRenderData } from "react-onsenuix"; +import { Button, SearchInput } from "react-onsenui"; +import ViewX from "./ViewX"; interface SearchbarProps { placeholder: string; @@ -14,7 +14,9 @@ class Searchbar extends ViewX { this.createView = this.createView.bind(this); } - public createView(data: ViewXRenderData): JSX.Element { + public createView(): JSX.Element { + const { placeholder, onInputChange, onButtonClick } = this.props; + return (
{ }} >