From b39c21d193597f29a554e96ac5ce0124ca3352cc Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 24 Nov 2020 18:32:15 +0200 Subject: [PATCH 01/14] Style fixes on Admin --- src/components/AdminHeader.tsx | 5 +-- src/components/AdminSidebar.tsx | 42 +++++++++++++++---- .../AdminSidebarLink/AdminSidebarLink.scss | 26 ------------ .../AdminSidebarLink/AdminSidebarLink.tsx | 25 ----------- src/components/AdminSidebarLink/index.ts | 2 - src/pages/admin/AdminCommonPage.scss | 1 + src/pages/admin/JobAdCreatePage.tsx | 3 +- 7 files changed, 37 insertions(+), 67 deletions(-) delete mode 100644 src/components/AdminSidebarLink/AdminSidebarLink.scss delete mode 100644 src/components/AdminSidebarLink/AdminSidebarLink.tsx delete mode 100644 src/components/AdminSidebarLink/index.ts diff --git a/src/components/AdminHeader.tsx b/src/components/AdminHeader.tsx index 3967cff..f8d05c1 100644 --- a/src/components/AdminHeader.tsx +++ b/src/components/AdminHeader.tsx @@ -4,8 +4,6 @@ import { Link } from "react-router-dom"; import TitleImage from "@assets/img/SIK_RGB_W_side.png"; const Header = styled.header` - margin: 0.5rem; - a { max-width: 100%; display: flex; @@ -13,6 +11,7 @@ const Header = styled.header` align-items: center; img { + margin: 0.5rem; padding: 2rem; width: 100%; max-width: 800px; @@ -21,7 +20,7 @@ const Header = styled.header` `; const AdminHeader: React.FC = () => ( -
+
diff --git a/src/components/AdminSidebar.tsx b/src/components/AdminSidebar.tsx index 3dffe0a..81b7c57 100644 --- a/src/components/AdminSidebar.tsx +++ b/src/components/AdminSidebar.tsx @@ -1,6 +1,7 @@ import React from "react"; import styled from "styled-components"; -import AdminSidebarLink from "./AdminSidebarLink"; +import Anchor from "@components/Anchor"; +import { colors } from "@theme/colors"; interface AdminSidebarProps { path: string; @@ -9,8 +10,8 @@ interface AdminSidebarProps { const SideBar = styled.nav` display: flex; flex-flow: column nowrap; - align-self: stretch; margin-right: 1rem; + background-color: ${colors.blue1}; @media screen and (max-width: 800px - 1px) { margin-right: 0; @@ -18,15 +19,38 @@ const SideBar = styled.nav` } `; +const StyledLink = styled(Anchor)<{path: string}>` + padding: 1rem 3rem 1rem 1rem; + letter-spacing: 3px; + text-transform: uppercase; + line-height: 20px; + font-weight: bold; + white-space: nowrap; + color: ${colors.white}; + border-left: 4px solid transparent; + + ${p => p.path === p.to && ` + border-left: 4px solid ${colors.white}; + `} + + &:hover { + border-left: 4px solid ${colors.white}; + } + + @media screen and (max-width: 800px - 1px) { + margin-bottom: 1px; + } +`; + const AdminSidebar: React.FC = ({ path }) => ( - Home - Events - Feed - Signup forms - Job advertisements - Files - Logout + Home › + Events › + Feed › + Signup forms › + Job advertisements › + Files › + Logout › ); diff --git a/src/components/AdminSidebarLink/AdminSidebarLink.scss b/src/components/AdminSidebarLink/AdminSidebarLink.scss deleted file mode 100644 index 27028ec..0000000 --- a/src/components/AdminSidebarLink/AdminSidebarLink.scss +++ /dev/null @@ -1,26 +0,0 @@ -@import "../../assets/scss/globals"; - - -.admin-sidebar-link { - padding: 1rem 3rem 1rem 1rem; - background-color: color(blue1); - letter-spacing: 3px; - text-transform: uppercase; - line-height: 20px; - font-weight: bold; - border-left: 4px solid color(blue1); - white-space: nowrap; - - @media screen and (max-width: 800px - 1px) { - margin-bottom: 1px; - } - - &:hover, - &.active { - border-left: 4px solid color(white1); - } - - &::after { - content: " ›"; - } -} diff --git a/src/components/AdminSidebarLink/AdminSidebarLink.tsx b/src/components/AdminSidebarLink/AdminSidebarLink.tsx deleted file mode 100644 index e77888b..0000000 --- a/src/components/AdminSidebarLink/AdminSidebarLink.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import React from "react"; -import Anchor from "../Anchor"; -import "./AdminSidebarLink.scss"; - -export interface AdminSidebarLinkProps { - to: string; - path: string; - id?: string; -} -export interface AdminSidebarLinkState { } - -class AdminSidebarLink extends React.Component { - render() { - const { to, path, children, id } = this.props; - const activeClass = to === path ? "active" : ""; - - return ( - - {children} - - ); - } -} - -export default AdminSidebarLink; diff --git a/src/components/AdminSidebarLink/index.ts b/src/components/AdminSidebarLink/index.ts deleted file mode 100644 index d87b2bf..0000000 --- a/src/components/AdminSidebarLink/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -import AdminSidebarLink from "./AdminSidebarLink"; -export default AdminSidebarLink; diff --git a/src/pages/admin/AdminCommonPage.scss b/src/pages/admin/AdminCommonPage.scss index 5d7d8ef..68e6fe3 100644 --- a/src/pages/admin/AdminCommonPage.scss +++ b/src/pages/admin/AdminCommonPage.scss @@ -3,6 +3,7 @@ .admin-container { display: flex; + color: color(white1); background-color: color(dark-blue); flex-flow: row nowrap; justify-content: flex-start; diff --git a/src/pages/admin/JobAdCreatePage.tsx b/src/pages/admin/JobAdCreatePage.tsx index 2ae1706..c2cf584 100644 --- a/src/pages/admin/JobAdCreatePage.tsx +++ b/src/pages/admin/JobAdCreatePage.tsx @@ -14,9 +14,8 @@ const widgets = { }; const buildSchema = (title: string) => { - const date = new Date(); const monthFromNow = new Date(); - monthFromNow.setDate(date.getDate() + 30); + monthFromNow.setDate(new Date().getDate() + 30); const schema = { title, From 1d418028276e03a6941b6229cdeed5117b5c4f82 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 24 Nov 2020 18:43:24 +0200 Subject: [PATCH 02/14] Unfiy admin create page style files --- ...dCreatePage.scss => AdminCreateCommon.tsx} | 14 +++-- src/pages/admin/AdminFeedPage.tsx | 4 +- src/pages/admin/EventCreatePage.scss | 55 ------------------- src/pages/admin/EventCreatePage.tsx | 7 ++- src/pages/admin/FeedCreatePage.tsx | 6 +- src/pages/admin/JobAdCreatePage.tsx | 5 +- src/pages/admin/SignupCreatePage.scss | 55 ------------------- src/pages/admin/SignupCreatePage.tsx | 6 +- 8 files changed, 23 insertions(+), 129 deletions(-) rename src/pages/admin/{FeedCreatePage.scss => AdminCreateCommon.tsx} (73%) delete mode 100644 src/pages/admin/EventCreatePage.scss delete mode 100644 src/pages/admin/SignupCreatePage.scss diff --git a/src/pages/admin/FeedCreatePage.scss b/src/pages/admin/AdminCreateCommon.tsx similarity index 73% rename from src/pages/admin/FeedCreatePage.scss rename to src/pages/admin/AdminCreateCommon.tsx index cfd6b3b..3351d96 100644 --- a/src/pages/admin/FeedCreatePage.scss +++ b/src/pages/admin/AdminCreateCommon.tsx @@ -1,7 +1,7 @@ -@import "../../assets/scss/globals"; +import styled from "styled-components"; +import { colors }from "@theme/colors"; - -.post-create-page { +const AdminCreateCommon = styled.main` width: 100%; fieldset { @@ -35,8 +35,8 @@ } button { - background-color: color(blue1); - color: color(white1); + background-color: ${colors.blue1}; + color: ${colors.white}; padding: 0.5rem 1rem; border: none; outline: none; @@ -52,4 +52,6 @@ } } } -} +`; + +export default AdminCreateCommon; diff --git a/src/pages/admin/AdminFeedPage.tsx b/src/pages/admin/AdminFeedPage.tsx index d8c0257..fc685f7 100644 --- a/src/pages/admin/AdminFeedPage.tsx +++ b/src/pages/admin/AdminFeedPage.tsx @@ -8,10 +8,10 @@ import { formatRelative } from "date-fns"; import { th } from "date-fns/esm/locale"; import AddIcon from "@assets/img/add-icon.png"; -export interface AdminFeedPageProps { +interface AdminFeedPageProps { staticContext: StaticContext; } -export interface AdminFeedPageState { +interface AdminFeedPageState { feed: Post[]; error?: string; } diff --git a/src/pages/admin/EventCreatePage.scss b/src/pages/admin/EventCreatePage.scss deleted file mode 100644 index 6766a0c..0000000 --- a/src/pages/admin/EventCreatePage.scss +++ /dev/null @@ -1,55 +0,0 @@ -@import "../../assets/scss/globals"; - - -.event-create-page { - width: 100%; - - fieldset { - border: none; - padding: 0; - margin: 1rem 0; - } - - option { - padding: 4px 8px; - cursor: pointer; - } - - input[type="text"], - textarea { - padding: 0.5rem 0.5rem; - border: none; - overflow: visible; - box-sizing: border-box; - } - - input[type="text"], - textarea, - select { - width: 100% !important; - } - - legend { - font-weight: bold; - margin: 0.5rem 0; - } - - button { - background-color: color(blue1); - color: color(white1); - padding: 0.5rem 1rem; - border: none; - outline: none; - cursor: pointer; - } - - .checkbox { - label { - display: flex; - - input { - margin-right: 0.5rem; - } - } - } -} diff --git a/src/pages/admin/EventCreatePage.tsx b/src/pages/admin/EventCreatePage.tsx index 9b3dead..8d18881 100644 --- a/src/pages/admin/EventCreatePage.tsx +++ b/src/pages/admin/EventCreatePage.tsx @@ -1,7 +1,7 @@ import React from "react"; import { Helmet } from "react-helmet"; -import "./EventCreatePage.scss"; import Form from "react-jsonschema-form"; +import AdminCreateCommon from "./AdminCreateCommon"; import { Tag, getTags } from "@models/Tag"; import { SignupForm, getForms } from "@models/SignupForm"; import { createEvent, getEvent, updateEvent, Event } from "@models/Event"; @@ -9,6 +9,7 @@ import DatetimeWidget from "@components/Widgets/DatetimeWidget/DatetimeWidget"; import SectionDividerWidget from "@components/Widgets/SectionDividerWidget/SectionDividerWidget"; import MarkdownEditorWidget from "@components/Widgets/MarkdownEditorWidget"; + const widgets = { datetime: DatetimeWidget, section_divider: SectionDividerWidget, @@ -312,7 +313,7 @@ class EventCreatePage extends React.Component + @@ -328,7 +329,7 @@ class EventCreatePage extends React.Component {error &&
{error}
} - + ); } } diff --git a/src/pages/admin/FeedCreatePage.tsx b/src/pages/admin/FeedCreatePage.tsx index 58a022e..b3a01a4 100644 --- a/src/pages/admin/FeedCreatePage.tsx +++ b/src/pages/admin/FeedCreatePage.tsx @@ -2,7 +2,7 @@ import React from "react"; import { Helmet } from "react-helmet"; import Form from "react-jsonschema-form"; import { RouteComponentProps } from "react-router-dom"; -import "./FeedCreatePage.scss"; +import AdminCreateCommon from "./AdminCreateCommon"; import { Tag, getTags } from "@models/Tag"; import { createPost, getPost, updatePost } from "@models/Feed"; import DatetimeWidget from "@components/Widgets/DatetimeWidget/DatetimeWidget"; @@ -206,7 +206,7 @@ class FeedCreatePage extends React.Component + @@ -222,7 +222,7 @@ class FeedCreatePage extends React.Component {error &&
{error}
} - + ); } } diff --git a/src/pages/admin/JobAdCreatePage.tsx b/src/pages/admin/JobAdCreatePage.tsx index c2cf584..b1d7f24 100644 --- a/src/pages/admin/JobAdCreatePage.tsx +++ b/src/pages/admin/JobAdCreatePage.tsx @@ -2,6 +2,7 @@ import React, { useEffect, useState } from "react"; import { Helmet } from "react-helmet"; import Form from "react-jsonschema-form"; import { RouteComponentProps } from "react-router-dom"; +import AdminCreateCommon from "./AdminCreateCommon"; import { JobAd, getJobAd, createJobAd, updateJobAd } from "@models/JobAd"; import DatetimeWidget from "@components/Widgets/DatetimeWidget/DatetimeWidget"; import SectionDividerWidget from "@components/Widgets/SectionDividerWidget/SectionDividerWidget"; @@ -159,7 +160,7 @@ const JobAdCreatePage: React.FC = ({ match: { params: { id : "Create Ad"; return ( -
+ @@ -176,7 +177,7 @@ const JobAdCreatePage: React.FC = ({ match: { params: { id onError={onError} onFocus={onFocus} /> {error &&
{error}
} -
+ ); } diff --git a/src/pages/admin/SignupCreatePage.scss b/src/pages/admin/SignupCreatePage.scss deleted file mode 100644 index e22bd08..0000000 --- a/src/pages/admin/SignupCreatePage.scss +++ /dev/null @@ -1,55 +0,0 @@ -@import "../../assets/scss/globals"; - - -.signup-create-page { - width: 100%; - - fieldset { - border: none; - padding: 0; - margin: 1rem 0; - } - - option { - padding: 4px 8px; - cursor: pointer; - } - - input[type="text"], - textarea { - padding: 0.5rem 0.5rem; - border: none; - overflow: visible; - box-sizing: border-box; - } - - input[type="text"], - textarea, - select { - width: 100%; - } - - legend { - font-weight: bold; - margin: 0.5rem 0; - } - - button { - background-color: color(blue1); - color: color(white1); - padding: 0.5rem 1rem; - border: none; - outline: none; - cursor: pointer; - } - - .checkbox { - label { - display: flex; - - input { - margin-right: 0.5rem; - } - } - } -} diff --git a/src/pages/admin/SignupCreatePage.tsx b/src/pages/admin/SignupCreatePage.tsx index 77a53c1..c8ba0ce 100644 --- a/src/pages/admin/SignupCreatePage.tsx +++ b/src/pages/admin/SignupCreatePage.tsx @@ -1,8 +1,8 @@ import React from "react"; import { Helmet } from "react-helmet"; import { Link } from "react-router-dom"; -import "./SignupCreatePage.scss"; import Form from "react-jsonschema-form"; +import AdminCreateCommon from "./AdminCreateCommon"; import { createForm, getForm, updateForm, SignupForm } from "@models/SignupForm"; import DatetimeWidget from "@components/Widgets/DatetimeWidget/DatetimeWidget"; import SignupQuestionsWidget from "@components/Widgets/SignupQuestionsWidget"; @@ -205,7 +205,7 @@ class SignupCreatePage extends React.Component + @@ -224,7 +224,7 @@ class SignupCreatePage extends React.Component {error &&
{error}
} - + ); } } From 0849cafc6567317ea5536d0277a615b7d122c245 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 24 Nov 2020 19:01:24 +0200 Subject: [PATCH 03/14] Type fixes --- src/models/Feed.ts | 7 +++++-- src/pages/admin/EventCreatePage.tsx | 8 ++++---- src/pages/admin/FeedCreatePage.tsx | 10 +++++----- src/pages/admin/JobAdCreatePage.tsx | 2 -- src/pages/admin/SignupCreatePage.tsx | 20 ++++++++++---------- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/models/Feed.ts b/src/models/Feed.ts index 633381d..a209d8d 100644 --- a/src/models/Feed.ts +++ b/src/models/Feed.ts @@ -5,6 +5,9 @@ const url = `${process.env.API_URL}/feed/`; export interface Post { id: number; + tags: number[]; + visible: boolean; + image: string; title_fi: string; title_en: string; description_fi: string; @@ -13,10 +16,10 @@ export interface Post { content_en: string; publish_time: string; autohide: string; - tags: number[]; - visible: boolean; + autohide_enabled: boolean; } + export async function getFeed(): Promise { try { const resp = await axios.get(url); diff --git a/src/pages/admin/EventCreatePage.tsx b/src/pages/admin/EventCreatePage.tsx index 8d18881..9ba2d5d 100644 --- a/src/pages/admin/EventCreatePage.tsx +++ b/src/pages/admin/EventCreatePage.tsx @@ -4,7 +4,7 @@ import Form from "react-jsonschema-form"; import AdminCreateCommon from "./AdminCreateCommon"; import { Tag, getTags } from "@models/Tag"; import { SignupForm, getForms } from "@models/SignupForm"; -import { createEvent, getEvent, updateEvent, Event } from "@models/Event"; +import { Event, createEvent, getEvent, updateEvent } from "@models/Event"; import DatetimeWidget from "@components/Widgets/DatetimeWidget/DatetimeWidget"; import SectionDividerWidget from "@components/Widgets/SectionDividerWidget/SectionDividerWidget"; import MarkdownEditorWidget from "@components/Widgets/MarkdownEditorWidget"; @@ -31,7 +31,7 @@ export interface EventCreatePageState { signupForm: SignupForm[]; error?: string; statusMessage?: string; - formData: any; + formData: Event; } class EventCreatePage extends React.Component { @@ -40,7 +40,7 @@ class EventCreatePage extends React.Component { @@ -29,7 +29,7 @@ class FeedCreatePage extends React.Component = ({ match: { params: { id const onChange = (data) => setFormData(data.formData); const onFocus = () => setStatusMessage(null); - - const title = formData?.id ? `Edit Ad "${formData.title_fi}"` : "Create Ad"; diff --git a/src/pages/admin/SignupCreatePage.tsx b/src/pages/admin/SignupCreatePage.tsx index c8ba0ce..46bcd04 100644 --- a/src/pages/admin/SignupCreatePage.tsx +++ b/src/pages/admin/SignupCreatePage.tsx @@ -3,7 +3,7 @@ import { Helmet } from "react-helmet"; import { Link } from "react-router-dom"; import Form from "react-jsonschema-form"; import AdminCreateCommon from "./AdminCreateCommon"; -import { createForm, getForm, updateForm, SignupForm } from "@models/SignupForm"; +import { SignupForm, createForm, getForm, updateForm } from "@models/SignupForm"; import DatetimeWidget from "@components/Widgets/DatetimeWidget/DatetimeWidget"; import SignupQuestionsWidget from "@components/Widgets/SignupQuestionsWidget"; import MarkdownEditorWidget from "@components/Widgets/MarkdownEditorWidget"; @@ -32,14 +32,14 @@ export interface SignupCreatePageProps { export interface SignupCreatePageState { error?: string; statusMessage?: string; - formData: any; + formData: SignupForm; } class SignupCreatePage extends React.Component { constructor(props: SignupCreatePageProps) { super(props); this.state = { - formData: {}, + formData: {} as SignupForm, }; const {id} = props.match.params; @@ -54,7 +54,7 @@ class SignupCreatePage extends React.Component - +

{title}

{statusMessage &&
{statusMessage}
} {formData.id &&

- Check out the signup form here: {formData.title} + Check out the signup form here: {formData.title_fi}

}
Date: Tue, 24 Nov 2020 21:02:47 +0200 Subject: [PATCH 04/14] FC Admin object creation pages --- .../Widgets/DatetimeWidget/DatetimeWidget.tsx | 65 ++- .../SectionDividerWidget.tsx | 19 +- .../SignupQuestionsWidget.tsx | 67 ++- src/models/Feed.ts | 3 +- src/pages/admin/AdminCreateCommon.tsx | 69 ++- src/pages/admin/EventCreatePage.tsx | 485 ++++++++---------- src/pages/admin/FeedCreatePage.tsx | 355 ++++++------- src/pages/admin/JobAdCreatePage.tsx | 42 +- src/pages/admin/SignupCreatePage.tsx | 329 +++++------- 9 files changed, 661 insertions(+), 773 deletions(-) diff --git a/src/components/Widgets/DatetimeWidget/DatetimeWidget.tsx b/src/components/Widgets/DatetimeWidget/DatetimeWidget.tsx index 9ace004..ee95f00 100644 --- a/src/components/Widgets/DatetimeWidget/DatetimeWidget.tsx +++ b/src/components/Widgets/DatetimeWidget/DatetimeWidget.tsx @@ -1,7 +1,7 @@ import React from "react"; import "./DatetimeWidget.scss"; -export interface DatetimeWidgetProps { +interface DatetimeWidgetProps { value: string; onChange: (value: string) => void; onFocus: () => void; @@ -9,42 +9,37 @@ export interface DatetimeWidgetProps { required: boolean; disabled: boolean; } -export interface DatetimeWidgetState { } -class DatetimeWidget extends React.Component { - render() { - const { value, onChange, onFocus, onBlur, required, disabled } = this.props; - - let date; - let time; - if (value && value.length !== 0) { - let rest; - [date, rest] = value.split("T"); - time = rest.slice(0, 5); - } - - const commonProps = { - onFocus, - onBlur, - required, - disabled, - }; - - return ( -
- onChange(`${event.target.value}T${time}`)} - value={date} - {...commonProps} /> - onChange(`${date}T${event.target.value}:00`)} - value={time} - {...commonProps} /> -
- ); +const DatetimeWidget: React.FC = ({ value, onChange, onFocus, onBlur, required, disabled }) => { + let date; + let time; + if (value && value.length !== 0) { + let rest; + [date, rest] = value.split("T"); + time = rest.slice(0, 5); } + + const commonProps = { + onFocus, + onBlur, + required, + disabled, + }; + + return ( +
+ onChange(`${event.target.value}T${time}`)} + value={date} + {...commonProps} /> + onChange(`${date}T${event.target.value}:00`)} + value={time} + {...commonProps} /> +
+ ); } export default DatetimeWidget; diff --git a/src/components/Widgets/SectionDividerWidget/SectionDividerWidget.tsx b/src/components/Widgets/SectionDividerWidget/SectionDividerWidget.tsx index 9662e9d..465d0e4 100644 --- a/src/components/Widgets/SectionDividerWidget/SectionDividerWidget.tsx +++ b/src/components/Widgets/SectionDividerWidget/SectionDividerWidget.tsx @@ -3,10 +3,9 @@ import "./SectionDividerWidget.scss"; import Icon from "../../Icon"; import { IconType } from "../../Icon/Icon"; -export interface SectionDividerWidgetProps { +interface SectionDividerWidgetProps { label: string; } -export interface SectionDividerWidgetState { } const getIconByLabel = (label: string) => { if (label === "Finnish") { @@ -19,16 +18,10 @@ const getIconByLabel = (label: string) => { return null; } -class SectionDividerWidget extends React.Component { - render() { - const { label } = this.props; - - return ( -

- {label} {getIconByLabel(label)} -

- ); - } -} +const SectionDividerWidget: React.FC = ({ label }) => ( +

+ {label} {getIconByLabel(label)} +

+); export default SectionDividerWidget; diff --git a/src/components/Widgets/SignupQuestionsWidget/SignupQuestionsWidget.tsx b/src/components/Widgets/SignupQuestionsWidget/SignupQuestionsWidget.tsx index 361dd81..c7d3173 100644 --- a/src/components/Widgets/SignupQuestionsWidget/SignupQuestionsWidget.tsx +++ b/src/components/Widgets/SignupQuestionsWidget/SignupQuestionsWidget.tsx @@ -6,23 +6,21 @@ import AddIcon from "@assets/img/add-icon.png"; import "./SignupQuestionsWidget.scss"; import QuestionList from "./QuestionList"; -export interface SignupQuestionsWidgetProps { +interface SignupQuestionsWidgetProps { value: string; onChange: (value: string) => void; onFocus: () => void; required: boolean; disabled: boolean; } -export interface SignupQuestionsWidgetState { } -class SignupQuestionsWidget extends React.Component { - onValueChange = (questions: Question[]) => { - const { onChange } = this.props; +const SignupQuestionsWidget: React.FC = ({ value, onFocus, onChange }) => { + const onValueChange = (questions: Question[]) => { const newValue = JSON.stringify(questions); onChange(newValue); } - handleNewRowClick = (questions) => () => { + const handleNewRowClick = (questions) => () => { const newRow: Question = { id: shortid.generate(), name: `Question #${questions.length + 1}`, @@ -31,47 +29,42 @@ class SignupQuestionsWidget extends React.Component (result) => { + const handleDragEnd = (questions: Question[]) => (result) => { const srcIndex = result.source.index; const dstIndex = result.destination.index; const srcCopy = { ...questions[srcIndex] }; questions.splice(srcIndex, 1); questions.splice(dstIndex, 0, srcCopy); - this.onValueChange(questions); + onValueChange(questions); } + const questions = JSON.parse(value) as Question[]; - render() { - const { value, onFocus } = this.props; - - const questions = JSON.parse(value) as Question[]; - - return ( -
- - - {(provided) => ( - - )} - - - -
- ); - } + return ( +
+ + + {(provided) => ( + + )} + + + +
+ ); } export default SignupQuestionsWidget; diff --git a/src/models/Feed.ts b/src/models/Feed.ts index a209d8d..c77a62b 100644 --- a/src/models/Feed.ts +++ b/src/models/Feed.ts @@ -1,11 +1,12 @@ import axios from "axios"; import { getAuthHeader } from "@utils/auth"; +import { Tag } from "./Tag"; const url = `${process.env.API_URL}/feed/`; export interface Post { id: number; - tags: number[]; + tags: Tag[]; visible: boolean; image: string; title_fi: string; diff --git a/src/pages/admin/AdminCreateCommon.tsx b/src/pages/admin/AdminCreateCommon.tsx index 3351d96..5d15354 100644 --- a/src/pages/admin/AdminCreateCommon.tsx +++ b/src/pages/admin/AdminCreateCommon.tsx @@ -1,7 +1,13 @@ +import React from "react"; import styled from "styled-components"; +import Form, { ISubmitEvent, IChangeEvent, ErrorSchema } from "react-jsonschema-form"; import { colors }from "@theme/colors"; +import { Event } from "@models/Event"; +import { Post } from "@models/Feed"; +import { SignupForm } from "@models/SignupForm"; +import { JobAd } from "@models/JobAd"; -const AdminCreateCommon = styled.main` +const Common = styled.main` width: 100%; fieldset { @@ -54,4 +60,65 @@ const AdminCreateCommon = styled.main` } `; +type FormTypes = Event | SignupForm | Post | JobAd; + +type AdminCreateCommonProps = { + title: string; + formData?: FormTypes; + schema: { + [name: string]: any; + }; + UISchema: { + [name: string]: any; + }; + onChange: (e: IChangeEvent, es?: ErrorSchema) => any; + onFocus: (id: string, value: string | number | boolean) => void; + onSubmit: (e: ISubmitEvent) => any; + statusMessage: string; + error: string; + widgets: { + [name: string]: any; + }; +} + +const AdminCreateCommon: React.FC = ({ + title, + formData, + schema, + UISchema, + onChange, + onFocus, + onSubmit, + statusMessage, + error, + widgets +}) => { + + const onError = (data: any) => { + console.error("error, data:"); + console.log(data); + } + + return ( + +

{title}

+ {statusMessage &&
{statusMessage}
} + + + {error && ( +
{error}
+ )} + + ) +} + export default AdminCreateCommon; diff --git a/src/pages/admin/EventCreatePage.tsx b/src/pages/admin/EventCreatePage.tsx index 9ba2d5d..8185174 100644 --- a/src/pages/admin/EventCreatePage.tsx +++ b/src/pages/admin/EventCreatePage.tsx @@ -1,6 +1,6 @@ -import React from "react"; +import React, { useEffect, useState } from "react"; import { Helmet } from "react-helmet"; -import Form from "react-jsonschema-form"; +import { RouteComponentProps } from "react-router-dom"; import AdminCreateCommon from "./AdminCreateCommon"; import { Tag, getTags } from "@models/Tag"; import { SignupForm, getForms } from "@models/SignupForm"; @@ -16,89 +16,184 @@ const widgets = { markdownEditor: MarkdownEditorWidget }; -export interface EventCreatePageProps { - history: { - push: (to: string) => void; +const buildSchema = (formData: Event, signupForms: SignupForm[], tags: Tag[]) => { + const date = new Date(), tomorrowDate = new Date(); + const currentDatetime = date.toISOString(); + tomorrowDate.setDate(tomorrowDate.getDate() + 1); + const tomorrowDatetime = tomorrowDate.toISOString(); + + const schema = { + title: formData?.id ? formData.title_fi : "New Event", + type: "object", + required: ["title_fi", "title_en", "tags", "location_fi", "location_en", "start_time", "end_time", "description_fi", "description_en", "content_fi", "content_en"], + properties: { + tags: { + type: "array", + title: "Event tags", + items: { + type: "number", + enum: tags.map(t => t.id), + enumNames: tags.map(t => t.name_fi), + }, + uniqueItems: true, + default: [], + }, + visible: { + type: "boolean", + title: "Visible", + default: true, + }, + start_time: { + type: "string", + title: "Start time", + default: currentDatetime, + }, + end_time: { + type: "string", + title: "End time", + default: tomorrowDatetime, + }, + signupForm: { + type: "array", + title: "Signup forms", + items: { + type: "number", + // TODO: A bug here, DB must have at least one SignupForm, otherwise cannot submit + enum: signupForms.map(form => form.id), + enumNames: signupForms.map(form => form.title_fi), + }, + uniqueItems: true, + }, + image: { + type: ["string", "null"], + format: formData?.image ? "uri-reference" : "data-url", + title: "Override tag icon with image", + default: undefined + }, + finnish_section_divider: { + title: "Finnish", + type: "string", + }, + title_fi: { + type: "string", + title: "Title", + default: "" + }, + description_fi: { + type: "string", + title: "Description", + default: "", + }, + content_fi: { + type: "string", + title: "Content", + default: "", + }, + location_fi: { + type: "string", + title: "Location", + default: "", + }, + english_section_divider: { + title: "English", + type: "string", + }, + title_en: { + type: "string", + title: "Title", + default: "" + }, + description_en: { + type: "string", + title: "Description", + default: "", + }, + content_en: { + type: "string", + title: "Content", + default: "", + }, + location_en: { + type: "string", + title: "Location", + default: "", + }, + } }; - match: { - params: { - id?: number; - }; - }; -} -export interface EventCreatePageState { - tags: Tag[]; - signupForm: SignupForm[]; - error?: string; - statusMessage?: string; - formData: Event; + return schema; } -class EventCreatePage extends React.Component { - constructor(props) { - super(props); - this.state = { - tags: [], - signupForm: [], - formData: {} as Event, - }; +const buildUISchema = () => { + const uiSchema = { + content_fi: { + "ui:widget": "markdownEditor", + }, + content_en: { + "ui:widget": "markdownEditor", + }, + start_time: { + "ui:widget": "datetime", + }, + end_time: { + "ui:widget": "datetime", + }, + image: { + "ui:options": { + accept: [".jpg", ".jpeg", ".png"] + } + }, + finnish_section_divider: { + "ui:widget": "section_divider", + "ui:options": { + label: false + }, + }, + english_section_divider: { + "ui:widget": "section_divider", + "ui:options": { + label: false + }, + }, + }; + return uiSchema; +} - this.fetchTags(); - this.fetchSignupForms(); +interface MatchParams { + id?: string; +} - const { id } = props.match.params; - if (id !== undefined) { - this.fetchInitialFormData(id); +type EventCreatePageProps = RouteComponentProps; + +const EventCreatePage: React.FC = ({ match: { params: { id } } }) => { + const [formData, setFormData] = useState(null); + const [tags, setTags] = useState([]); + const [signupForms, setSignupForms] = useState([]); + const [error, setError] = useState(null); + const [statusMessage, setStatusMessage] = useState(null); + + useEffect(() => { + + getTags() + .then(res => setTags(res)) + .catch(err => setError(err)) + + getForms(true) + .then(res => setSignupForms(res)) + .catch(err => setError(err)) + + const eventId = id && Number(id); + if (eventId !== undefined) { + getEvent(eventId, true) + .then(res => setFormData({ + ...res, + tags: (res.tags).map(inst => inst.id) as any, + signupForm: (res.signupForm).map(inst => inst.id) as any, + })) + .catch(err => setError(err)) } - } + }, [id]) - fetchInitialFormData = async (id) => { - try { - const data = await getEvent(id, true); - data.tags = (data.tags as any).map(inst => inst.id); - data.signupForm = (data.signupForm as any).map(inst => inst.id); - this.setState({ - formData: data, - }); - } catch (err) { - this.setState({ - error: String(err), - }); - } - } - - fetchTags = async () => { - try { - const tags = await getTags(); - this.setState({ - tags, - }); - return tags; - } catch (err) { - this.setState({ - error: String(err), - }); - throw err; - } - } - - fetchSignupForms = async () => { - try { - const signupForm = await getForms(true); - this.setState({ - signupForm - }) - return signupForm; - } catch (err) { - this.setState({ - error: String(err), - }); - throw err; - } - } - - onSubmit = async (data) => { - const { history } = this.props; + const onSubmit = async (data) => { try { const payload = data.formData; payload.signup_id = payload.signupForm; @@ -113,10 +208,8 @@ class EventCreatePage extends React.Component inst.id); resp.tags = data.formData.tags; resp.signupForm = data.formData.signupForm; - this.setState({ - formData: resp, - statusMessage: "Event created successfully", - }); + setStatusMessage("Event created successfully"); + setFormData(resp); } else { const resp = await updateEvent(payload); // TODO: Backend return old data because of Prefetch (used for filtering invisble signupForms from GET) @@ -125,213 +218,39 @@ class EventCreatePage extends React.Component inst.id); resp.tags = data.formData.tags; resp.signupForm = data.formData.signupForm; - this.setState({ - formData: resp, - statusMessage: "Event updated successfully", - }); + setStatusMessage("Event updated successfully"); + setFormData(resp); } } catch (err) { - this.setState({ - error: String(err), - }); + setError(err); } } - onError = (data) => { - console.error("error, data:"); - console.log(this.state.formData); - console.log(data); - } + const onChange = (data) => setFormData(data.formData); + const onFocus = () => setStatusMessage(null); + const title = formData?.id + ? `Edit Event "${formData.title_fi}"` + : "Create Event"; - onChange = (data) => { - this.setState({ - formData: data.formData, - }); - } - - onFocus = () => { - this.setState({ - statusMessage: null, - }); - } - - buildSchema = () => { - const { tags, signupForm, error } = this.state; - - const formData = this.state.formData as Event; - - const date = new Date(); - const currentDatetime = date.toISOString(); - const tomorrowDate = new Date(); - tomorrowDate.setDate(tomorrowDate.getDate() + 1); - const tomorrowDatetime = tomorrowDate.toISOString(); - - const schema = { - title: formData.id ? formData.title_fi : "New Event", - type: "object", - required: ["title_fi", "title_en", "tags", "location_fi", "location_en", "start_time", "end_time", "description_fi", "description_en", "content_fi", "content_en"], - properties: { - tags: { - type: "array", - title: "Event tags", - items: { - type: "number", - enum: tags.map(t => t.id), - enumNames: tags.map(t => t.name_fi), - }, - uniqueItems: true, - default: [], - }, - visible: { - type: "boolean", - title: "Visible", - default: true, - }, - start_time: { - type: "string", - title: "Start time", - default: currentDatetime, - }, - end_time: { - type: "string", - title: "End time", - default: tomorrowDatetime, - }, - signupForm: { - type: "array", - title: "Signup forms", - items: { - type: "number", - // TODO: A bug here, DB must have at least one SignupForm, otherwise cannot submit - enum: signupForm.map(form => form.id), - enumNames: signupForm.map(form => form.title_fi), - }, - uniqueItems: true, - }, - image: { - type: ["string", "null"], - format: formData.image ? "uri-reference" : "data-url", - title: "Override tag icon with image", - default: undefined - }, - finnish_section_divider: { - title: "Finnish", - type: "string", - }, - title_fi: { - type: "string", - title: "Title", - default: "" - }, - description_fi: { - type: "string", - title: "Description", - default: "", - }, - content_fi: { - type: "string", - title: "Content", - default: "", - }, - location_fi: { - type: "string", - title: "Location", - default: "", - }, - english_section_divider: { - title: "English", - type: "string", - }, - title_en: { - type: "string", - title: "Title", - default: "" - }, - description_en: { - type: "string", - title: "Description", - default: "", - }, - content_en: { - type: "string", - title: "Content", - default: "", - }, - location_en: { - type: "string", - title: "Location", - default: "", - }, - } - }; - return schema; - } - - buildUISchema = () => { - const uiSchema = { - content_fi: { - "ui:widget": "markdownEditor", - }, - content_en: { - "ui:widget": "markdownEditor", - }, - start_time: { - "ui:widget": "datetime", - }, - end_time: { - "ui:widget": "datetime", - }, - image: { - "ui:options": { - accept: [".jpg", ".jpeg", ".png"] - } - }, - finnish_section_divider: { - "ui:widget": "section_divider", - "ui:options": { - label: false - }, - }, - english_section_divider: { - "ui:widget": "section_divider", - "ui:options": { - label: false - }, - }, - }; - return uiSchema; - } - - render() { - const { error, statusMessage } = this.state; - const { formData } = this.state; - const schema = this.buildSchema(); - const uiSchema = this.buildUISchema(); - - const title = formData.id - ? `Edit Event "${formData.title_fi}"` - : "Create Event"; - - return ( - - - - -

{title}

- {statusMessage &&
{statusMessage}
} - - {error &&
{error}
} - - ); - } + return ( + <> + + + + + + ); } export default EventCreatePage; diff --git a/src/pages/admin/FeedCreatePage.tsx b/src/pages/admin/FeedCreatePage.tsx index 48fda70..5fc580e 100644 --- a/src/pages/admin/FeedCreatePage.tsx +++ b/src/pages/admin/FeedCreatePage.tsx @@ -1,230 +1,209 @@ -import React from "react"; +import React, { useEffect, useState } from "react"; import { Helmet } from "react-helmet"; -import Form from "react-jsonschema-form"; import { RouteComponentProps } from "react-router-dom"; import AdminCreateCommon from "./AdminCreateCommon"; import { Tag, getTags } from "@models/Tag"; import { Post, createPost, getPost, updatePost } from "@models/Feed"; import DatetimeWidget from "@components/Widgets/DatetimeWidget/DatetimeWidget"; +import SectionDividerWidget from "@components/Widgets/SectionDividerWidget/SectionDividerWidget"; +import MarkdownEditorWidget from "@components/Widgets/MarkdownEditorWidget"; const widgets = { datetime: DatetimeWidget, + section_divider: SectionDividerWidget, + markdownEditor: MarkdownEditorWidget }; +const buildSchema = (formData: Post, tags: Tag[]) => { + const date = new Date(); + const currentDatetime = date.toISOString(); + + const schema = { + title: formData?.id ? formData.title_fi : "New Post", + type: "object", + required: ["title_fi", "title_en", "description_fi", "description_en", "content_fi", "content_en", "publish_time"], + properties: { + tags: { + type: "array", + title: "Post tags", + items: { + type: "number", + enum: tags.map(t => t.id), + enumNames: tags.map(t => t.name_fi), + }, + uniqueItems: true, + default: [], + }, + visible: { + type: "boolean", + title: "Visible", + default: true, + }, + publish_time: { + type: "string", + title: "Publish time", + default: currentDatetime, + }, + autohide_enabled: { + type: "boolean", + title: "Autohide enabled", + default: false, + }, + autohide: { + type: "string", + title: "Autohide time", + default: "", + }, + finnish_section_divider: { + title: "Finnish", + type: "string", + }, + title_fi: { + type: "string", + title: "Title", + default: "" + }, + description_fi: { + type: "string", + title: "Description", + default: "", + }, + content_fi: { + type: "string", + title: "Content", + default: "", + }, + english_section_divider: { + title: "English", + type: "string", + }, + title_en: { + type: "string", + title: "Title", + default: "" + }, + description_en: { + type: "string", + title: "Description", + default: "", + }, + content_en: { + type: "string", + title: "Content", + default: "", + }, + } + }; + return schema; +} + +const buildUISchema = (formData: Post) => { + const uiSchema = { + content_fi: { + "ui:widget": "markdownEditor", + }, + content_en: { + "ui:widget": "markdownEditor", + }, + publish_time: { + "ui:widget": "datetime", + }, + autohide: { + "ui:widget": formData && formData.autohide_enabled ? "datetime" : "hidden", + }, + finnish_section_divider: { + "ui:widget": "section_divider", + "ui:options": { + label: false + }, + }, + english_section_divider: { + "ui:widget": "section_divider", + "ui:options": { + label: false + }, + }, + }; + return uiSchema; +} + interface MatchParams { id?: string; } type FeedCreatePageProps = RouteComponentProps; -export interface FeedCreatePageState { - tags: Tag[]; - error?: string; - statusMessage?: string; - formData: Post; -} +const FeedCreatePage: React.FC = ({ match: { params: { id } } }) => { + const [formData, setFormData] = useState(null); + const [tags, setTags] = useState([]); + const [error, setError] = useState(null); + const [statusMessage, setStatusMessage] = useState(null); -class FeedCreatePage extends React.Component { - constructor(props) { - super(props); - this.state = { - tags: [], - formData: {} as Post, - }; + useEffect(() => { - this.fetchTags(); + getTags() + .then(res => setTags(res)) + .catch(err => setError(err)) - const {id} = props.match.params; - if (id !== undefined) { - this.fetchInitialFormData(id); + const feedId = id && Number(id); + if (feedId !== undefined) { + getPost(feedId) + // getPost(feedId, true) + .then(res => setFormData({ + ...res, + tags: (res.tags).map(inst => inst.id) as any, + })) + .catch(err => setError(err)) } - } - - fetchInitialFormData = async (id) => { - try { - const data = await getPost(id); - // data.tags = data.tag_id; - this.setState({ - formData: data, - }); - } catch (err) { - this.setState({ - error: String(err), - }); - } - } - - fetchTags = async () => { - const getTagsPromise = getTags(); - try { - const tags = await getTagsPromise; - this.setState({ - tags, - }); - return getTagsPromise; - } catch (err) { - this.setState({ - error: String(err), - }); - } - } - - onSubmit = async (data) => { - console.log("submitted, data:"); - console.log(data); + }, [id]) + const onSubmit = async (data) => { try { const payload = data.formData; payload.tag_id = payload.tags; payload.autohide = payload.autohide || new Date(); - if (payload.id === undefined) { const resp = await createPost(payload); // resp.tags = resp.tags; - this.setState({ - formData: resp, - statusMessage: "Post created successfully", - }); + setStatusMessage("Post created successfully"); + setFormData(resp); } else { const resp = await updatePost(payload); // resp.tags = resp.tag_id; - this.setState({ - formData: resp, - statusMessage: "Post updated successfully.", - }); + setStatusMessage("Post updated successfully"); + setFormData(resp); } } catch (err) { - this.setState({ - error: String(err), - }); + setError(err); } } - onError = (data) => { - console.error("error, data:"); - console.log(data); - } + const onChange = (data) => setFormData(data.formData); + const onFocus = () => setStatusMessage(null); - onChange = (data) => { - this.setState({ - formData: data.formData, - }); - } + const title = formData?.id + ? `Edit Post "${formData.title_fi}"` + : "Create Post"; - onFocus = () => { - this.setState({ - statusMessage: null, - }); - } - - buildSchema = () => { - const { tags, error, formData } = this.state; - - const date = new Date(); - const currentDatetime = date.toISOString(); - - const schema = { - title: formData.id ? formData.title_fi : "New Post", - type: "object", - required: ["title", "description", "content", "publish_time"], - properties: { - title: { - type: "string", - title: "Title", - default: "" - }, - tags: { - type: "array", - title: "Post tags", - items: { - type: "number", - enum: tags.map(t => t.id), - enumNames: tags.map(t => t.name_fi), - }, - uniqueItems: true, - default: [], - }, - description: { - type: "string", - title: "Description", - default: "", - }, - content: { - type: "string", - title: "Content", - default: "", - }, - publish_time: { - type: "string", - title: "Publish time", - default: currentDatetime, - }, - autohide_enabled: { - type: "boolean", - title: "Autohide enabled", - default: false, - }, - autohide: { - type: "string", - title: "Autohide time", - default: "", - }, - visible: { - type: "boolean", - title: "Visible", - default: true, - } - } - }; - return schema; - } - - buildUISchema = () => { - const { formData } = this.state; - const { autohide_enabled } = formData; - const uiSchema = { - content: { - "ui:widget": "textarea", - }, - publish_time: { - "ui:widget": "datetime", - }, - autohide: { - "ui:widget": autohide_enabled ? "datetime" : "hidden", - }, - }; - return uiSchema; - } - - render() { - const { error, formData, statusMessage } = this.state; - const schema = this.buildSchema(); - const uiSchema = this.buildUISchema(); - - const title = formData.id - ? `Edit Post "${formData.title_fi}"` - : "Create Post"; - - return ( - - - - -

{title}

- {statusMessage &&
{statusMessage}
} - - {error &&
{error}
} - - ); - } + return ( + <> + + + + + + ); } export default FeedCreatePage; diff --git a/src/pages/admin/JobAdCreatePage.tsx b/src/pages/admin/JobAdCreatePage.tsx index 08d26b1..02bbbaa 100644 --- a/src/pages/admin/JobAdCreatePage.tsx +++ b/src/pages/admin/JobAdCreatePage.tsx @@ -1,6 +1,5 @@ import React, { useEffect, useState } from "react"; import { Helmet } from "react-helmet"; -import Form from "react-jsonschema-form"; import { RouteComponentProps } from "react-router-dom"; import AdminCreateCommon from "./AdminCreateCommon"; import { JobAd, getJobAd, createJobAd, updateJobAd } from "@models/JobAd"; @@ -14,12 +13,12 @@ const widgets = { markdownEditor: MarkdownEditorWidget }; -const buildSchema = (title: string) => { +const buildSchema = (formData: JobAd) => { const monthFromNow = new Date(); monthFromNow.setDate(new Date().getDate() + 30); const schema = { - title, + title: formData?.id ? formData.title_fi : "New Job Ad", type: "object", required: ["title_fi", "title_en", "description_fi", "description_en", "content_fi", "content_en", "autohide_at", "autohide_enabled", "visible"], properties: { @@ -105,8 +104,6 @@ const buildUISchema = (formData: JobAd) => ({ }, }); - - interface MatchParams { id?: string; } @@ -114,21 +111,19 @@ interface MatchParams { type JobAdCreatePageProps = RouteComponentProps; const JobAdCreatePage: React.FC = ({ match: { params: { id } } }) => { - const [formData, setFormData] = useState(null); + const [error, setError] = useState(null); + const [statusMessage, setStatusMessage] = useState(null); useEffect(() => { const jobId = id && Number(id); if (jobId !== undefined) { getJobAd(jobId, true) .then(res => setFormData(res)) + .catch(err => setError(err)) } }, [id]) - - const [error, setError] = useState(null); - const [statusMessage, setStatusMessage] = useState(null); - const onSubmit = async (data) => { try { const payload = data.formData; @@ -146,10 +141,6 @@ const JobAdCreatePage: React.FC = ({ match: { params: { id } } - const onError = (data) => { - console.error("error, data:"); - console.log(data); - } const onChange = (data) => setFormData(data.formData); const onFocus = () => setStatusMessage(null); @@ -158,24 +149,23 @@ const JobAdCreatePage: React.FC = ({ match: { params: { id : "Create Ad"; return ( - + <> -

{title}

- {statusMessage &&
{statusMessage}
} - - {error &&
{error}
} - + statusMessage={statusMessage} + error={error} + widgets={widgets} + /> + ); } diff --git a/src/pages/admin/SignupCreatePage.tsx b/src/pages/admin/SignupCreatePage.tsx index 46bcd04..a64e52e 100644 --- a/src/pages/admin/SignupCreatePage.tsx +++ b/src/pages/admin/SignupCreatePage.tsx @@ -1,7 +1,6 @@ -import React from "react"; +import React, { useEffect, useState } from "react"; import { Helmet } from "react-helmet"; -import { Link } from "react-router-dom"; -import Form from "react-jsonschema-form"; +import { RouteComponentProps } from "react-router-dom"; import AdminCreateCommon from "./AdminCreateCommon"; import { SignupForm, createForm, getForm, updateForm } from "@models/SignupForm"; import DatetimeWidget from "@components/Widgets/DatetimeWidget/DatetimeWidget"; @@ -9,62 +8,119 @@ import SignupQuestionsWidget from "@components/Widgets/SignupQuestionsWidget"; import MarkdownEditorWidget from "@components/Widgets/MarkdownEditorWidget"; import { buildValidationSchema } from "@views/SignUpPage/FormUtils"; -const widgets = { - datetime: DatetimeWidget, - signup: SignupQuestionsWidget, - markdownEditor: MarkdownEditorWidget -}; const DEFAULT_EMAIL = `Moikka, Ilmottautuminen saapui perille.` ; -export interface SignupCreatePageProps { - history: { - push: (to: string) => void; + +const widgets = { + datetime: DatetimeWidget, + signup: SignupQuestionsWidget, + markdownEditor: MarkdownEditorWidget +}; + +const buildSchema = (formData: SignupForm) => { + const date = new Date(); + const currentDatetime = date.toISOString(); + const tomorrowDate = new Date(); + tomorrowDate.setDate(tomorrowDate.getDate() + 1); + const tomorrowDatetime = tomorrowDate.toISOString(); + + const schema = { + title: formData?.id ? formData.title_fi : "New Sign-up form", + type: "object", + required: ["title_fi", "title_en", "start_time", "end_time", "questions"], + properties: { + title_fi: { + type: "string", + title: "Title (FI)", + default: "", + }, + title_en: { + type: "string", + title: "Title (EN)", + default: "", + }, + visible: { + type: "boolean", + title: "Visible", + default: false, + }, + quota: { + type: "integer", + title: "Quota", + minimum: 0, + default: 0, + }, + start_time: { + type: "string", + title: "Start time", + default: currentDatetime, + }, + end_time: { + type: "string", + title: "End time", + default: tomorrowDatetime, + }, + email_content: { + type: "string", + title: "Email on signup", + default: DEFAULT_EMAIL + }, + questions: { + type: "string", + title: "Questions", + default: "[]", + }, + }, }; - match: { - params: { - id?: number; - }; - }; -} -export interface SignupCreatePageState { - error?: string; - statusMessage?: string; - formData: SignupForm; + return schema; } -class SignupCreatePage extends React.Component { - constructor(props: SignupCreatePageProps) { - super(props); - this.state = { - formData: {} as SignupForm, - }; +const buildUISchema = () => { + const uiSchema = { + email_content: { + "ui:widget": "markdownEditor", + }, + start_time: { + "ui:widget": "datetime", + }, + end_time: { + "ui:widget": "datetime", + }, + questions: { + "ui:widget": "signup", + }, + }; + return uiSchema; +} - const {id} = props.match.params; - if (id !== undefined) { - this.fetchInitialFormData(id); +interface MatchParams { + id?: string; +} + +type SignupCreatePageProps = RouteComponentProps; + +const SignupCreatePage: React.FC = ({ match: { params: { id } } }) => { + const [formData, setFormData] = useState(null); + const [error, setError] = useState(null); + const [statusMessage, setStatusMessage] = useState(null); + useEffect(() => { + const suId = id && Number(id); + if (suId !== undefined) { + getForm(suId, true) + .then(res => { + setFormData({ + ...res, + questions: JSON.stringify(res.questions) as any + }); + }) + .catch(err => setError(err)) } - } + }, [id]) - fetchInitialFormData = async (id: number) => { - try { - const data = await getForm(id, true); - this.setState({ - formData: { - ...data, - questions: JSON.stringify(data.questions) as any - }, - }); - } catch (err) { - this.setState({ - error: String(err), - }); - } - } - - onSubmit = async (data: any) => { + const onSubmit = async (data: any) => { try { const questions = JSON.parse(data.formData.questions); const payload: SignupForm = { @@ -75,158 +131,53 @@ class SignupCreatePage extends React.Component { - console.error("error, data:"); - console.log(data); - } + const onChange = (data) => setFormData(data.formData); + const onFocus = () => setStatusMessage(null); - onChange = (data) => { - this.setState({ - formData: data.formData, - }); - } + const title = formData?.id + ? `Edit Sign-up Form "${formData.title_fi}"` + : "Create Sign-up form"; - onFocus = () => { - this.setState({ - statusMessage: null, - }); - } - - buildSchema = () => { - const { error, formData } = this.state; - - const date = new Date(); - const currentDatetime = date.toISOString(); - const tomorrowDate = new Date(); - tomorrowDate.setDate(tomorrowDate.getDate() + 1); - const tomorrowDatetime = tomorrowDate.toISOString(); - - const schema = { - title: formData.id ? formData.title_fi : "New Sign-up form", - type: "object", - required: ["title_fi", "title_en", "start_time", "end_time", "questions"], - properties: { - title_fi: { - type: "string", - title: "Title (FI)", - default: "", - }, - title_en: { - type: "string", - title: "Title (EN)", - default: "", - }, - visible: { - type: "boolean", - title: "Visible", - default: false, - }, - quota: { - type: "integer", - title: "Quota", - minimum: 0, - default: 0, - }, - start_time: { - type: "string", - title: "Start time", - default: currentDatetime, - }, - end_time: { - type: "string", - title: "End time", - default: tomorrowDatetime, - }, - email_content: { - type: "string", - title: "Email on signup", - default: DEFAULT_EMAIL - }, - questions: { - type: "string", - title: "Questions", - default: "[]", - }, - }, - }; - return schema; - } - - buildUISchema = () => { - const uiSchema = { - email_content: { - "ui:widget": "markdownEditor", - }, - start_time: { - "ui:widget": "datetime", - }, - end_time: { - "ui:widget": "datetime", - }, - questions: { - "ui:widget": "signup", - }, - }; - return uiSchema; - } - - render() { - const { error, formData, statusMessage } = this.state; - const schema = this.buildSchema(); - const uiSchema = this.buildUISchema(); - - const title = formData.id - ? `Edit Sign-up Form "${formData.title_fi}"` - : "Create Sign-up form"; - - return ( - - - - -

{title}

- {statusMessage &&
{statusMessage}
} - {formData.id &&

+ return ( + <> + + + + + {/* {formData.id &&

Check out the signup form here: {formData.title_fi} -

} - - {error &&
{error}
} - - ); - } +

} */} + + ); } export default SignupCreatePage; From c025c59f4e1b0b6cca6cbdd2d9752c27007cafb9 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 24 Nov 2020 21:46:12 +0200 Subject: [PATCH 05/14] Unify admin list pages --- src/models/Event.ts | 8 +- src/models/Feed.ts | 9 +- src/pages/admin/AdminEventPage.scss | 20 ---- src/pages/admin/AdminEventPage.tsx | 155 +++++++++----------------- src/pages/admin/AdminFeedPage.scss | 20 ---- src/pages/admin/AdminFeedPage.tsx | 156 +++++++++------------------ src/pages/admin/AdminFrontPage.scss | 6 -- src/pages/admin/AdminFrontPage.tsx | 26 ----- src/pages/admin/AdminFrontView.tsx | 13 +++ src/pages/admin/AdminJobAdPage.tsx | 5 +- src/pages/admin/AdminListCommon.tsx | 22 ++++ src/pages/admin/AdminLoginPage.scss | 5 - src/pages/admin/AdminLoginPage.tsx | 16 ++- src/pages/admin/AdminSignupPage.scss | 26 ----- src/pages/admin/AdminSignupPage.tsx | 154 +++++++++----------------- src/routes.tsx | 4 +- 16 files changed, 218 insertions(+), 427 deletions(-) delete mode 100644 src/pages/admin/AdminEventPage.scss delete mode 100644 src/pages/admin/AdminFeedPage.scss delete mode 100644 src/pages/admin/AdminFrontPage.scss delete mode 100644 src/pages/admin/AdminFrontPage.tsx create mode 100644 src/pages/admin/AdminFrontView.tsx create mode 100644 src/pages/admin/AdminListCommon.tsx delete mode 100644 src/pages/admin/AdminLoginPage.scss delete mode 100644 src/pages/admin/AdminSignupPage.scss diff --git a/src/models/Event.ts b/src/models/Event.ts index fd951f2..a29c236 100644 --- a/src/models/Event.ts +++ b/src/models/Event.ts @@ -23,7 +23,13 @@ export interface Event { signupForm: SignupForm[]; } -export async function getEvents(options: any = {}): Promise { +interface Options { + onlyNonPast?: boolean; + limit?: number; + auth?: boolean; +} + +export async function getEvents(options: Options = {}): Promise { const { onlyNonPast, limit, auth } = options; try { const params = { diff --git a/src/models/Feed.ts b/src/models/Feed.ts index c77a62b..cd33b38 100644 --- a/src/models/Feed.ts +++ b/src/models/Feed.ts @@ -20,10 +20,15 @@ export interface Post { autohide_enabled: boolean; } +interface Options { + auth?: boolean; +} -export async function getFeed(): Promise { +export async function getFeed(options: Options = {}): Promise { + const { auth } = options; + const headers = auth ? { "Authorization": getAuthHeader() } : null; try { - const resp = await axios.get(url); + const resp = await axios.get(url, { headers }); return resp.data["results"]; } catch (err) { console.error(err); diff --git a/src/pages/admin/AdminEventPage.scss b/src/pages/admin/AdminEventPage.scss deleted file mode 100644 index adaa320..0000000 --- a/src/pages/admin/AdminEventPage.scss +++ /dev/null @@ -1,20 +0,0 @@ -@import "../../assets/scss/globals"; - - -.admin-event-page { - table { - border-collapse: collapse; - } - - table, - th, - td { - border: 1px solid color(white1); - padding: 0.5rem; - - a { - color: color(orange1); - text-decoration: underline; - } - } -} diff --git a/src/pages/admin/AdminEventPage.tsx b/src/pages/admin/AdminEventPage.tsx index e21ff2b..1070d2e 100644 --- a/src/pages/admin/AdminEventPage.tsx +++ b/src/pages/admin/AdminEventPage.tsx @@ -1,118 +1,63 @@ -import React from "react"; +import React, { useEffect, useState } from "react"; import { Helmet } from "react-helmet"; -import Anchor from "@components/Anchor"; import { formatRelative } from "date-fns"; - -import "./AdminEventPage.scss"; -import { Event, getEvents } from "@models/Event"; -import { StaticContext } from "@server/StaticContext"; +import AdminListCommon from "./AdminListCommon"; +import Anchor from "@components/Anchor"; import AddIcon from "@assets/img/add-icon.png"; +import { Event, getEvents } from "@models/Event"; +const URL = "/admin/events" -export interface AdminEventPageProps { - staticContext: StaticContext; -} -export interface AdminEventPageState { - events: Event[]; - error?: string; -} +const renderAddLink = () => ( + + Create event + +) -class AdminEventPage extends React.Component { - constructor(props: AdminEventPageProps) { - super(props); - const { staticContext } = props; - - if (staticContext) { - /* The static context is an object that manages promises when - rendering on the server. If staticContext exists, that means - we have to store all promises in it. Otherwise, operate - normally. See server/index.ts. */ - if (staticContext.resolutions.getEvents) { - const events = staticContext.resolutions.getEvents as Event[]; - this.state = { - events, - }; - } else { - this.state = { - events: [], - }; - const promiseEvents = this.fetchEvents(); - staticContext.promises.getEvents = promiseEvents; - } - } else { - this.state = { - events: [], - }; - this.fetchEvents(); - } +const renderData = (events: Event[]) => { + if (!events || events.length === 0) { + return
No events.
; } - fetchEvents = async () => { - const getEventsPromise = getEvents({ auth: true }); - try { - const events = await getEventsPromise; - this.setState({ - events, - }); - return getEventsPromise; - } catch (err) { - this.setState({ - error: String(err), - }); - } - } - - renderAddLink = () => ( - - Create event - - ) - - renderData = () => { - const { events, error } = this.state; - - if (error) { - return
{error}
; - } - - if (!events || events.length === 0) { - return
No events.
; - } - - return ( - - - - - - + return ( +
TitleStart timeEnd time
+ + + + + + + + + {events.map(event => ( + + + + - - - {events.map(event => ( - - - - - - ))} - -
TitleStart timeEnd time
{event.title_fi}{formatRelative(new Date(event.start_time), new Date())}{formatRelative(new Date(event.end_time), new Date())}
{event.title_fi}{formatRelative(new Date(event.start_time), new Date())}{formatRelative(new Date(event.end_time), new Date())}
- ); - } + ))} + + + ); +} +const AdminEventPage: React.FC = () => { + const [events, setEvents] = useState(null); - render() { - return ( -
- - - -

Events

- {this.renderAddLink()} - {this.renderData()} -
- ); - } + useEffect(() => { + getEvents({ auth: true }) + .then(res => setEvents(res)) + }, []); + + return ( + + + + +

Feed

+ {renderAddLink()} + {renderData(events)} + + ); } export default AdminEventPage; diff --git a/src/pages/admin/AdminFeedPage.scss b/src/pages/admin/AdminFeedPage.scss deleted file mode 100644 index 9d04a29..0000000 --- a/src/pages/admin/AdminFeedPage.scss +++ /dev/null @@ -1,20 +0,0 @@ -@import "../../assets/scss/globals"; - - -.admin-feed-page { - table { - border-collapse: collapse; - } - - table, - th, - td { - border: 1px solid color(white1); - padding: 0.5rem; - - a { - color: color(orange1); - text-decoration: underline; - } - } -} diff --git a/src/pages/admin/AdminFeedPage.tsx b/src/pages/admin/AdminFeedPage.tsx index fc685f7..414fb1f 100644 --- a/src/pages/admin/AdminFeedPage.tsx +++ b/src/pages/admin/AdminFeedPage.tsx @@ -1,117 +1,65 @@ -import React from "react"; +import React, { useEffect, useState } from "react"; import { Helmet } from "react-helmet"; -import Anchor from "@components/Anchor"; -import "./AdminFeedPage.scss"; -import { StaticContext } from "@server/StaticContext"; -import { Post, getFeed } from "@models/Feed"; import { formatRelative } from "date-fns"; -import { th } from "date-fns/esm/locale"; +import AdminListCommon from "./AdminListCommon"; +import Anchor from "@components/Anchor"; import AddIcon from "@assets/img/add-icon.png"; +import { Post, getFeed } from "@models/Feed"; -interface AdminFeedPageProps { - staticContext: StaticContext; -} -interface AdminFeedPageState { - feed: Post[]; - error?: string; -} +const URL = "/admin/feed" -class AdminFeedPage extends React.Component { - constructor(props: AdminFeedPageProps) { - super(props); - const { staticContext } = props; - if (staticContext) { - /* The static context is an object that manages promises when - rendering on the server. If staticContext exists, that means - we have to store all promises in it. Otherwise, operate - normally. See server/index.ts. */ - if (staticContext.resolutions.getFeed) { - const feed = staticContext.resolutions.getFeed as Post[]; - this.state = { - feed, - }; - } else { - this.state = { - feed: [], - }; - const promiseFeed = this.fetchFeed(); - staticContext.promises.getFeed = promiseFeed; - } - } else { - this.state = { - feed: [], - }; - this.fetchFeed(); - } +const renderAddLink = () => ( + + Create post + +) + +const renderData = (feed: Post[]) => { + if (!feed || feed.length === 0) { + return
No posts.
; } - fetchFeed = async () => { - const getFeedPromise = getFeed(); - try { - const feed = await getFeedPromise; - this.setState({ - feed, - }); - return getFeedPromise; - } catch (err) { - this.setState({ - error: String(err), - }); - } - } - - renderAddLink = () => ( - - Create post - - ) - - renderData = () => { - const { feed, error } = this.state; - - if (error) { - return
{error}
; - } - - if (!feed || feed.length === 0) { - return
No posts.
; - } - - return ( - - - - - - + return ( +
TitleDescriptionPublish time
+ + + + + + + + + {feed.map(post => ( + + + + - - - {feed.map(post => ( - - - - - - ))} - -
TitleDescriptionPublish time
{post.title_fi}{post.description_fi}{formatRelative(new Date(post.publish_time), new Date())}
{post.title_fi}{post.description_fi}{formatRelative(new Date(post.publish_time), new Date())}
- ); - } + ))} + + + ); +} - render() { - return ( -
- - - -

Feed

- {this.renderAddLink()} - {this.renderData()} -
- ); - } +const AdminFeedPage: React.FC = () => { + const [forms, setForms] = useState(null); + + useEffect(() => { + getFeed({ auth: true }) + .then(res => setForms(res)) + }, []); + + return ( + + + + +

Feed

+ {renderAddLink()} + {renderData(forms)} + + ); } export default AdminFeedPage; diff --git a/src/pages/admin/AdminFrontPage.scss b/src/pages/admin/AdminFrontPage.scss deleted file mode 100644 index 44ba612..0000000 --- a/src/pages/admin/AdminFrontPage.scss +++ /dev/null @@ -1,6 +0,0 @@ -.admin-front-page { - a { - text-decoration: underline; - display: block; - } -} diff --git a/src/pages/admin/AdminFrontPage.tsx b/src/pages/admin/AdminFrontPage.tsx deleted file mode 100644 index 2afe542..0000000 --- a/src/pages/admin/AdminFrontPage.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import React from "react"; -import { Helmet } from "react-helmet"; -import Anchor from "@components/Anchor"; -import "./AdminFrontPage.scss"; - -export interface AdminFrontPageProps { } -export interface AdminFrontPageState { } - -class AdminFrontPage extends React.Component { - render() { - return ( -
- - - -

SIK Admin

- Events - Feed - Job advertisements - Files -
- ); - } -} - -export default AdminFrontPage; diff --git a/src/pages/admin/AdminFrontView.tsx b/src/pages/admin/AdminFrontView.tsx new file mode 100644 index 0000000..48b8748 --- /dev/null +++ b/src/pages/admin/AdminFrontView.tsx @@ -0,0 +1,13 @@ +import React from "react"; +import { Helmet } from "react-helmet"; + +const AdminFrontView: React.FC = () => ( +
+ + + +

SIK Admin

+
+); + +export default AdminFrontView; diff --git a/src/pages/admin/AdminJobAdPage.tsx b/src/pages/admin/AdminJobAdPage.tsx index 6a0a926..8ba62c8 100644 --- a/src/pages/admin/AdminJobAdPage.tsx +++ b/src/pages/admin/AdminJobAdPage.tsx @@ -1,6 +1,7 @@ import React from "react"; import { Helmet } from "react-helmet"; import { formatRelative } from "date-fns"; +import AdminListCommon from "./AdminListCommon"; import useFetchJobAds from "@hooks/useFetchJobAds"; import { JobAd } from "@models/JobAd"; import Anchor from "@components/Anchor"; @@ -49,14 +50,14 @@ const renderData = (jobAds: JobAd[]) => { const AdminJobAdPage: React.FC = () => { const jobAds = useFetchJobAds({ auth: true }); return ( -
+

Job advertisements

{renderAddLink()} {renderData(jobAds)} -
+ ) } diff --git a/src/pages/admin/AdminListCommon.tsx b/src/pages/admin/AdminListCommon.tsx new file mode 100644 index 0000000..1e7db17 --- /dev/null +++ b/src/pages/admin/AdminListCommon.tsx @@ -0,0 +1,22 @@ +import styled from "styled-components"; +import { colors } from "@theme/colors"; + +const Main = styled.main` + table { + border-collapse: collapse; + } + + table, + th, + td { + border: 1px solid ${colors.white}; + padding: 0.5rem; + + a { + color: ${colors.orange1}; + text-decoration: underline; + } + } +`; + +export default Main; \ No newline at end of file diff --git a/src/pages/admin/AdminLoginPage.scss b/src/pages/admin/AdminLoginPage.scss deleted file mode 100644 index db089c0..0000000 --- a/src/pages/admin/AdminLoginPage.scss +++ /dev/null @@ -1,5 +0,0 @@ -.admin-login-page { - input { - display: block; - } -} diff --git a/src/pages/admin/AdminLoginPage.tsx b/src/pages/admin/AdminLoginPage.tsx index e4edc32..946c27b 100644 --- a/src/pages/admin/AdminLoginPage.tsx +++ b/src/pages/admin/AdminLoginPage.tsx @@ -1,11 +1,17 @@ import React from "react"; +import styled from "styled-components"; import { Helmet } from "react-helmet"; import { Redirect } from "react-router-dom"; import qs from "query-string"; import { generateToken, setTokenCookie, isAuthenticated } from "@utils/auth"; -import "./AdminLoginPage.scss"; -export interface AdminLoginPageProps { +const Main = styled.main` + input { + display: block; + } +`; + +interface AdminLoginPageProps { history: { push: (to: string | string[]) => void; }; @@ -13,7 +19,7 @@ export interface AdminLoginPageProps { search: string; }; } -export interface AdminLoginPageState { +interface AdminLoginPageState { username: string; password: string; isAuthenticated: boolean; @@ -104,7 +110,7 @@ class AdminLoginPage extends React.Component +
@@ -122,7 +128,7 @@ class AdminLoginPage extends React.Component { this.renderError() } - +
); } } diff --git a/src/pages/admin/AdminSignupPage.scss b/src/pages/admin/AdminSignupPage.scss deleted file mode 100644 index ddf5c3a..0000000 --- a/src/pages/admin/AdminSignupPage.scss +++ /dev/null @@ -1,26 +0,0 @@ -@import "../../assets/scss/globals"; - -.signup-create-page { - a { - color: color(orange1); - text-decoration: underline; - } -} - -.admin-signup-page { - table { - border-collapse: collapse; - } - - table, - th, - td { - border: 1px solid color(white1); - padding: 0.5rem; - - a { - color: color(orange1); - text-decoration: underline; - } - } -} diff --git a/src/pages/admin/AdminSignupPage.tsx b/src/pages/admin/AdminSignupPage.tsx index 7051cbb..8ae6355 100644 --- a/src/pages/admin/AdminSignupPage.tsx +++ b/src/pages/admin/AdminSignupPage.tsx @@ -1,117 +1,65 @@ -import React from "react"; +import React, { useEffect, useState } from "react"; import { Helmet } from "react-helmet"; import { formatRelative } from "date-fns"; +import AdminListCommon from "./AdminListCommon"; import Anchor from "@components/Anchor"; - -import "./AdminSignupPage.scss"; -import { SignupForm, getForms } from "@models/SignupForm"; -import { StaticContext } from "@server/StaticContext"; import AddIcon from "@assets/img/add-icon.png"; +import { SignupForm, getForms } from "@models/SignupForm"; -export interface AdminSignupPageProps { - staticContext: StaticContext; -} -export interface AdminSignupPageState { - signupForms: SignupForm[]; - error?: string; -} +const URL = "/admin/signups" -class AdminSignupPage extends React.Component { - constructor(props: AdminSignupPageProps) { - super(props); - const { staticContext } = props; - if (staticContext) { - /* The static context is an object that manages promises when - rendering on the server. If staticContext exists, that means - we have to store all promises in it. Otherwise, operate - normally. See server/index.ts. */ - if (staticContext.resolutions.getSignupForms) { - const signupForms = staticContext.resolutions.getSignupForms as SignupForm[]; - this.state = { - signupForms, - }; - } else { - this.state = { - signupForms: [], - }; - const promiseSignupForms = this.fetchSignupForms(); - staticContext.promises.getSignupForms = promiseSignupForms; - } - } else { - this.state = { - signupForms: [], - }; - this.fetchSignupForms(); - } +const renderAddLink = () => ( + + Create signup form + +) + +const renderData = (signupForms: SignupForm[]) => { + if (!signupForms || signupForms.length === 0) { + return
No signup forms.
; } - fetchSignupForms = async () => { - const getSignupFormsPromise = getForms(true); - try { - const signupForms = await getSignupFormsPromise; - this.setState({ - signupForms, - }); - return getSignupFormsPromise; - } catch (err) { - this.setState({ - error: String(err), - }); - } - } - - renderAddLink = () => ( - - Create signup form - - ) - - renderData = () => { - const { signupForms, error } = this.state; - - if (error) { - return
{error}
; - } - - if (!signupForms || signupForms.length === 0) { - return
No signup forms.
; - } - - return ( - - - - - - + return ( +
TitleStart timeEnd time
+ + + + + + + + + {signupForms.map(signupForm => ( + + + + - - - {signupForms.map(signupForm => ( - - - - - - ))} - -
TitleStart timeEnd time
{signupForm.title_fi}{formatRelative(new Date(signupForm.start_time), new Date())}{formatRelative(new Date(signupForm.end_time), new Date())}
{signupForm.title_fi}{formatRelative(new Date(signupForm.start_time), new Date())}{formatRelative(new Date(signupForm.end_time), new Date())}
- ); - } + ))} + + + ); +} - render() { - return ( -
- - - -

Sign-up forms

- {this.renderAddLink()} - {this.renderData()} -
- ); - } +const AdminSignupPage: React.FC = () => { + const [forms, setForms] = useState(null); + + useEffect(() => { + getForms(true) + .then(res => setForms(res)) + }, []); + + return ( + + + + +

Sign-up forms

+ {renderAddLink()} + {renderData(forms)} + + ); } export default AdminSignupPage; diff --git a/src/routes.tsx b/src/routes.tsx index f3ff88f..bfa5b8a 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Switch, Route, Redirect } from "react-router-dom"; +import { Switch, Route } from "react-router-dom"; import { Helmet } from "react-helmet"; import FrontPage from "./pages/FrontPage"; import GuildPage from "./pages/GuildPage"; @@ -7,7 +7,7 @@ import NotFoundPage from "./pages/NotFoundPage"; import CommonPage from "./pages/CommonPage"; import JsonLD from "@components/JsonLD"; import "./index.scss"; -import AdminFrontPage from "./pages/admin/AdminFrontPage"; +import AdminFrontPage from "./pages/admin/AdminFrontView"; import AdminEventPage from "./pages/admin/AdminEventPage"; import AdminFeedPage from "./pages/admin/AdminFeedPage"; import AdminCommonPage from "./pages/admin/AdminCommonPage"; From 560f47a71b5a7a02af91321514bb1249f2f3ee99 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 24 Nov 2020 22:15:28 +0200 Subject: [PATCH 06/14] Fixes, simplification, styles inside components --- src/components/AddLink.tsx | 34 ++++++++++ src/pages/admin/AdminCommonPage.scss | 80 ----------------------- src/pages/admin/AdminCommonPage.tsx | 30 ++++++++- src/pages/admin/AdminCreateCommon.tsx | 44 ++++++++++++- src/pages/admin/AdminEventPage.tsx | 10 +-- src/pages/admin/AdminFeedPage.tsx | 11 +--- src/pages/admin/AdminJobAdPage.tsx | 12 +--- src/pages/admin/AdminSignupPage.tsx | 11 +--- src/views/StudiesPage/StudiesPageView.tsx | 2 +- 9 files changed, 113 insertions(+), 121 deletions(-) create mode 100644 src/components/AddLink.tsx delete mode 100644 src/pages/admin/AdminCommonPage.scss diff --git a/src/components/AddLink.tsx b/src/components/AddLink.tsx new file mode 100644 index 0000000..54634b9 --- /dev/null +++ b/src/components/AddLink.tsx @@ -0,0 +1,34 @@ +import React, { ComponentProps } from "react"; +import styled from "styled-components"; +import Anchor from "@components/Anchor"; +import AddIcon from "@assets/img/add-icon.png"; + +const Link = styled(Anchor)` + display: flex; + flex-flow: row nowrap; + align-items: center; + margin-bottom: 1rem; + + &:hover { + color: color(orange2); + } + + img { + margin-right: 8px; + margin-top: -2px; + width: 20px; + } +`; + +type AddLinkProps = ComponentProps & { + text: string; +} + +const AddLink: React.FC = ({ text, ...props }) => ( + + + {text} + +) + +export default AddLink; \ No newline at end of file diff --git a/src/pages/admin/AdminCommonPage.scss b/src/pages/admin/AdminCommonPage.scss deleted file mode 100644 index 68e6fe3..0000000 --- a/src/pages/admin/AdminCommonPage.scss +++ /dev/null @@ -1,80 +0,0 @@ -@import "../../assets/scss/globals"; - - -.admin-container { - display: flex; - color: color(white1); - background-color: color(dark-blue); - flex-flow: row nowrap; - justify-content: flex-start; - align-items: flex-start; - flex: 1; - - @media screen and (max-width: 800px - 1px) { - flex-flow: column nowrap; - } - - > div[class$='page'] { - padding: 0 1rem; - width: 100%; - } - - .rjsf { - max-width: 600px; - } - - label { - margin-bottom: 0.5rem; - } - - input, - select { - padding: 0.3rem 0.5rem; - margin-bottom: 0.5rem; - } - - input[type="submit"] { - border: none; - outline: none; - background-color: color(orange2); - padding: 0.5rem 1rem; - color: color(white1); - } - - h1 { - margin-top: 0; - } - - .error { - margin-bottom: 0.5rem; - border: 1px solid color(orange2); - padding: 8px 16px; - color: color(orange2); - display: inline-block; - } - - .success { - margin-bottom: 0.5rem; - border: 1px solid color(green1); - padding: 8px 16px; - color: color(green1); - display: inline-block; - } - - .add-link { - display: flex; - flex-flow: row nowrap; - align-items: center; - margin-bottom: 1rem; - - &:hover { - color: color(orange2); - } - - img { - margin-right: 8px; - margin-top: -2px; - width: 20px; - } - } -} diff --git a/src/pages/admin/AdminCommonPage.tsx b/src/pages/admin/AdminCommonPage.tsx index 6671c1b..f436ad6 100644 --- a/src/pages/admin/AdminCommonPage.tsx +++ b/src/pages/admin/AdminCommonPage.tsx @@ -1,9 +1,33 @@ import React from "react"; +import styled from "styled-components"; import { Redirect } from "react-router-dom"; +import { colors }from "@theme/colors"; import AdminHeader from "@components/AdminHeader"; import AdminSidebar from "@components/AdminSidebar"; import { isAuthenticated } from "@utils/auth"; -import "./AdminCommonPage.scss"; + +const Main = styled.main` + display: flex; + color: ${colors.white}; + background-color: ${colors.darkBlue}; + flex-flow: row nowrap; + justify-content: flex-start; + align-items: flex-start; + flex: 1; + + @media screen and (max-width: 800px - 1px) { + flex-flow: column nowrap; + } + + & > div { + padding: 0 1rem; + width: 100%; + } + + h1 { + margin-top: 0; + } +`; export interface AdminCommonPageProps { page: any; @@ -56,10 +80,10 @@ class AdminCommonPage extends React.Component -
+
-
+ ); } diff --git a/src/pages/admin/AdminCreateCommon.tsx b/src/pages/admin/AdminCreateCommon.tsx index 5d15354..f281947 100644 --- a/src/pages/admin/AdminCreateCommon.tsx +++ b/src/pages/admin/AdminCreateCommon.tsx @@ -10,6 +10,10 @@ import { JobAd } from "@models/JobAd"; const Common = styled.main` width: 100%; + .rjsf { + max-width: 600px; + } + fieldset { border: none; padding: 0; @@ -21,6 +25,16 @@ const Common = styled.main` cursor: pointer; } + label { + margin-bottom: 0.5rem; + } + + input, + select { + padding: 0.3rem 0.5rem; + margin-bottom: 0.5rem; + } + input[type="text"], textarea { padding: 0.5rem 0.5rem; @@ -35,6 +49,14 @@ const Common = styled.main` width: 100%; } + input[type="submit"] { + border: none; + outline: none; + background-color: ${colors.orange2}; + padding: 0.5rem 1rem; + color: ${colors.white}; + } + legend { font-weight: bold; margin: 0.5rem 0; @@ -60,6 +82,22 @@ const Common = styled.main` } `; +const SuccessMsg = styled.p` + margin-bottom: 0.5rem; + border: 1px solid ${colors.green1}; + padding: 8px 16px; + color: ${colors.green1}; + display: inline-block; +`; + +const ErrorMsg = styled.p` + margin-bottom: 0.5rem; + border: 1px solid ${colors.orange2}; + padding: 8px 16px; + color: ${colors.orange2}; + display: inline-block; +`; + type FormTypes = Event | SignupForm | Post | JobAd; type AdminCreateCommonProps = { @@ -102,7 +140,9 @@ const AdminCreateCommon: React.FC = ({ return (

{title}

- {statusMessage &&
{statusMessage}
} + {statusMessage && ( + {statusMessage} + )}
= ({ onFocus={onFocus} /> {error && ( -
{error}
+ {error} )} ) diff --git a/src/pages/admin/AdminEventPage.tsx b/src/pages/admin/AdminEventPage.tsx index 1070d2e..d03781b 100644 --- a/src/pages/admin/AdminEventPage.tsx +++ b/src/pages/admin/AdminEventPage.tsx @@ -3,17 +3,11 @@ import { Helmet } from "react-helmet"; import { formatRelative } from "date-fns"; import AdminListCommon from "./AdminListCommon"; import Anchor from "@components/Anchor"; -import AddIcon from "@assets/img/add-icon.png"; +import AddLink from "@components/AddLink"; import { Event, getEvents } from "@models/Event"; const URL = "/admin/events" -const renderAddLink = () => ( - - Create event - -) - const renderData = (events: Event[]) => { if (!events || events.length === 0) { return
No events.
; @@ -54,7 +48,7 @@ const AdminEventPage: React.FC = () => {

Feed

- {renderAddLink()} + {renderData(events)} ); diff --git a/src/pages/admin/AdminFeedPage.tsx b/src/pages/admin/AdminFeedPage.tsx index 414fb1f..1fdcc30 100644 --- a/src/pages/admin/AdminFeedPage.tsx +++ b/src/pages/admin/AdminFeedPage.tsx @@ -3,18 +3,11 @@ import { Helmet } from "react-helmet"; import { formatRelative } from "date-fns"; import AdminListCommon from "./AdminListCommon"; import Anchor from "@components/Anchor"; -import AddIcon from "@assets/img/add-icon.png"; +import AddLink from "@components/AddLink"; import { Post, getFeed } from "@models/Feed"; const URL = "/admin/feed" - -const renderAddLink = () => ( - - Create post - -) - const renderData = (feed: Post[]) => { if (!feed || feed.length === 0) { return
No posts.
; @@ -56,7 +49,7 @@ const AdminFeedPage: React.FC = () => {

Feed

- {renderAddLink()} + {renderData(forms)} ); diff --git a/src/pages/admin/AdminJobAdPage.tsx b/src/pages/admin/AdminJobAdPage.tsx index 8ba62c8..e4097c1 100644 --- a/src/pages/admin/AdminJobAdPage.tsx +++ b/src/pages/admin/AdminJobAdPage.tsx @@ -2,19 +2,13 @@ import React from "react"; import { Helmet } from "react-helmet"; import { formatRelative } from "date-fns"; import AdminListCommon from "./AdminListCommon"; +import Anchor from "@components/Anchor"; +import AddLink from "@components/AddLink"; import useFetchJobAds from "@hooks/useFetchJobAds"; import { JobAd } from "@models/JobAd"; -import Anchor from "@components/Anchor"; -import AddIcon from "@assets/img/add-icon.png"; const URL = "/admin/jobads" -const renderAddLink = () => ( - - Create Ad - -) - const renderData = (jobAds: JobAd[]) => { if (!jobAds || jobAds.length === 0) { @@ -55,7 +49,7 @@ const AdminJobAdPage: React.FC = () => {

Job advertisements

- {renderAddLink()} + {renderData(jobAds)} ) diff --git a/src/pages/admin/AdminSignupPage.tsx b/src/pages/admin/AdminSignupPage.tsx index 8ae6355..9db1c51 100644 --- a/src/pages/admin/AdminSignupPage.tsx +++ b/src/pages/admin/AdminSignupPage.tsx @@ -3,18 +3,11 @@ import { Helmet } from "react-helmet"; import { formatRelative } from "date-fns"; import AdminListCommon from "./AdminListCommon"; import Anchor from "@components/Anchor"; -import AddIcon from "@assets/img/add-icon.png"; +import AddLink from "@components/AddLink"; import { SignupForm, getForms } from "@models/SignupForm"; const URL = "/admin/signups" - -const renderAddLink = () => ( - - Create signup form - -) - const renderData = (signupForms: SignupForm[]) => { if (!signupForms || signupForms.length === 0) { return
No signup forms.
; @@ -56,7 +49,7 @@ const AdminSignupPage: React.FC = () => {

Sign-up forms

- {renderAddLink()} + {renderData(forms)} ); diff --git a/src/views/StudiesPage/StudiesPageView.tsx b/src/views/StudiesPage/StudiesPageView.tsx index eb64669..d347bb0 100644 --- a/src/views/StudiesPage/StudiesPageView.tsx +++ b/src/views/StudiesPage/StudiesPageView.tsx @@ -82,7 +82,7 @@ const StudiesPageView: React.FC = () => ( -

Sähkötekniikan korkeakoulun toimikunnat

+

Sähkötekniikan korkeakoulun toimikunnat

Ylioppilaskunnalla on edustus suuressa osassa Aalto-yliopiston tiedekuntia. Elektroniikan, tietoliikenteen ja automaation tiedekunnan toimikuntiin eli hallopedeihin opiskelijavalinna EST- ja TLT-tutkinto-ohjelmien osalta tehdään osin ylioppilaskunnan edustajistossa Sähköinsinöörikillan esityksestä ja osin Sähköinsinöörikillassa. From c979c8740acd4435532f7cad03ea64e5f03a27af Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 24 Nov 2020 22:16:05 +0200 Subject: [PATCH 07/14] Color fix --- src/components/AddLink.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/AddLink.tsx b/src/components/AddLink.tsx index 54634b9..47471fd 100644 --- a/src/components/AddLink.tsx +++ b/src/components/AddLink.tsx @@ -1,5 +1,6 @@ import React, { ComponentProps } from "react"; import styled from "styled-components"; +import { colors }from "@theme/colors"; import Anchor from "@components/Anchor"; import AddIcon from "@assets/img/add-icon.png"; @@ -10,7 +11,7 @@ const Link = styled(Anchor)` margin-bottom: 1rem; &:hover { - color: color(orange2); + color: ${colors.orange2}; } img { From 16ccf3300c349a02115d708ff4c0849f1ed49978 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 24 Nov 2020 22:17:45 +0200 Subject: [PATCH 08/14] Remove extra mains --- src/pages/admin/AdminCreateCommon.tsx | 2 +- src/pages/admin/AdminListCommon.tsx | 2 +- src/pages/admin/AdminLoginPage.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/admin/AdminCreateCommon.tsx b/src/pages/admin/AdminCreateCommon.tsx index f281947..3a9b750 100644 --- a/src/pages/admin/AdminCreateCommon.tsx +++ b/src/pages/admin/AdminCreateCommon.tsx @@ -7,7 +7,7 @@ import { Post } from "@models/Feed"; import { SignupForm } from "@models/SignupForm"; import { JobAd } from "@models/JobAd"; -const Common = styled.main` +const Common = styled.div` width: 100%; .rjsf { diff --git a/src/pages/admin/AdminListCommon.tsx b/src/pages/admin/AdminListCommon.tsx index 1e7db17..b49d0dd 100644 --- a/src/pages/admin/AdminListCommon.tsx +++ b/src/pages/admin/AdminListCommon.tsx @@ -1,7 +1,7 @@ import styled from "styled-components"; import { colors } from "@theme/colors"; -const Main = styled.main` +const Main = styled.div` table { border-collapse: collapse; } diff --git a/src/pages/admin/AdminLoginPage.tsx b/src/pages/admin/AdminLoginPage.tsx index 946c27b..3121a16 100644 --- a/src/pages/admin/AdminLoginPage.tsx +++ b/src/pages/admin/AdminLoginPage.tsx @@ -5,7 +5,7 @@ import { Redirect } from "react-router-dom"; import qs from "query-string"; import { generateToken, setTokenCookie, isAuthenticated } from "@utils/auth"; -const Main = styled.main` +const Main = styled.div` input { display: block; } From 293f085e96e59eaf5a2a9aece1a96d21f14041bf Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 24 Nov 2020 22:26:37 +0200 Subject: [PATCH 09/14] Fix Admin responsiveness --- src/components/AdminSidebar.tsx | 4 ++-- src/pages/admin/AdminCommonPage.tsx | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/AdminSidebar.tsx b/src/components/AdminSidebar.tsx index 81b7c57..6581f91 100644 --- a/src/components/AdminSidebar.tsx +++ b/src/components/AdminSidebar.tsx @@ -13,7 +13,7 @@ const SideBar = styled.nav` margin-right: 1rem; background-color: ${colors.blue1}; - @media screen and (max-width: 800px - 1px) { + @media screen and (max-width: 800px) { margin-right: 0; margin-bottom: 1rem; } @@ -37,7 +37,7 @@ const StyledLink = styled(Anchor)<{path: string}>` border-left: 4px solid ${colors.white}; } - @media screen and (max-width: 800px - 1px) { + @media screen and (max-width: 800px) { margin-bottom: 1px; } `; diff --git a/src/pages/admin/AdminCommonPage.tsx b/src/pages/admin/AdminCommonPage.tsx index f436ad6..f9f98f5 100644 --- a/src/pages/admin/AdminCommonPage.tsx +++ b/src/pages/admin/AdminCommonPage.tsx @@ -15,8 +15,12 @@ const Main = styled.main` align-items: flex-start; flex: 1; - @media screen and (max-width: 800px - 1px) { + @media screen and (max-width: 800px) { flex-flow: column nowrap; + + & > nav { + width: 100%; + } } & > div { From 33acb210e55cb23359edac55034f4d30824711f6 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 24 Nov 2020 22:32:34 +0200 Subject: [PATCH 10/14] Audit fix --- package-lock.json | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index afe5c7f..acb08dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3651,9 +3651,9 @@ "dev": true }, "bl": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", - "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz", + "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==", "dev": true, "optional": true, "requires": { @@ -4272,8 +4272,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true }, "p-limit": { @@ -5373,8 +5372,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true }, "normalize-path": { @@ -7999,8 +7997,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true }, "p-limit": { @@ -8157,8 +8154,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true }, "schema-utils": { @@ -10148,8 +10144,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true } } @@ -21074,8 +21069,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true }, "schema-utils": { @@ -21325,8 +21319,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true }, "os-locale": { From c7ad66836a5b62b70aad2242b41e837e9b81b046 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 24 Nov 2020 22:38:12 +0200 Subject: [PATCH 11/14] Update ESLint --- package-lock.json | 2592 ++++++++++++++++++++++++++++++++++----------- package.json | 22 +- 2 files changed, 2012 insertions(+), 602 deletions(-) diff --git a/package-lock.json b/package-lock.json index acb08dd..905f661 100644 --- a/package-lock.json +++ b/package-lock.json @@ -276,6 +276,24 @@ } } }, + "@babel/runtime-corejs3": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.12.5.tgz", + "integrity": "sha512-roGr54CsTmNPPzZoCP1AmDXuBoNao7tnSA83TXTwt+UK5QVyh1DIJnrgYRPWKCF2flqZQXwa7Yr8v7VmLzF0YQ==", + "dev": true, + "requires": { + "core-js-pure": "^3.0.0", + "regenerator-runtime": "^0.13.4" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", + "dev": true + } + } + }, "@babel/template": { "version": "7.7.0", "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz", @@ -370,6 +388,90 @@ "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz", "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==" }, + "@eslint/eslintrc": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz", + "integrity": "sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==", + "dev": true, + "requires": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "lodash": "^4.17.19", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "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", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "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 + }, + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "import-fresh": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz", + "integrity": "sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + } + } + }, "@jimp/bmp": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.5.4.tgz", @@ -771,12 +873,6 @@ "integrity": "sha1-4ByfjIXKg7YQMgxiJYsMkCat4Pc=", "dev": true }, - "@types/eslint-visitor-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", - "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==", - "dev": true - }, "@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", @@ -998,89 +1094,27 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.6.1.tgz", - "integrity": "sha512-Z0rddsGqioKbvqfohg7BwkFC3PuNLsB+GE9QkFza7tiDzuHoy0y823Y+oGNDzxNZrYyLjqkZtCTl4vCqOmEN4g==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.8.2.tgz", + "integrity": "sha512-gQ06QLV5l1DtvYtqOyFLXD9PdcILYqlrJj2l+CGDlPtmgLUzc1GpqciJFIRvyfvgLALpnxYINFuw+n9AZhPBKQ==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "2.6.1", - "eslint-utils": "^1.4.2", + "@typescript-eslint/experimental-utils": "4.8.2", + "@typescript-eslint/scope-manager": "4.8.2", + "debug": "^4.1.1", "functional-red-black-tree": "^1.0.1", - "regexpp": "^2.0.1", + "regexpp": "^3.0.0", + "semver": "^7.3.2", "tsutils": "^3.17.1" }, "dependencies": { - "@typescript-eslint/experimental-utils": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.6.1.tgz", - "integrity": "sha512-EVrrUhl5yBt7fC7c62lWmriq4MIc49zpN3JmrKqfiFXPXCM5ErfEcZYfKOhZXkW6MBjFcJ5kGZqu1b+lyyExUw==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.6.1", - "eslint-scope": "^5.0.0" - } - }, - "@typescript-eslint/typescript-estree": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.6.1.tgz", - "integrity": "sha512-+sTnssW6bcbDZKE8Ce7VV6LdzkQz2Bxk7jzk1J8H1rovoTxnm6iXvYIyncvNsaB/kBCOM63j/LNJfm27bNdUoA==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "glob": "^7.1.4", - "is-glob": "^4.0.1", - "lodash.unescape": "4.0.1", - "semver": "^6.3.0", - "tsutils": "^3.17.1" - } - }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" - } - }, - "eslint-scope": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", - "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", - "dev": true, - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "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.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", - "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" + "ms": "2.1.2" } }, "ms": { @@ -1090,85 +1124,199 @@ "dev": true }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", "dev": true } } }, "@typescript-eslint/experimental-utils": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.6.1.tgz", - "integrity": "sha512-EVrrUhl5yBt7fC7c62lWmriq4MIc49zpN3JmrKqfiFXPXCM5ErfEcZYfKOhZXkW6MBjFcJ5kGZqu1b+lyyExUw==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.8.2.tgz", + "integrity": "sha512-hpTw6o6IhBZEsQsjuw/4RWmceRyESfAiEzAEnXHKG1X7S5DXFaZ4IO1JO7CW1aQ604leQBzjZmuMI9QBCAJX8Q==", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.6.1", - "eslint-scope": "^5.0.0" + "@typescript-eslint/scope-manager": "4.8.2", + "@typescript-eslint/types": "4.8.2", + "@typescript-eslint/typescript-estree": "4.8.2", + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0" }, "dependencies": { "eslint-scope": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", - "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", + "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.1.0", + "esrecurse": "^4.3.0", "estraverse": "^4.1.1" } + }, + "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" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } + } } } }, "@typescript-eslint/parser": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.6.1.tgz", - "integrity": "sha512-PDPkUkZ4c7yA+FWqigjwf3ngPUgoLaGjMlFh6TRtbjhqxFBnkElDfckSjm98q9cMr4xRzZ15VrS/xKm6QHYf0w==", + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.8.2.tgz", + "integrity": "sha512-u0leyJqmclYr3KcXOqd2fmx6SDGBO0MUNHHAjr0JS4Crbb3C3d8dwAdlazy133PLCcPn+aOUFiHn72wcuc5wYw==", "dev": true, "requires": { - "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.6.1", - "@typescript-eslint/typescript-estree": "2.6.1", - "eslint-visitor-keys": "^1.1.0" - } - }, - "@typescript-eslint/typescript-estree": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.6.1.tgz", - "integrity": "sha512-+sTnssW6bcbDZKE8Ce7VV6LdzkQz2Bxk7jzk1J8H1rovoTxnm6iXvYIyncvNsaB/kBCOM63j/LNJfm27bNdUoA==", - "dev": true, - "requires": { - "debug": "^4.1.1", - "glob": "^7.1.4", - "is-glob": "^4.0.1", - "lodash.unescape": "4.0.1", - "semver": "^6.3.0", - "tsutils": "^3.17.1" + "@typescript-eslint/scope-manager": "4.8.2", + "@typescript-eslint/types": "4.8.2", + "@typescript-eslint/typescript-estree": "4.8.2", + "debug": "^4.1.1" }, "dependencies": { "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, - "glob": { - "version": "7.1.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", - "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "@typescript-eslint/scope-manager": { + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.8.2.tgz", + "integrity": "sha512-qHQ8ODi7mMin4Sq2eh/6eu03uVzsf5TX+J43xRmiq8ujng7ViQSHNPLOHGw/Wr5dFEoxq/ubKhzClIIdQy5q3g==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.8.2", + "@typescript-eslint/visitor-keys": "4.8.2" + } + }, + "@typescript-eslint/types": { + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.8.2.tgz", + "integrity": "sha512-z1/AVcVF8ju5ObaHe2fOpZYEQrwHyZ7PTOlmjd3EoFeX9sv7UekQhfrCmgUO7PruLNfSHrJGQvrW3Q7xQ8EoAw==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.2.tgz", + "integrity": "sha512-HToGNwI6fekH0dOw3XEVESUm71Onfam0AKin6f26S2FtUmO7o3cLlWgrIaT1q3vjB3wCTdww3Dx2iGq5wtUOCg==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.8.2", + "@typescript-eslint/visitor-keys": "4.8.2", + "debug": "^4.1.1", + "globby": "^11.0.1", + "is-glob": "^4.0.1", + "lodash": "^4.17.15", + "semver": "^7.3.2", + "tsutils": "^3.17.1" + }, + "dependencies": { + "@nodelib/fs.stat": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", + "dev": true + }, + "array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true + }, + "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": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fill-range": "^7.0.1" } }, + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "fast-glob": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", + "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" + } + }, + "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" + } + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "globby": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz", + "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==", + "dev": true, + "requires": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + } + }, + "ignore": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "dev": true + }, "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -1184,16 +1332,77 @@ "is-extglob": "^2.1.1" } }, + "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 + }, + "merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true + }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "dev": true + }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "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" + } + } + } + }, + "@typescript-eslint/visitor-keys": { + "version": "4.8.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.2.tgz", + "integrity": "sha512-Vg+/SJTMZJEKKGHW7YC21QxgKJrSbxoYYd3MEUGtW7zuytHuEcksewq0DUmo4eh/CTNrVJGSdIY9AtRb6riWFw==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.8.2", + "eslint-visitor-keys": "^2.0.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", + "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", "dev": true } } @@ -1418,9 +1627,9 @@ } }, "acorn-jsx": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz", - "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", + "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", "dev": true }, "aggregate-error": { @@ -1691,13 +1900,30 @@ } }, "aria-query": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", - "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz", + "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==", "dev": true, "requires": { - "ast-types-flow": "0.0.7", - "commander": "^2.11.0" + "@babel/runtime": "^7.10.2", + "@babel/runtime-corejs3": "^7.10.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", + "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", + "dev": true, + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, + "regenerator-runtime": { + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", + "dev": true + } } }, "arr-diff": { @@ -1743,13 +1969,119 @@ "dev": true }, "array-includes": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", - "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz", + "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==", "dev": true, "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.7.0" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0", + "is-string": "^1.0.5" + }, + "dependencies": { + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + }, + "dependencies": { + "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 + } + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "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", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "dependencies": { + "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 + } + } + } } }, "array-map": { @@ -1785,6 +2117,241 @@ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "dev": true }, + "array.prototype.flat": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz", + "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1" + }, + "dependencies": { + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + }, + "dependencies": { + "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 + } + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "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", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "dependencies": { + "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 + } + } + } + } + }, + "array.prototype.flatmap": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz", + "integrity": "sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1", + "function-bind": "^1.1.1" + }, + "dependencies": { + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + }, + "dependencies": { + "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 + } + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "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", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "dependencies": { + "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 + } + } + } + } + }, "arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", @@ -2045,6 +2612,12 @@ "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==", "dev": true }, + "axe-core": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.1.1.tgz", + "integrity": "sha512-5Kgy8Cz6LPC9DJcNb3yjAXTu3XihQgEdnIg50c//zOC/MyLP0Clg+Y8Sh9ZjjnvBrDZU4DgXS9C3T9r4/scGZQ==", + "dev": true + }, "axios": { "version": "0.19.0", "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz", @@ -2070,13 +2643,10 @@ } }, "axobject-query": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", - "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", - "dev": true, - "requires": { - "ast-types-flow": "0.0.7" - } + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz", + "integrity": "sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==", + "dev": true }, "babel-cli": { "version": "6.26.0", @@ -4272,7 +4842,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, "p-limit": { @@ -4358,6 +4929,16 @@ } } }, + "call-bind": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz", + "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.0" + } + }, "call-me-maybe": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", @@ -4519,12 +5100,6 @@ "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.3.tgz", "integrity": "sha512-VOq6PRzQBam/8Jm6XBGk2fNEnHXAdGd6go0rtd4weAGECBamHDwwCQSOT12TACIYUZegUXnV6xBXqUssijtxIg==" }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true - }, "check-error": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", @@ -4659,12 +5234,6 @@ "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==", "dev": true }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", - "dev": true - }, "clipboardy": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-1.2.3.tgz", @@ -5176,6 +5745,12 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==" }, + "core-js-pure": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.7.0.tgz", + "integrity": "sha512-EZD2ckZysv8MMt4J6HSvS9K2GdtlZtdBncKAmF9lr2n0c9dJUaUN88PSTjvgwCgQPWKTkERXITgS6JJRAnljtg==", + "dev": true + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -5372,7 +5947,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, "normalize-path": { @@ -5512,9 +6088,9 @@ "dev": true }, "damerau-levenshtein": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz", - "integrity": "sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz", + "integrity": "sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==", "dev": true }, "dashdash": { @@ -5916,6 +6492,23 @@ "randombytes": "^2.0.0" } }, + "dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "requires": { + "path-type": "^4.0.0" + }, + "dependencies": { + "path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true + } + } + }, "dns-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", @@ -6231,6 +6824,23 @@ } } }, + "enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, + "requires": { + "ansi-colors": "^4.1.1" + }, + "dependencies": { + "ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true + } + } + }, "entities": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", @@ -6355,233 +6965,218 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.6.0.tgz", - "integrity": "sha512-PpEBq7b6qY/qrOmpYQ/jTMDYfuQMELR4g4WI1M/NaSDDD/bdcMb+dj4Hgks7p41kW2caXsPsEZAEAyAgjVVC0g==", + "version": "7.14.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.14.0.tgz", + "integrity": "sha512-5YubdnPXrlrYAFCKybPuHIAH++PINe1pmKNc5wQRB9HSbqIK1ywAnntE3Wwua4giKu0bjligf1gLF6qxMGOYRA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", + "@eslint/eslintrc": "^0.2.1", "ajv": "^6.10.0", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", "debug": "^4.0.1", "doctrine": "^3.0.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^1.4.3", - "eslint-visitor-keys": "^1.1.0", - "espree": "^6.1.2", - "esquery": "^1.0.1", + "enquirer": "^2.3.5", + "eslint-scope": "^5.1.1", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.0", + "esquery": "^1.2.0", "esutils": "^2.0.2", "file-entry-cache": "^5.0.1", "functional-red-black-tree": "^1.0.1", "glob-parent": "^5.0.0", - "globals": "^11.7.0", + "globals": "^12.1.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", - "inquirer": "^7.0.0", "is-glob": "^4.0.0", "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.14", + "levn": "^0.4.1", + "lodash": "^4.17.19", "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", - "optionator": "^0.8.2", + "optionator": "^0.9.1", "progress": "^2.0.0", - "regexpp": "^2.0.1", - "semver": "^6.1.2", - "strip-ansi": "^5.2.0", - "strip-json-comments": "^3.0.1", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", "table": "^5.2.3", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" }, "dependencies": { "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "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": "^2.0.1", + "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, - "ansi-escapes": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz", - "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==", - "dev": true, - "requires": { - "type-fest": "^0.5.2" - } - }, "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", "dev": true }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "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": { - "restore-cursor": "^3.1.0" + "color-convert": "^2.0.1" } }, - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "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" + } + }, + "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 + }, + "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", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "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", + "estraverse": "^4.1.1" + } + }, + "eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" }, "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", "dev": true } } }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "eslint-scope": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", - "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", - "dev": true, - "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" - } - }, "eslint-visitor-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", - "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", + "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", "dev": true }, - "figures": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz", - "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==", + "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": { - "escape-string-regexp": "^1.0.5" + "estraverse": "^5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } } }, - "file-entry-cache": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", - "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", - "dev": true, - "requires": { - "flat-cache": "^2.0.1" - } + "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 }, "glob-parent": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", - "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "dev": true, "requires": { "is-glob": "^4.0.1" } }, "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } }, - "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "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 }, "import-fresh": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz", - "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz", + "integrity": "sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==", "dev": true, "requires": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" } }, - "inquirer": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz", - "integrity": "sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^2.4.2", - "cli-cursor": "^3.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.15", - "mute-stream": "0.0.8", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^4.1.0", - "strip-ansi": "^5.1.0", - "through": "^2.3.6" - }, - "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - } - } - }, "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-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, "is-glob": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", @@ -6591,97 +7186,100 @@ "is-extglob": "^2.1.1" } }, - "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 - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "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 }, - "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true - }, - "restore-cursor": { + "regexpp": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", + "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", + "dev": true }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", "dev": true }, - "string-width": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz", - "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==", + "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": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^5.2.0" + "shebang-regex": "^3.0.0" } }, + "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 + }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "^5.0.0" } }, "strip-json-comments": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", - "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true + }, + "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" + } + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + }, + "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" + } } } }, "eslint-config-standard": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-14.1.0.tgz", - "integrity": "sha512-EF6XkrrGVbvv8hL/kYa/m6vnvmUT+K82pJJc4JJVMM6+Qgqh0pnwprSxdduDLB9p/7bIxD+YV5O0wfb8lmcPbA==", + "version": "16.0.2", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz", + "integrity": "sha512-fx3f1rJDsl9bY7qzyX8SAtP8GBSk6MfXFaTfaGgk12aAYW4gJSyRm7dM790L6cbXv63fvjY4XeSzXnb4WM+SKw==", "dev": true }, "eslint-import-resolver-node": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz", - "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", + "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", "dev": true, "requires": { "debug": "^2.6.9", - "resolve": "^1.5.0" + "resolve": "^1.13.1" }, "dependencies": { "debug": { @@ -6692,16 +7290,32 @@ "requires": { "ms": "2.0.0" } + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "resolve": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", + "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", + "dev": true, + "requires": { + "is-core-module": "^2.1.0", + "path-parse": "^1.0.6" + } } } }, "eslint-module-utils": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz", - "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", + "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", "dev": true, "requires": { - "debug": "^2.6.8", + "debug": "^2.6.9", "pkg-dir": "^2.0.0" }, "dependencies": { @@ -6717,40 +7331,51 @@ } }, "eslint-plugin-es": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz", - "integrity": "sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", + "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", "dev": true, "requires": { - "eslint-utils": "^1.4.2", + "eslint-utils": "^2.0.0", "regexpp": "^3.0.0" }, "dependencies": { + "eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, "regexpp": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.0.0.tgz", - "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", + "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", "dev": true } } }, "eslint-plugin-import": { - "version": "2.18.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz", - "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==", + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz", + "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==", "dev": true, "requires": { - "array-includes": "^3.0.3", + "array-includes": "^3.1.1", + "array.prototype.flat": "^1.2.3", "contains-path": "^0.1.0", "debug": "^2.6.9", "doctrine": "1.5.0", - "eslint-import-resolver-node": "^0.3.2", - "eslint-module-utils": "^2.4.0", + "eslint-import-resolver-node": "^0.3.4", + "eslint-module-utils": "^2.6.0", "has": "^1.0.3", "minimatch": "^3.0.4", - "object.values": "^1.1.0", + "object.values": "^1.1.1", "read-pkg-up": "^2.0.0", - "resolve": "^1.11.0" + "resolve": "^1.17.0", + "tsconfig-paths": "^3.9.0" }, "dependencies": { "debug": { @@ -6762,6 +7387,15 @@ "ms": "2.0.0" } }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, "doctrine": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", @@ -6772,6 +7406,74 @@ "isarray": "^1.0.0" } }, + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + }, + "dependencies": { + "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 + } + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, "load-json-file": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", @@ -6784,6 +7486,44 @@ "strip-bom": "^3.0.0" } }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "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", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "dependencies": { + "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.values": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", + "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, "parse-json": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", @@ -6836,68 +7576,86 @@ } }, "resolve": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", - "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", + "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", "dev": true, "requires": { + "is-core-module": "^2.1.0", "path-parse": "^1.0.6" } } } }, "eslint-plugin-jsx-a11y": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz", - "integrity": "sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.4.1.tgz", + "integrity": "sha512-0rGPJBbwHoGNPU73/QCLP/vveMlM1b1Z9PponxO87jfr6tuH5ligXbDT6nHSSzBC8ovX2Z+BQu7Bk5D/Xgq9zg==", "dev": true, "requires": { - "@babel/runtime": "^7.4.5", - "aria-query": "^3.0.0", - "array-includes": "^3.0.3", + "@babel/runtime": "^7.11.2", + "aria-query": "^4.2.2", + "array-includes": "^3.1.1", "ast-types-flow": "^0.0.7", - "axobject-query": "^2.0.2", - "damerau-levenshtein": "^1.0.4", - "emoji-regex": "^7.0.2", + "axe-core": "^4.0.2", + "axobject-query": "^2.2.0", + "damerau-levenshtein": "^1.0.6", + "emoji-regex": "^9.0.0", "has": "^1.0.3", - "jsx-ast-utils": "^2.2.1" + "jsx-ast-utils": "^3.1.0", + "language-tags": "^1.0.5" }, "dependencies": { "@babel/runtime": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz", - "integrity": "sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", + "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", "dev": true, "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" } }, + "emoji-regex": { + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.0.tgz", + "integrity": "sha512-DNc3KFPK18bPdElMJnf/Pkv5TXhxFU3YFDEuGLDRtPmV4rkmCjBkCSEp22u6rBHdSN9Vlp/GK7k98prmE1Jgug==", + "dev": true + }, "regenerator-runtime": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", - "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==", + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", "dev": true } } }, "eslint-plugin-node": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz", - "integrity": "sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", + "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", "dev": true, "requires": { - "eslint-plugin-es": "^2.0.0", - "eslint-utils": "^1.4.2", + "eslint-plugin-es": "^3.0.0", + "eslint-utils": "^2.0.0", "ignore": "^5.1.1", "minimatch": "^3.0.4", "resolve": "^1.10.1", "semver": "^6.1.0" }, "dependencies": { + "eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + } + }, "ignore": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", - "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==", + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", "dev": true }, "path-parse": { @@ -6907,11 +7665,12 @@ "dev": true }, "resolve": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", - "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", + "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", "dev": true, "requires": { + "is-core-module": "^2.1.0", "path-parse": "^1.0.6" } }, @@ -6930,22 +7689,33 @@ "dev": true }, "eslint-plugin-react": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.16.0.tgz", - "integrity": "sha512-GacBAATewhhptbK3/vTP09CbFrgUJmBSaaRcWdbQLFvUZy9yVcQxigBNHGPU/KE2AyHpzj3AWXpxoMTsIDiHug==", + "version": "7.21.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz", + "integrity": "sha512-8MaEggC2et0wSF6bUeywF7qQ46ER81irOdWS4QWxnnlAEsnzeBevk1sWh7fhpCghPpXb+8Ks7hvaft6L/xsR6g==", "dev": true, "requires": { - "array-includes": "^3.0.3", + "array-includes": "^3.1.1", + "array.prototype.flatmap": "^1.2.3", "doctrine": "^2.1.0", "has": "^1.0.3", - "jsx-ast-utils": "^2.2.1", - "object.entries": "^1.1.0", - "object.fromentries": "^2.0.0", - "object.values": "^1.1.0", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "object.entries": "^1.1.2", + "object.fromentries": "^2.0.2", + "object.values": "^1.1.1", "prop-types": "^15.7.2", - "resolve": "^1.12.0" + "resolve": "^1.18.1", + "string.prototype.matchall": "^4.0.2" }, "dependencies": { + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, "doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", @@ -6955,6 +7725,74 @@ "esutils": "^2.0.2" } }, + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + }, + "dependencies": { + "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 + } + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -6964,6 +7802,44 @@ "js-tokens": "^3.0.0 || ^4.0.0" } }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "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", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "dependencies": { + "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.values": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", + "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, "path-parse": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", @@ -6982,20 +7858,21 @@ } }, "resolve": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", - "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", + "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", "dev": true, "requires": { + "is-core-module": "^2.1.0", "path-parse": "^1.0.6" } } } }, "eslint-plugin-standard": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz", - "integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-5.0.0.tgz", + "integrity": "sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg==", "dev": true }, "eslint-scope": { @@ -7009,20 +7886,12 @@ } }, "eslint-utils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", - "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, "requires": { "eslint-visitor-keys": "^1.1.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", - "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", - "dev": true - } } }, "eslint-visitor-keys": { @@ -7041,26 +7910,26 @@ } }, "espree": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz", - "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz", + "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==", "dev": true, "requires": { - "acorn": "^7.1.0", - "acorn-jsx": "^5.1.0", - "eslint-visitor-keys": "^1.1.0" + "acorn": "^7.4.0", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.3.0" }, "dependencies": { "acorn": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz", - "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true }, "eslint-visitor-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", - "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", "dev": true } } @@ -7072,12 +7941,20 @@ "dev": true }, "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", + "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", "dev": true, "requires": { - "estraverse": "^4.0.0" + "estraverse": "^5.1.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } } }, "esrecurse": { @@ -7674,28 +8551,6 @@ } } }, - "external-editor": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz", - "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==", - "dev": true, - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - }, - "dependencies": { - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - } - } - }, "extglob": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", @@ -7997,7 +8852,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, "p-limit": { @@ -8154,7 +9010,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, "schema-utils": { @@ -9112,6 +9969,25 @@ "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", "dev": true }, + "get-intrinsic": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz", + "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + }, + "dependencies": { + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + } + } + }, "get-proxy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-2.1.0.tgz", @@ -10093,6 +10969,12 @@ "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", "dev": true }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, "image-size": { "version": "0.7.5", "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.7.5.tgz", @@ -10144,7 +11026,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } } @@ -10607,6 +11490,112 @@ "ipaddr.js": "^1.9.0" } }, + "internal-slot": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.2.tgz", + "integrity": "sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==", + "dev": true, + "requires": { + "es-abstract": "^1.17.0-next.1", + "has": "^1.0.3", + "side-channel": "^1.0.2" + }, + "dependencies": { + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "dev": true + }, + "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", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + } + } + }, "interpret": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", @@ -10746,6 +11735,15 @@ "ci-info": "^1.0.0" } }, + "is-core-module": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz", + "integrity": "sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, "is-cwebp-readable": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-cwebp-readable/-/is-cwebp-readable-2.0.1.tgz", @@ -10954,6 +11952,12 @@ "dev": true, "optional": true }, + "is-negative-zero": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", + "dev": true + }, "is-npm": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", @@ -11103,6 +12107,12 @@ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", "dev": true }, + "is-string": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", + "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "dev": true + }, "is-svg": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz", @@ -11623,13 +12633,48 @@ } }, "jsx-ast-utils": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz", - "integrity": "sha512-v3FxCcAf20DayI+uxnCuw795+oOIkVu6EnJ1+kSzhqqTZHNkTZ7B66ZgLp4oLJ/gbA64cI0B7WRoHZMSRdyVRQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.1.0.tgz", + "integrity": "sha512-d4/UOjg+mxAWxCiF0c5UTSwyqbchkbqCvK87aBovhnh8GtysTjWmgC63tY0cJx/HzGgm9qnA147jVBdpOiQ2RA==", "dev": true, "requires": { - "array-includes": "^3.0.3", - "object.assign": "^4.1.0" + "array-includes": "^3.1.1", + "object.assign": "^4.1.1" + }, + "dependencies": { + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "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", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + } } }, "junk": { @@ -11665,6 +12710,21 @@ "integrity": "sha512-0g5vDDPvNnQk7WM/aE92dTDxXJoOE0biiIcUb3qkn/F6h/ZQZPlZIbE2XSXH2vFPfphkgCxuR2vH6HHnobEOaQ==", "dev": true }, + "language-subtag-registry": { + "version": "0.3.21", + "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz", + "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg==", + "dev": true + }, + "language-tags": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz", + "integrity": "sha1-0yHbxNowuovzAk4ED6XBRmH5GTo=", + "dev": true, + "requires": { + "language-subtag-registry": "~0.3.2" + } + }, "latest-version": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz", @@ -11681,13 +12741,13 @@ "dev": true }, "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" } }, "linux-platform-info": { @@ -11794,12 +12854,6 @@ "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", "dev": true }, - "lodash.unescape": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz", - "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=", - "dev": true - }, "log-symbols": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", @@ -13064,14 +14118,13 @@ } }, "object.entries": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz", - "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz", + "integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==", "dev": true, "requires": { "define-properties": "^1.1.3", - "es-abstract": "^1.12.0", - "function-bind": "^1.1.1", + "es-abstract": "^1.17.5", "has": "^1.0.3" }, "dependencies": { @@ -13083,17 +14136,111 @@ "requires": { "object-keys": "^1.0.12" } + }, + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + }, + "dependencies": { + "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 + } + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "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", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "dependencies": { + "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.fromentries": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.1.tgz", - "integrity": "sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz", + "integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==", "dev": true, "requires": { "define-properties": "^1.1.3", - "es-abstract": "^1.15.0", + "es-abstract": "^1.17.0-next.1", "function-bind": "^1.1.1", "has": "^1.0.3" }, @@ -13108,21 +14255,22 @@ } }, "es-abstract": { - "version": "1.16.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz", - "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==", + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "^1.2.0", + "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.0", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", - "object-inspect": "^1.6.0", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", "object-keys": "^1.1.1", - "string.prototype.trimleft": "^2.1.0", - "string.prototype.trimright": "^2.1.0" + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" }, "dependencies": { "object-keys": { @@ -13134,9 +14282,9 @@ } }, "es-to-primitive": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", - "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "requires": { "is-callable": "^1.1.4", @@ -13144,19 +14292,60 @@ "is-symbol": "^1.0.2" } }, - "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true }, - "is-symbol": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", - "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", "dev": true, "requires": { - "has-symbols": "^1.0.0" + "has-symbols": "^1.0.1" + } + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "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", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "dependencies": { + "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 + } } } } @@ -13196,6 +14385,7 @@ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz", "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==", "dev": true, + "optional": true, "requires": { "define-properties": "^1.1.3", "es-abstract": "^1.12.0", @@ -13208,6 +14398,7 @@ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "dev": true, + "optional": true, "requires": { "object-keys": "^1.0.12" } @@ -13269,17 +14460,17 @@ } }, "optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", "dev": true, "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" } }, "optipng-bin": { @@ -14402,9 +15593,9 @@ } }, "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true }, "prepend-http": { @@ -14449,6 +15640,12 @@ "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -15417,9 +16614,9 @@ } }, "regexpp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", - "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", + "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", "dev": true }, "regexpu-core": { @@ -15847,15 +17044,6 @@ "inherits": "^2.0.1" } }, - "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true, - "requires": { - "is-promise": "^2.1.0" - } - }, "run-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/run-node/-/run-node-1.0.0.tgz", @@ -15877,15 +17065,6 @@ "aproba": "^1.1.1" } }, - "rxjs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", - "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -15917,9 +17096,9 @@ } }, "sass": { - "version": "1.26.8", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.8.tgz", - "integrity": "sha512-yvtzyrKLGiXQu7H12ekXqsfoGT/aTKeMDyVzCB675k1HYuaj0py63i8Uf4SI9CHXj6apDhpfwbUr3gGOjdpu2Q==", + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.29.0.tgz", + "integrity": "sha512-ZpwAUFgnvAUCdkjwPREny+17BpUj8nh5Yr6zKPGtLNTLrmtoRYIjm7njP24COhjJldjwW1dcv52Lpf4tNZVVRA==", "dev": true, "requires": { "chokidar": ">=2.0.0 <4.0.0" @@ -15936,9 +17115,9 @@ } }, "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", + "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", "dev": true }, "braces": { @@ -15951,9 +17130,9 @@ } }, "chokidar": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", - "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", + "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", "dev": true, "requires": { "anymatch": "~3.1.1", @@ -15963,7 +17142,7 @@ "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" + "readdirp": "~3.5.0" } }, "fill-range": { @@ -16028,9 +17207,9 @@ "dev": true }, "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "dev": true, "requires": { "picomatch": "^2.2.1" @@ -16631,6 +17810,112 @@ } } }, + "side-channel": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.3.tgz", + "integrity": "sha512-A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g==", + "dev": true, + "requires": { + "es-abstract": "^1.18.0-next.0", + "object-inspect": "^1.8.0" + }, + "dependencies": { + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "dev": true + }, + "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", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + } + } + }, "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", @@ -17302,6 +18587,127 @@ } } }, + "string.prototype.matchall": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.3.tgz", + "integrity": "sha512-OBxYDA2ifZQ2e13cP82dWFMaCV9CGF8GzmN4fljBVw5O5wep0lu4gacm1OL6MjROoUnB8VbkWRThqkV2YFLNxw==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1", + "has-symbols": "^1.0.1", + "internal-slot": "^1.0.2", + "regexp.prototype.flags": "^1.3.0", + "side-channel": "^1.0.3" + }, + "dependencies": { + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + }, + "dependencies": { + "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 + } + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "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", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + }, + "dependencies": { + "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 + } + } + } + } + }, "string.prototype.padend": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz", @@ -19521,7 +20927,8 @@ "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", - "dev": true + "dev": true, + "optional": true }, "through2": { "version": "2.0.5", @@ -19943,12 +21350,12 @@ "optional": true }, "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, "requires": { - "prelude-ls": "~1.1.2" + "prelude-ls": "^1.2.1" } }, "type-detect": { @@ -19961,7 +21368,8 @@ "version": "0.5.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz", "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==", - "dev": true + "dev": true, + "optional": true }, "type-is": { "version": "1.6.18", @@ -21069,7 +22477,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, "schema-utils": { @@ -21319,7 +22728,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, "os-locale": { diff --git a/package.json b/package.json index d362599..051e549 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,8 @@ "@types/react-jsonschema-form": "1.7.3", "@types/react-router-dom": "5.1.5", "@types/styled-components": "5.1.1", - "@typescript-eslint/eslint-plugin": "2.6.1", - "@typescript-eslint/parser": "2.6.1", + "@typescript-eslint/eslint-plugin": "^4.8.2", + "@typescript-eslint/parser": "^4.8.2", "babel-cli": "6.26.0", "babel-core": "6.26.3", "babel-loader": "7.1.5", @@ -68,14 +68,14 @@ "css-loader": "2.1.1", "dotenv": "6.2.0", "dotenv-webpack": "1.7.0", - "eslint": "6.6.0", - "eslint-config-standard": "14.1.0", - "eslint-plugin-import": "2.18.2", - "eslint-plugin-jsx-a11y": "6.2.3", - "eslint-plugin-node": "10.0.0", - "eslint-plugin-promise": "4.2.1", - "eslint-plugin-react": "7.16.0", - "eslint-plugin-standard": "4.0.1", + "eslint": "^7.14.0", + "eslint-config-standard": "^16.0.2", + "eslint-plugin-import": "^2.22.1", + "eslint-plugin-jsx-a11y": "^6.4.1", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": "^4.2.1", + "eslint-plugin-react": "^7.21.5", + "eslint-plugin-standard": "^5.0.0", "express": "4.17.0", "favicons-webpack-plugin": "1.0.2", "file-loader": "4.2.0", @@ -94,7 +94,7 @@ "react-addons-test-utils": "15.6.2", "react-dom": "16.8.6", "react-hot-loader": "4.8.8", - "sass": "^1.26.8", + "sass": "1.29.0", "sass-loader": "7.1.0", "serve": "11.3.2", "style-loader": "0.21.0", From c937f1bfb15240a361f43feef5fd693fc4755d86 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 24 Nov 2020 22:47:31 +0200 Subject: [PATCH 12/14] Lint fix --- src/components/JsonLD.tsx | 24 ++++++++++-------------- src/index.tsx | 1 + src/pages/admin/EventCreatePage.tsx | 2 +- src/pages/admin/FeedCreatePage.tsx | 2 +- src/pages/admin/JobAdCreatePage.tsx | 2 +- src/pages/admin/SignupCreatePage.tsx | 2 +- src/utils/noop.ts | 3 +++ src/views/ActualPage/ActualPageHero.tsx | 5 +++-- src/views/ActualPage/EventCalendar.tsx | 3 ++- src/views/ActualPage/News.tsx | 3 ++- src/views/EventPage/EventPageView.tsx | 3 ++- src/views/FrontPage/FrontPageHero.tsx | 5 +++-- src/views/FrontPage/FrontPageView.tsx | 5 +++-- src/views/SignUpPage/FormUtils.tsx | 12 ++++++------ 14 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 src/utils/noop.ts diff --git a/src/components/JsonLD.tsx b/src/components/JsonLD.tsx index cb73cb8..db17eb0 100644 --- a/src/components/JsonLD.tsx +++ b/src/components/JsonLD.tsx @@ -1,20 +1,16 @@ import React from "react"; -export interface JsonLDProps { - data: object; +interface JsonLDProps { + data: Record; } -class JsonLD extends React.Component { - render() { - return ( -