Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Adds manual, editable, auto-suggested filters, and negated&globbed path-based filters (#1121)
Vignesh Joglekar30ac9011418d
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex bf92042c55..717bb5fbca 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -10,7 +10,10 @@ All notable changes to this project will be documented in this file.- To authenticate against a local postgresql via socket authentication, the environment-variables`DATABASE_SOCKET_DIR` & `DATABASE_NAME` were added.- Time on Page metric available in detailed Top Pages report plausible/analytics#1007-- Added `CLICKHOUSE_FLUSH_INTERVAL_MS` and `CLICKHOUSE_MAX_BUFFER_SIZE` configuration parameters+- Wildcard based page, entry page and exit page filters plausible/analytics#1067+- Exclusion filters for page, entry page and exit page filters plausible/analytics#1067+- Menu (with auto-complete) to add new and edit existing filters directly plausible/analytics#1089+- Added `CLICKHOUSE_FLUSH_INTERVAL_MS` and `CLICKHOUSE_MAX_BUFFER_SIZE` configuration parameters plausible/analytics#1073- Ability to invite users to sites with different roles plausible/analytics#1122### Fixeddiff --git a/assets/css/modal.css b/assets/css/modal.cssindex 10028c9ead..2a36314ef6 100644--- a/assets/css/modal.css+++ b/assets/css/modal.css@@ -38,7 +38,6 @@.modal__container {background-color: #fff;padding: 1rem 2rem;- max-width: 860px;border-radius: 4px;margin: 50px auto;box-sizing: border-box;diff --git a/assets/css/react-select.css b/assets/css/react-select.cssnew file mode 100644index 0000000000..27a598d61a--- /dev/null+++ b/assets/css/react-select.css@@ -0,0 +1,97 @@+.filter-list-text:hover ~ .filter-list-edit {+ display: flex;+}++.filter-list-text:hover ~ .filter-list-remove {+ display: none;+}++.filter-select__control:focus-within {+ box-shadow: rgb(255, 255, 255) 0px 0px 0px 0px, rgb(99, 102, 241) 0px 0px 0px 1px, rgba(0, 0, 0, 0) 0px 0px 0px 0px; /* indigo-500 */+}++.filter-select__value-container {+ padding-left: 1rem !important;+}++.filter-select__control {+ @apply dark:bg-gray-900 border-gray-300 dark:border-gray-700 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 pr-8;+ border-radius: 0.375rem !important;+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");+ background-position: right 0.5rem center;+ background-repeat: no-repeat;+ background-size: 1.35rem 1.35rem;+}++.filter-select__control:hover {+ @apply cursor-pointer;+ border-color: rgb(156, 163, 175) !important; /* gray-400 */+}++.filter-select__indicator-separator {+ @apply hidden;+}++.filter-select__dropdown-indicator {+ display: none !important;+}++.filter-select__input {+ @apply w-full text-base sm:text-sm;+ margin: 0 !important;+}++.filter-select__input input {+ width: 100% !important;+ box-shadow: none !important;+}++.dark .filter-select__input input {+ color: rgb(209, 213, 219) !important; /* gray-300 */+}++.filter-select__value-container > :not(.filter-select__single-value) {+ @apply w-full;+ padding-top: 0 !important;+}++.filter-select__loading-indicator {+ color: rgb(79, 70, 229) !important; /* indigo-600 */+}++.filter-select__loading-indicator > span {+ height: 1.5em;+ width: 1.5em;+}++.filter-select__single-value {+ @apply dark:text-gray-400 text-base sm:text-sm;+}++.filter-select__menu-list {+ @apply dark:bg-gray-900;+}++.filter-select__option {+ @apply dark:text-gray-300;+ font-size: 1rem !important;+ line-height: 1.5rem !important;+ cursor: pointer !important;+}++@media (min-width: 640px) {+ .filter-select__option {+ font-size: 0.875rem !important;+ line-height: 1.25rem !important;+ }+}++.filter-select__option--is-focused {+ background-color: rgb(99, 102, 241) !important; /* indigo-500 */+ color: white !important;+}++.dark .filter-select__option--is-focused {+ background-color: rgb(79, 70, 229) !important; /* indigo-600 */+}+diff --git a/assets/js/app.js b/assets/js/app.jsindex 2c0a9ad645..81e2debee7 100644--- a/assets/js/app.js+++ b/assets/js/app.js@@ -1,4 +1,5 @@-import css from "../css/app.css"+import "../css/app.css"+import "../css/react-select.css"import "flatpickr/dist/flatpickr.min.css"import "./polyfills/closest"import 'abortcontroller-polyfill/dist/polyfill-patch-fetch'diff --git a/assets/js/dashboard/datepicker.js b/assets/js/dashboard/datepicker.jsindex 6fa47e770d..d3aee17917 100644--- a/assets/js/dashboard/datepicker.js+++ b/assets/js/dashboard/datepicker.js@@ -161,10 +161,10 @@ class DatePicker extends React.Component {const leftClasses = `flex items-center px-2 border-r border-gray-300 rounded-ldark:border-gray-500 dark:text-gray-100 ${- disabledLeft ? "bg-gray-200 dark:bg-gray-900" : ""+ disabledLeft ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-200 dark:hover:bg-gray-900"}`;const rightClasses = `flex items-center px-2 rounded-r dark:text-gray-100 ${- disabledRight ? "bg-gray-200 dark:bg-gray-900" : ""+ disabledRight ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-200 dark:hover:bg-gray-900"}`;return (<div className="flex rounded shadow bg-white mr-4 cursor-pointer dark:bg-gray-800">@@ -242,7 +242,7 @@ class DatePicker extends React.Component {onKeyPress={this.open}className="flex items-center justify-between rounded bg-white dark:bg-gray-800 shadow px-4pr-3 py-2 leading-tight cursor-pointer text-sm font-medium text-gray-800- dark:text-gray-200 h-full"+ dark:text-gray-200 h-full hover:bg-gray-200 dark:hover:bg-gray-900"tabIndex="0"role="button"aria-haspopup="true"@@ -312,7 +312,7 @@ class DatePicker extends React.Component {to={{from: false, to: false, period, ...opts}}onClick={this.close.bind(this)}query={this.props.query}- className={`${boldClass } px-4 py-2 md:text-sm leading-tight hover:bg-gray-100+ className={`${boldClass } px-4 py-2 md:text-sm leading-tight hover:bg-gray-200dark:hover:bg-gray-900 hover:text-gray-900 dark:hover:text-gray-100 flex items-center justify-between`}>{text}diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.jsindex 48e4e082a3..9ae721d316 100644--- a/assets/js/dashboard/filters.js+++ b/assets/js/dashboard/filters.js@@ -1,6 +1,6 @@import React from 'react';-import { withRouter } from 'react-router-dom'-import { countFilters, navigateToQuery, removeQueryParam } from './query'+import { withRouter, Link } from 'react-router-dom'+import { countFilters, formattedFilters, navigateToQuery, removeQueryParam } from './query'import Datamap from 'datamaps'import Transition from "../transition.js";@@ -60,7 +60,7 @@ class Filters extends React.Component {}handleKeyup(e) {- const {query, history} = this.props+ const { query, history } = this.propsif (e.ctrlKey || e.metaKey || e.altKey) return@@ -70,7 +70,7 @@ class Filters extends React.Component {}handleResize() {- this.setState({ viewport: window.innerWidth || 639});+ this.setState({ viewport: window.innerWidth || 639 });}handleClick(e) {@@ -102,6 +102,9 @@ class Filters extends React.Component {};filterText(key, value, query) {+ const negated = value[0] == '!' && ['page', 'entry_page', 'exit_page'].includes(key)+ value = negated ? value.slice(1) : value+if (key === "goal") {return <span className="inline-block max-w-2xs md:max-w-xs truncate">Completed goal <b>{value}</b></span>}@@ -111,50 +114,50 @@ class Filters extends React.Component {return <span className="inline-block max-w-2xs md:max-w-xs truncate">{eventName}.{metaKey} is <b>{metaValue}</b></span>}if (key === "source") {- return <span className="inline-block max-w-2xs md:max-w-xs truncate">Source: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">Source is <b>{value}</b></span>}if (key === "utm_medium") {- return <span className="inline-block max-w-2xs md:max-w-xs truncate">UTM medium: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">UTM medium is <b>{value}</b></span>}if (key === "utm_source") {- return <span className="inline-block max-w-2xs md:max-w-xs truncate">UTM source: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">UTM source is <b>{value}</b></span>}if (key === "utm_campaign") {- return <span className="inline-block max-w-2xs md:max-w-xs truncate">UTM campaign: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">UTM campaign is <b>{value}</b></span>}if (key === "referrer") {- return <span className="inline-block max-w-2xs md:max-w-xs truncate">Referrer: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">Referrer is <b>{value}</b></span>}if (key === "screen") {- return <span className="inline-block max-w-2xs md:max-w-xs truncate">Screen size: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">Screen size is <b>{value}</b></span>}if (key === "browser") {- return <span className="inline-block max-w-2xs md:max-w-xs truncate">Browser: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">Browser is <b>{value}</b></span>}if (key === "browser_version") {const browserName = query.filters["browser"] ? query.filters["browser"] : 'Browser'- return <span className="inline-block max-w-2xs md:max-w-xs truncate">{browserName}.Version: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">{browserName} Version is <b>{value}</b></span>}if (key === "os") {- return <span className="inline-block max-w-2xs md:max-w-xs truncate">Operating System: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">Operating System is <b>{value}</b></span>}if (key === "os_version") {const osName = query.filters["os"] ? query.filters["os"] : 'OS'- return <span className="inline-block max-w-2xs md:max-w-xs truncate">{osName}.Version: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">{osName} Version is <b>{value}</b></span>}if (key === "country") {const allCountries = Datamap.prototype.worldTopo.objects.world.geometries;- const selectedCountry = allCountries.find((c) => c.id === value) || {properties: {name: value}};- return <span className="inline-block max-w-2xs md:max-w-xs truncate">Country: <b>{selectedCountry.properties.name}</b></span>+ const selectedCountry = allCountries.find((c) => c.id === value) || { properties: { name: value } };+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">Country is <b>{selectedCountry.properties.name}</b></span>}if (key === "page") {- return <span className="inline-block max-w-2xs md:max-w-xs truncate">Page: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">Page is{negated ? ' not' : ''} <b>{value}</b></span>}if (key === "entry_page") {- return <span className="inline-block max-w-2xs md:max-w-xs truncate">Entry Page: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">Entry Page is{negated ? ' not' : ''} <b>{value}</b></span>}if (key === "exit_page") {- return <span className="inline-block max-w-2xs md:max-w-xs truncate">Exit Page: <b>{value}</b></span>+ return <span className="inline-block max-w-2xs md:max-w-xs truncate">Exit Page is{negated ? ' not' : ''} <b>{value}</b></span>}}@@ -171,18 +174,50 @@ class Filters extends React.Component {}renderDropdownFilter(history, [key, value], query) {+ if ('props' == key) {+ return (+ <div className="px-4 sm:py-2 py-3 md:text-sm leading-tight flex items-center justify-between" key={key + value}>+ {this.filterText(key, value, query)}+ <b title={`Remove filter: ${formattedFilters[key]}`} className="ml-2 cursor-pointer hover:text-indigo-700 dark:hover:text-indigo-500" onClick={() => this.removeFilter(key, history, query)}>✕</b>+ </div>+ )+ }+return (- <div className="px-4 sm:py-2 py-3 md:text-sm leading-tight flex items-center justify-between" key={key + value}>- {this.filterText(key, value, query)}- <b className="ml-1 cursor-pointer hover:text-indigo-700 dark:hover:text-indigo-500" onClick={() => this.removeFilter(key, history, query)}>✕</b>+ <div className="px-3 md:px-4 sm:py-2 py-3 md:text-sm leading-tight flex items-center justify-between" key={key + value}>+ <Link+ title={`Edit filter: ${formattedFilters[key]}`}+ to={{ pathname: `/${encodeURIComponent(this.props.site.domain)}/filter/${key}`, search: window.location.search }}+ className="group flex w-full justify-between items-center"+ >+ {this.filterText(key, value, query)}+ <svg className="ml-1 cursor-pointer group-hover:text-indigo-700 dark:group-hover:text-indigo-500 w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="1" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"></path></svg>+ </Link>+ <b title={`Remove filter: ${formattedFilters[key]}`} className="ml-2 cursor-pointer hover:text-indigo-700 dark:hover:text-indigo-500" onClick={() => this.removeFilter(key, history, query)}>✕</b></div>)}renderListFilter(history, [key, value], query) {return (- <span key={key} title={value} className="inline-flex bg-white dark:bg-gray-800 text-gray-700 dark:text-gray-300 shadow text-sm rounded py-2 px-3 mr-2">- {this.filterText(key, value, query)} <b className="ml-1 cursor-pointer hover:text-indigo-500" onClick={() => this.removeFilter(key, history, query)}>✕</b>+ <span key={key} title={value} className="flex bg-white dark:bg-gray-800 text-gray-700 dark:text-gray-300 shadow text-sm rounded mr-2 items-center">+ {'props' == key ? (+ <span className="flex w-full h-full items-center py-2 pl-3">+ {this.filterText(key, value, query)}+ </span>+ ) : (+ <>+ <Link title={`Edit filter: ${formattedFilters[key]}`} className="filter-list-text flex w-full h-full items-center py-2 pl-3" to={{ pathname: `/${encodeURIComponent(this.props.site.domain)}/filter/${key}`, search: window.location.search }}>+ {this.filterText(key, value, query)}+ </Link>+ <span className="filter-list-edit hidden h-full w-full px-2 cursor-pointer text-indigo-700 dark:text-indigo-500 items-center">+ <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="1 1 23 23" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="1" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"></path></svg>+ </span>+ </>+ )}+ <span title={`Remove filter: ${formattedFilters[key]}`} className="filter-list-remove flex h-full w-full px-2 cursor-pointer hover:text-indigo-700 dark:hover:text-indigo-500 items-center" onClick={() => this.removeFilter(key, history, query)}>+ <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M6 18L18 6M6 6l12 12"></path></svg>+ </span></span>)}@@ -198,11 +233,15 @@ class Filters extends React.Component {renderDropDownContent() {const { viewport } = this.state;- const { history, query } = this.props;+ const { history, query, site } = this.props;return (<div className="absolute mt-2 rounded shadow-md z-10" style={{ width: viewport <= 768 ? '320px' : '350px', right: '-5px' }} ref={node => this.dropDownNode = node}><div className="rounded bg-white dark:bg-gray-800 ring-1 ring-black ring-opacity-5 font-medium text-gray-800 dark:text-gray-200 flex flex-col">+ <Link to={`/${encodeURIComponent(site.domain)}/filter${window.location.search}`} className="group border-b flex border-gray-200 dark:border-gray-500 px-4 sm:py-2 py-3 md:text-sm leading-tight hover:text-indigo-700 dark:hover:text-indigo-500 hover:cursor-pointer">+ <svg className="mr-2 h-4 w-4 text-gray-500 dark:text-gray-200 group-hover:text-indigo-700 dark:group-hover:text-indigo-500 hover:cursor-pointer" fill="none" stroke="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>+ Add Filter+ </Link>{this.appliedFilters.map((filter) => this.renderDropdownFilter(history, filter, query))}<div className="border-t border-gray-200 dark:border-gray-500 px-4 sm:py-2 py-3 md:text-sm leading-tight hover:text-indigo-700 dark:hover:text-indigo-500 hover:cursor-pointer" onClick={() => this.clearAllFilters(history, query)}>Clear All Filters@@ -239,11 +278,16 @@ class Filters extends React.Component {}renderFilterList() {- const { history, query } = this.props;+ const { history, query, site } = this.props;+ const { viewport } = this.state;return (- <div id="filters">+ <div id="filters" className="flex flex-grow pl-2 flex-wrap">{(this.appliedFilters.map((filter) => this.renderListFilter(history, filter, query)))}+ <Link to={`/${encodeURIComponent(site.domain)}/filter${window.location.search}`} className={`button ${viewport <= 768 ? "px-2 mr-1" : "px-3 mr-2"} py-2 cursor-pointer ml-auto text-gray-800 dark:text-gray-200 bg-white dark:bg-gray-800 hover:bg-gray-200 dark:hover:bg-gray-900 shadow`}>+ <svg className={`${viewport <= 768 ? "mr-1" : "mr-2"} h-4 w-4 text-indigo-500`} fill="none" stroke="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6"></path></svg>+ {viewport <= 768 ? "Filter" : "Add Filter"}+ </Link></div>);}@@ -251,15 +295,11 @@ class Filters extends React.Component {render() {const { wrapped, viewport } = this.state;- if (this.appliedFilters.length > 0) {- if (wrapped === 2 || viewport <= 768) {- return this.renderDropDown();- }-- return this.renderFilterList();+ if (this.appliedFilters.length > 0 && (wrapped === 2 || viewport <= 768)) {+ return this.renderDropDown();}- return null;+ return this.renderFilterList();}}diff --git a/assets/js/dashboard/historical.js b/assets/js/dashboard/historical.jsindex 9266cefb40..42afd9f368 100644--- a/assets/js/dashboard/historical.js+++ b/assets/js/dashboard/historical.js@@ -34,7 +34,7 @@ class Historical extends React.Component {<div className="flex items-center w-full mb-2 sm:mb-0"><SiteSwitcher site={this.props.site} loggedIn={this.props.loggedIn} currentUserRole={this.props.currentUserRole} /><CurrentVisitors timer={this.props.timer} site={this.props.site} query={this.props.query} />- <Filters query={this.props.query} history={this.props.history} />+ <Filters site={this.props.site} query={this.props.query} history={this.props.history} /></div><Datepicker site={this.props.site} query={this.props.query} /></div>diff --git a/assets/js/dashboard/query.js b/assets/js/dashboard/query.jsindex 1fa3c8fdb1..71bddf47bf 100644--- a/assets/js/dashboard/query.js+++ b/assets/js/dashboard/query.js@@ -159,3 +159,22 @@ export function eventName(query) {}return 'pageviews'}++export const formattedFilters = {+ 'goal': 'Goal',+ 'props': 'Goal properties',+ 'source': 'Source',+ 'utm_medium': 'UTM Medium',+ 'utm_source': 'UTM Source',+ 'utm_campaign': 'UTM Campaign',+ 'referrer': 'Referrer URL',+ 'screen': 'Screen size',+ 'browser': 'Browser',+ 'browser_version': 'Browser Version',+ 'os': 'Operating System',+ 'os_version': 'Operating System Version',+ 'country': 'Country',+ 'page': 'Page',+ 'entry_page': 'Entry Page',+ 'exit_page': 'Exit Page'+}diff --git a/assets/js/dashboard/realtime.js b/assets/js/dashboard/realtime.jsindex 1a05c8d66b..33ce0dbadf 100644--- a/assets/js/dashboard/realtime.js+++ b/assets/js/dashboard/realtime.js@@ -33,7 +33,7 @@ class Realtime extends React.Component {<div className="items-center justify-between w-full sm:flex"><div className="flex items-center w-full mb-2 sm:mb-0"><SiteSwitcher site={this.props.site} loggedIn={this.props.loggedIn} />- <Filters query={this.props.query} history={this.props.history} />+ <Filters site={this.props.site} query={this.props.query} history={this.props.history} /></div><Datepicker site={this.props.site} query={this.props.query} /></div>diff --git a/assets/js/dashboard/router.js b/assets/js/dashboard/router.jsindex 9183513cae..65acf670cd 100644--- a/assets/js/dashboard/router.js+++ b/assets/js/dashboard/router.js@@ -7,6 +7,7 @@ import PagesModal from './stats/modals/pages'import EntryPagesModal from './stats/modals/entry-pages'import ExitPagesModal from './stats/modals/exit-pages'import CountriesModal from './stats/modals/countries'+import FilterModal from './stats/modals/filter'import {BrowserRouter, Switch, Route, useLocation} from "react-router-dom";@@ -50,6 +51,9 @@ export default function Router({site, loggedIn, currentUserRole}) {<Route path="/:domain/countries"><CountriesModal site={site} /></Route>+ <Route path={["/:domain/filter/:field", "/:domain/filter"]}>+ <FilterModal site={site} />+ </Route></Switch></Route></BrowserRouter>diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.jsnew file mode 100644index 0000000000..da362424cb--- /dev/null+++ b/assets/js/dashboard/stats/modals/filter.js@@ -0,0 +1,234 @@+import React from "react";+import { withRouter, Redirect } from 'react-router-dom'++import Datamap from 'datamaps'+import AsyncSelect from 'react-select/async'+import debounce from 'lodash.debounce'+import Modal from './modal'+import { parseQuery, formattedFilters, navigateToQuery } from '../../query'+import Transition from "../../../transition";+import * as api from '../../api'++class FilterModal extends React.Component {+ constructor(props) {+ super(props)+ this.state = {+ query: parseQuery(props.location.search, props.site),+ selectedFilter: "",+ negated: false,+ updatedValue: "",+ inputValue: "",+ forceReloadSuggestions: 0,+ defaultOptions: []+ }++ this.editableGoals = Object.keys(this.state.query.filters).filter(filter => !['props'].includes(filter))+ this.renderSelector = this.renderSelector.bind(this)+ this.fetchSuggestions = this.fetchSuggestions.bind(this)+ this.handleKeydown = this.handleKeydown.bind(this)+ this.handleSubmit = this.handleSubmit.bind(this)+ this.fieldSelectRef = React.createRef()+ this.debouncedFetchSuggestions = debounce((q, callback) => this.fetchSuggestions(q, callback), 150)+ }++ componentDidMount() {+ this.setState({ selectedFilter: this.props.match.params.field })+ this.fieldSelectRef.current.focus()+ document.addEventListener("keydown", this.handleKeydown)+ }++ componentDidUpdate(prevProps, prevState) {+ const { query, selectedFilter, updatedValue, forceReloadSuggestions } = this.state++ if (prevState.selectedFilter !== selectedFilter) {+ const negated = !!query.filters[selectedFilter] && query.filters[selectedFilter][0] == '!' && this.negationSupported(selectedFilter)+ let updatedValue = negated ? query.filters[selectedFilter].slice(1) : (query.filters[selectedFilter] || "")++ if (selectedFilter == 'country') {+ const allCountries = Datamap.prototype.worldTopo.objects.world.geometries;+ const selectedCountry = allCountries.find((c) => c.id === updatedValue) || { properties: { name: updatedValue } };+ updatedValue = selectedCountry.properties.name+ }++ if (selectedFilter) this.fetchSuggestions('', (defaultOptions) => this.setState({ defaultOptions }))+ this.setState({ updatedValue, inputValue: updatedValue, negated, forceReloadSuggestions: forceReloadSuggestions + 1 })+ }+ }++ componentWillUnmount() {+ document.removeEventListener("keydown", this.handleKeydown);+ }++ handleKeydown(e) {+ if (e.ctrlKey || e.metaKey || e.shiftKey || e.altKey || e.isComposing || e.keyCode === 229) return++ if (e.target.tagName == 'BODY' && e.key == 'Enter') {+ this.handleSubmit()+ }+ }++ negationSupported(filter) {+ return ['page', 'entry_page', 'exit_page'].includes(filter)+ }++ fetchSuggestions(searchQuery = "", callback) {+ const { query, selectedFilter } = this.state+ const updatedQuery = { ...query, filters: { ...query.filters, [selectedFilter]: null } }++ if (selectedFilter == 'country') {+ const matchedCountries = Datamap.prototype.worldTopo.objects.world.geometries.filter(c => c.properties.name.includes(searchQuery.trim()))+ const matches = matchedCountries.map(c => c.id)++ api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/suggestions/country`, updatedQuery, { q: matches })+ .then((res) => {+ const result = res.map(code => matchedCountries.filter(c => c.id == code)[0].properties.name).map(r => ({ label: r, value: r }))+ callback(result)+ })+ } else {+ api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/suggestions/${selectedFilter}`, updatedQuery, { q: searchQuery.trim() })+ .then((res) => {+ const result = res.map(r => ({ label: r, value: r }))+ callback(result)+ })+ }+ }++ renderSelector(filter) {+ const { updatedValue, selectedFilter, inputValue, forceReloadSuggestions, defaultOptions } = this.state;++ if (!filter) return null++ return (+ <AsyncSelect+ key={`select-${selectedFilter}-${forceReloadSuggestions}`}+ defaultOptions={inputValue == "" ? defaultOptions : true}+ cacheOptions+ loadOptions={(q, callback) => this.debouncedFetchSuggestions(q, callback)}+ placeholder='Filter value'+ maxMenuHeight={250}+ tabSelectsValue={false}+ classNamePrefix='filter-select'+ blurInputOnSelect+ noOptionsMessage={() => (+ <span className="text-red-500 text-md flex mt-2 px-3">+ <svg className="w-10 h-10 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path></svg>+ <span className="">No results found in current dashboard, try removing some filters, checking your input and ensuring this {formattedFilters[selectedFilter].toLowerCase()} exists</span>+ </span>+ )}+ loadingMessage={() => (+ <span>+ Loading filter suggestions+ </span>+ )}+ value={inputValue == '' ? { label: 'Enter a filter value', value: '' } : { label: updatedValue, value: `${updatedValue } ` }}+ onChange={({ value }, a) => {+ this.setState({ updatedValue: value, inputValue: value, forceReloadSuggestions: forceReloadSuggestions + 1 })+ }}+ onInputChange={(value, { action }) => {+ if (action == 'input-change') this.setState({ inputValue: value })+ if (action == 'menu-close' || action == 'input-blur') this.setState(({inputValue}) => ({ updatedValue: inputValue }))+ }}+ inputValue={inputValue}+ onBlur={() => this.setState({ forceReloadSuggestions: forceReloadSuggestions + 1 })}+ />)+ }++ handleSubmit() {+ const { selectedFilter, negated, updatedValue } = this.state;+ const validFilter = this.editableGoals.includes(selectedFilter) && updatedValue.trim()++ let finalFilterValue = (this.negationSupported(selectedFilter) && negated ? '!' : '') + updatedValue.trim()+ if (selectedFilter == 'country') {+ const allCountries = Datamap.prototype.worldTopo.objects.world.geometries;+ const selectedCountry = allCountries.find((c) => c.properties.name === finalFilterValue) || { id: finalFilterValue };+ finalFilterValue = selectedCountry.id+ }+ const finalizedQuery = new URLSearchParams(window.location.search)+ finalizedQuery.set(selectedFilter, finalFilterValue)++ if (validFilter) {+ this.setState({ finalizedQuery })+ }+ }++ renderBody() {+ const { selectedFilter, negated, updatedValue, query } = this.state;+ const validFilter = this.editableGoals.includes(selectedFilter) && updatedValue.trim()++ return (+ <>+ <h1 className="text-xl font-bold dark:text-gray-100">{query.filters[selectedFilter] ? 'Edit' : 'Add'} Filter</h1>++ <div className="my-4 border-b border-gray-300"></div>+ <main className="modal__content">+ <form className="flex flex-col" id="filter-form" onSubmit={this.handleSubmit}>+ <select+ value={selectedFilter || ""}+ className="my-2 block w-full py-2 pl-3 pr-10 text-base border-gray-300 dark:border-gray-700 hover:border-gray-400 dark:hover:border-gray-200 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md dark:bg-gray-900 dark:text-gray-300 cursor-pointer"+ placeholder="Select a Filter"+ onChange={(e) => this.setState({ selectedFilter: e.target.value })}+ ref={this.fieldSelectRef}+ >+ <option disabled value="" className="hidden">Select a Filter</option>+ {this.editableGoals.map(filter => <option key={filter} value={filter}>{formattedFilters[filter]}</option>)}+ </select>++ {this.negationSupported(selectedFilter) && (+ <div className="my-4 flex items-center">+ <label className="text-gray-700 dark:text-gray-300 text-sm cursor-pointer">+ <input+ type="checkbox"+ className="bg-gray-100 dark:bg-gray-900 text-indigo-600 border-gray-300 dark:border-gray-700 hover:border-gray-400 dark:hover:border-gray-200 mr-2 relative inline-flex flex-shrink-0 h-6 w-8 border-1 rounded-full cursor-pointer transition-colors ease-in-out duration-200 focus:outline-none"+ checked={negated}+ name="exclude"+ onChange={(e) => this.setState({ negated: e.target.checked })}+ />+ Exclude pages matching this filter+ </label>+ </div>+ )}++ {this.renderSelector(selectedFilter)}++ <button+ type="submit"+ disabled={!validFilter}+ className="button mt-4 w-2/3 mx-auto"+ >+ {query.filters[selectedFilter] ? 'Update' : 'Add'} Filter+ </button>++ {query.filters[selectedFilter] && (+ <button+ className="button mt-8 px-4 mx-auto flex bg-red-500 dark:bg-red-500 hover:bg-red-600 dark:hover:bg-red-700 items-center"+ onClick={() => {+ const finalizedQuery = new URLSearchParams(window.location.search)+ finalizedQuery.delete(selectedFilter)+ this.setState({ finalizedQuery })+ }}+ >+ <svg className="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"></path></svg>+ Remove Filter+ </button>+ )}+ </form>+ </main>+ </>+ )+ }++ render() {+ const { finalizedQuery } = this.state;++ if (finalizedQuery)+ return <Redirect to={{ pathname: `/${encodeURIComponent(this.props.site.domain)}`, search: finalizedQuery.toString() }} />++ return (+ <Modal site={this.props.site} maxWidth="460px">+ { this.renderBody()}+ </Modal>+ )+ }+}++export default withRouter(FilterModal)diff --git a/assets/js/dashboard/stats/modals/modal.js b/assets/js/dashboard/stats/modals/modal.jsindex 292b2d1108..cd6603baa5 100644--- a/assets/js/dashboard/stats/modals/modal.js+++ b/assets/js/dashboard/stats/modals/modal.js@@ -47,7 +47,7 @@ class Modal extends React.Component {<div className="modal is-open" onClick={this.props.onClick}><div className="modal__overlay"><button className="modal__close"></button>- <div ref={this.node} className="modal__container dark:bg-gray-800">+ <div ref={this.node} className="modal__container dark:bg-gray-800" style={{maxWidth: this.props.maxWidth || '860px'}}>{this.props.children}</div>diff --git a/assets/package-lock.json b/assets/package-lock.jsonindex 3620925f10..55f333d7d8 100644--- a/assets/package-lock.json+++ b/assets/package-lock.json@@ -22,6 +22,7 @@"css-minimizer-webpack-plugin": "^3.0.0","datamaps": "^0.5.9","iframe-resizer": "^4.3.2",+ "lodash.debounce": "^4.0.8","mini-css-extract-plugin": "^1.6.0","phoenix": "file:../deps/phoenix","phoenix_html": "file:../deps/phoenix_html",@@ -32,6 +33,7 @@"react-flatpickr": "3.10.5","react-flip-move": "^3.0.4","react-router-dom": "^5.2.0",+ "react-select": "^4.3.1","react-transition-group": "^4.4.2","tailwindcss": "^2.1.2","terser-webpack-plugin": "^5.1.2",@@ -69,22 +71,25 @@}},"node_modules/@babel/compat-data": {- "version": "7.14.4",- "license": "MIT"+ "version": "7.14.5",+ "license": "MIT",+ "engines": {+ "node": ">=6.9.0"+ }},"node_modules/@babel/core": {- "version": "7.14.3",- "license": "MIT",- "dependencies": {- "@babel/code-frame": "^7.12.13",- "@babel/generator": "^7.14.3",- "@babel/helper-compilation-targets": "^7.13.16",- "@babel/helper-module-transforms": "^7.14.2",- "@babel/helpers": "^7.14.0",- "@babel/parser": "^7.14.3",- "@babel/template": "^7.12.13",- "@babel/traverse": "^7.14.2",- "@babel/types": "^7.14.2",+ "version": "7.14.5",+ "license": "MIT",+ "dependencies": {+ "@babel/code-frame": "^7.14.5",+ "@babel/generator": "^7.14.5",+ "@babel/helper-compilation-targets": "^7.14.5",+ "@babel/helper-module-transforms": "^7.14.5",+ "@babel/helpers": "^7.14.5",+ "@babel/parser": "^7.14.5",+ "@babel/template": "^7.14.5",+ "@babel/traverse": "^7.14.5",+ "@babel/types": "^7.14.5","convert-source-map": "^1.7.0","debug": "^4.1.0","gensync": "^1.0.0-beta.2",@@ -108,38 +113,50 @@}},"node_modules/@babel/generator": {- "version": "7.14.3",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/types": "^7.14.2",+ "@babel/types": "^7.14.5","jsesc": "^2.5.1","source-map": "^0.5.0"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-annotate-as-pure": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/types": "^7.12.13"+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-explode-assignable-expression": "^7.12.13",- "@babel/types": "^7.12.13"+ "@babel/helper-explode-assignable-expression": "^7.14.5",+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-compilation-targets": {- "version": "7.14.4",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/compat-data": "^7.14.4",- "@babel/helper-validator-option": "^7.12.17",+ "@babel/compat-data": "^7.14.5",+ "@babel/helper-validator-option": "^7.14.5","browserslist": "^4.16.6","semver": "^6.3.0"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0"}@@ -152,27 +169,33 @@}},"node_modules/@babel/helper-create-class-features-plugin": {- "version": "7.14.4",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-annotate-as-pure": "^7.12.13",- "@babel/helper-function-name": "^7.14.2",- "@babel/helper-member-expression-to-functions": "^7.13.12",- "@babel/helper-optimise-call-expression": "^7.12.13",- "@babel/helper-replace-supers": "^7.14.4",- "@babel/helper-split-export-declaration": "^7.12.13"+ "@babel/helper-annotate-as-pure": "^7.14.5",+ "@babel/helper-function-name": "^7.14.5",+ "@babel/helper-member-expression-to-functions": "^7.14.5",+ "@babel/helper-optimise-call-expression": "^7.14.5",+ "@babel/helper-replace-supers": "^7.14.5",+ "@babel/helper-split-export-declaration": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0"}},"node_modules/@babel/helper-create-regexp-features-plugin": {- "version": "7.14.3",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-annotate-as-pure": "^7.12.13",+ "@babel/helper-annotate-as-pure": "^7.14.5","regexpu-core": "^4.7.1"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0"}@@ -202,153 +225,209 @@}},"node_modules/@babel/helper-explode-assignable-expression": {- "version": "7.13.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/types": "^7.13.0"+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-function-name": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-get-function-arity": "^7.12.13",- "@babel/template": "^7.12.13",- "@babel/types": "^7.14.2"+ "@babel/helper-get-function-arity": "^7.14.5",+ "@babel/template": "^7.14.5",+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-get-function-arity": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/types": "^7.12.13"+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-hoist-variables": {- "version": "7.13.16",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/traverse": "^7.13.15",- "@babel/types": "^7.13.16"+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-member-expression-to-functions": {- "version": "7.13.12",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/types": "^7.13.12"+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-module-imports": {- "version": "7.13.12",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/types": "^7.13.12"+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-module-transforms": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-module-imports": "^7.13.12",- "@babel/helper-replace-supers": "^7.13.12",- "@babel/helper-simple-access": "^7.13.12",- "@babel/helper-split-export-declaration": "^7.12.13",- "@babel/helper-validator-identifier": "^7.14.0",- "@babel/template": "^7.12.13",- "@babel/traverse": "^7.14.2",- "@babel/types": "^7.14.2"+ "@babel/helper-module-imports": "^7.14.5",+ "@babel/helper-replace-supers": "^7.14.5",+ "@babel/helper-simple-access": "^7.14.5",+ "@babel/helper-split-export-declaration": "^7.14.5",+ "@babel/helper-validator-identifier": "^7.14.5",+ "@babel/template": "^7.14.5",+ "@babel/traverse": "^7.14.5",+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-optimise-call-expression": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/types": "^7.12.13"+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-plugin-utils": {- "version": "7.13.0",- "license": "MIT"+ "version": "7.14.5",+ "license": "MIT",+ "engines": {+ "node": ">=6.9.0"+ }},"node_modules/@babel/helper-remap-async-to-generator": {- "version": "7.13.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-annotate-as-pure": "^7.12.13",- "@babel/helper-wrap-function": "^7.13.0",- "@babel/types": "^7.13.0"+ "@babel/helper-annotate-as-pure": "^7.14.5",+ "@babel/helper-wrap-function": "^7.14.5",+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-replace-supers": {- "version": "7.14.4",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-member-expression-to-functions": "^7.13.12",- "@babel/helper-optimise-call-expression": "^7.12.13",- "@babel/traverse": "^7.14.2",- "@babel/types": "^7.14.4"+ "@babel/helper-member-expression-to-functions": "^7.14.5",+ "@babel/helper-optimise-call-expression": "^7.14.5",+ "@babel/traverse": "^7.14.5",+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-simple-access": {- "version": "7.13.12",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/types": "^7.13.12"+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-skip-transparent-expression-wrappers": {- "version": "7.12.1",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/types": "^7.12.1"+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-split-export-declaration": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/types": "^7.12.13"+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helper-validator-identifier": {- "version": "7.14.0",- "license": "MIT"+ "version": "7.14.5",+ "license": "MIT",+ "engines": {+ "node": ">=6.9.0"+ }},"node_modules/@babel/helper-validator-option": {- "version": "7.12.17",- "license": "MIT"+ "version": "7.14.5",+ "license": "MIT",+ "engines": {+ "node": ">=6.9.0"+ }},"node_modules/@babel/helper-wrap-function": {- "version": "7.13.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-function-name": "^7.12.13",- "@babel/template": "^7.12.13",- "@babel/traverse": "^7.13.0",- "@babel/types": "^7.13.0"+ "@babel/helper-function-name": "^7.14.5",+ "@babel/template": "^7.14.5",+ "@babel/traverse": "^7.14.5",+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/helpers": {- "version": "7.14.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/template": "^7.12.13",- "@babel/traverse": "^7.14.0",- "@babel/types": "^7.14.0"+ "@babel/template": "^7.14.5",+ "@babel/traverse": "^7.14.5",+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/highlight": {- "version": "7.14.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-validator-identifier": "^7.14.0",+ "@babel/helper-validator-identifier": "^7.14.5","chalk": "^2.0.0","js-tokens": "^4.0.0"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/parser": {- "version": "7.14.4",+ "version": "7.14.5","license": "MIT","bin": {"parser": "bin/babel-parser.js"@@ -358,185 +437,230 @@}},"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {- "version": "7.13.12",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",- "@babel/plugin-proposal-optional-chaining": "^7.13.12"+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",+ "@babel/plugin-proposal-optional-chaining": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.13.0"}},"node_modules/@babel/plugin-proposal-async-generator-functions": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-remap-async-to-generator": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-remap-async-to-generator": "^7.14.5","@babel/plugin-syntax-async-generators": "^7.8.4"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-class-properties": {- "version": "7.13.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-create-class-features-plugin": "^7.13.0",- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-create-class-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-class-static-block": {- "version": "7.14.3",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-create-class-features-plugin": "^7.14.3",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/plugin-syntax-class-static-block": "^7.12.13"+ "@babel/helper-create-class-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/plugin-syntax-class-static-block": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.12.0"}},"node_modules/@babel/plugin-proposal-dynamic-import": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-dynamic-import": "^7.8.3"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-export-namespace-from": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-export-namespace-from": "^7.8.3"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-json-strings": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-json-strings": "^7.8.3"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-logical-assignment-operators": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-numeric-separator": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-numeric-separator": "^7.10.4"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-object-rest-spread": {- "version": "7.14.4",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/compat-data": "^7.14.4",- "@babel/helper-compilation-targets": "^7.14.4",- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/compat-data": "^7.14.5",+ "@babel/helper-compilation-targets": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-object-rest-spread": "^7.8.3",- "@babel/plugin-transform-parameters": "^7.14.2"+ "@babel/plugin-transform-parameters": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-optional-catch-binding": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-optional-catch-binding": "^7.8.3"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-optional-chaining": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5","@babel/plugin-syntax-optional-chaining": "^7.8.3"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-private-methods": {- "version": "7.13.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-create-class-features-plugin": "^7.13.0",- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-create-class-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-private-property-in-object": {- "version": "7.14.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-annotate-as-pure": "^7.12.13",- "@babel/helper-create-class-features-plugin": "^7.14.0",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/plugin-syntax-private-property-in-object": "^7.14.0"+ "@babel/helper-annotate-as-pure": "^7.14.5",+ "@babel/helper-create-class-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-proposal-unicode-property-regex": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-create-regexp-features-plugin": "^7.12.13",- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-create-regexp-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"},"engines": {"node": ">=4"@@ -566,10 +690,13 @@}},"node_modules/@babel/plugin-syntax-class-static-block": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"@@ -606,10 +733,13 @@}},"node_modules/@babel/plugin-syntax-jsx": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"@@ -676,441 +806,555 @@}},"node_modules/@babel/plugin-syntax-private-property-in-object": {- "version": "7.14.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-syntax-top-level-await": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-arrow-functions": {- "version": "7.13.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-async-to-generator": {- "version": "7.13.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-module-imports": "^7.12.13",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-remap-async-to-generator": "^7.13.0"+ "@babel/helper-module-imports": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-remap-async-to-generator": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-block-scoped-functions": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-block-scoping": {- "version": "7.14.4",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-classes": {- "version": "7.14.4",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-annotate-as-pure": "^7.12.13",- "@babel/helper-function-name": "^7.14.2",- "@babel/helper-optimise-call-expression": "^7.12.13",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-replace-supers": "^7.14.4",- "@babel/helper-split-export-declaration": "^7.12.13",+ "@babel/helper-annotate-as-pure": "^7.14.5",+ "@babel/helper-function-name": "^7.14.5",+ "@babel/helper-optimise-call-expression": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-replace-supers": "^7.14.5",+ "@babel/helper-split-export-declaration": "^7.14.5","globals": "^11.1.0"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-computed-properties": {- "version": "7.13.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-destructuring": {- "version": "7.14.4",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-dotall-regex": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-create-regexp-features-plugin": "^7.12.13",- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-create-regexp-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-duplicate-keys": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-exponentiation-operator": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13",- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-for-of": {- "version": "7.13.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-function-name": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-function-name": "^7.12.13",- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-function-name": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-literals": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-member-expression-literals": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-modules-amd": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-module-transforms": "^7.14.2",- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-module-transforms": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5","babel-plugin-dynamic-import-node": "^2.3.3"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-modules-commonjs": {- "version": "7.14.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-module-transforms": "^7.14.0",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-simple-access": "^7.13.12",+ "@babel/helper-module-transforms": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-simple-access": "^7.14.5","babel-plugin-dynamic-import-node": "^2.3.3"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-modules-systemjs": {- "version": "7.13.8",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-hoist-variables": "^7.13.0",- "@babel/helper-module-transforms": "^7.13.0",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-validator-identifier": "^7.12.11",+ "@babel/helper-hoist-variables": "^7.14.5",+ "@babel/helper-module-transforms": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-validator-identifier": "^7.14.5","babel-plugin-dynamic-import-node": "^2.3.3"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-modules-umd": {- "version": "7.14.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-module-transforms": "^7.14.0",- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-module-transforms": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-create-regexp-features-plugin": "^7.12.13"+ "@babel/helper-create-regexp-features-plugin": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0"}},"node_modules/@babel/plugin-transform-new-target": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-object-super": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13",- "@babel/helper-replace-supers": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-replace-supers": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-parameters": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-property-literals": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-react-display-name": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-react-jsx": {- "version": "7.14.3",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-annotate-as-pure": "^7.12.13",- "@babel/helper-module-imports": "^7.13.12",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/plugin-syntax-jsx": "^7.12.13",- "@babel/types": "^7.14.2"+ "@babel/helper-annotate-as-pure": "^7.14.5",+ "@babel/helper-module-imports": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/plugin-syntax-jsx": "^7.14.5",+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-react-jsx-development": {- "version": "7.12.17",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/plugin-transform-react-jsx": "^7.12.17"+ "@babel/plugin-transform-react-jsx": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-react-pure-annotations": {- "version": "7.12.1",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-annotate-as-pure": "^7.10.4",- "@babel/helper-plugin-utils": "^7.10.4"+ "@babel/helper-annotate-as-pure": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-regenerator": {- "version": "7.13.15",+ "version": "7.14.5","license": "MIT","dependencies": {"regenerator-transform": "^0.14.2"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-reserved-words": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-shorthand-properties": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-spread": {- "version": "7.13.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-sticky-regex": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-template-literals": {- "version": "7.13.0",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-typeof-symbol": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-unicode-escapes": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/plugin-transform-unicode-regex": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-create-regexp-features-plugin": "^7.12.13",- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-create-regexp-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/preset-env": {- "version": "7.14.4",- "license": "MIT",- "dependencies": {- "@babel/compat-data": "^7.14.4",- "@babel/helper-compilation-targets": "^7.14.4",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-validator-option": "^7.12.17",- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12",- "@babel/plugin-proposal-async-generator-functions": "^7.14.2",- "@babel/plugin-proposal-class-properties": "^7.13.0",- "@babel/plugin-proposal-class-static-block": "^7.14.3",- "@babel/plugin-proposal-dynamic-import": "^7.14.2",- "@babel/plugin-proposal-export-namespace-from": "^7.14.2",- "@babel/plugin-proposal-json-strings": "^7.14.2",- "@babel/plugin-proposal-logical-assignment-operators": "^7.14.2",- "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2",- "@babel/plugin-proposal-numeric-separator": "^7.14.2",- "@babel/plugin-proposal-object-rest-spread": "^7.14.4",- "@babel/plugin-proposal-optional-catch-binding": "^7.14.2",- "@babel/plugin-proposal-optional-chaining": "^7.14.2",- "@babel/plugin-proposal-private-methods": "^7.13.0",- "@babel/plugin-proposal-private-property-in-object": "^7.14.0",- "@babel/plugin-proposal-unicode-property-regex": "^7.12.13",+ "version": "7.14.5",+ "license": "MIT",+ "dependencies": {+ "@babel/compat-data": "^7.14.5",+ "@babel/helper-compilation-targets": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-validator-option": "^7.14.5",+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",+ "@babel/plugin-proposal-async-generator-functions": "^7.14.5",+ "@babel/plugin-proposal-class-properties": "^7.14.5",+ "@babel/plugin-proposal-class-static-block": "^7.14.5",+ "@babel/plugin-proposal-dynamic-import": "^7.14.5",+ "@babel/plugin-proposal-export-namespace-from": "^7.14.5",+ "@babel/plugin-proposal-json-strings": "^7.14.5",+ "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",+ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",+ "@babel/plugin-proposal-numeric-separator": "^7.14.5",+ "@babel/plugin-proposal-object-rest-spread": "^7.14.5",+ "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",+ "@babel/plugin-proposal-optional-chaining": "^7.14.5",+ "@babel/plugin-proposal-private-methods": "^7.14.5",+ "@babel/plugin-proposal-private-property-in-object": "^7.14.5",+ "@babel/plugin-proposal-unicode-property-regex": "^7.14.5","@babel/plugin-syntax-async-generators": "^7.8.4","@babel/plugin-syntax-class-properties": "^7.12.13",- "@babel/plugin-syntax-class-static-block": "^7.12.13",+ "@babel/plugin-syntax-class-static-block": "^7.14.5","@babel/plugin-syntax-dynamic-import": "^7.8.3","@babel/plugin-syntax-export-namespace-from": "^7.8.3","@babel/plugin-syntax-json-strings": "^7.8.3",@@ -1120,48 +1364,51 @@"@babel/plugin-syntax-object-rest-spread": "^7.8.3","@babel/plugin-syntax-optional-catch-binding": "^7.8.3","@babel/plugin-syntax-optional-chaining": "^7.8.3",- "@babel/plugin-syntax-private-property-in-object": "^7.14.0",- "@babel/plugin-syntax-top-level-await": "^7.12.13",- "@babel/plugin-transform-arrow-functions": "^7.13.0",- "@babel/plugin-transform-async-to-generator": "^7.13.0",- "@babel/plugin-transform-block-scoped-functions": "^7.12.13",- "@babel/plugin-transform-block-scoping": "^7.14.4",- "@babel/plugin-transform-classes": "^7.14.4",- "@babel/plugin-transform-computed-properties": "^7.13.0",- "@babel/plugin-transform-destructuring": "^7.14.4",- "@babel/plugin-transform-dotall-regex": "^7.12.13",- "@babel/plugin-transform-duplicate-keys": "^7.12.13",- "@babel/plugin-transform-exponentiation-operator": "^7.12.13",- "@babel/plugin-transform-for-of": "^7.13.0",- "@babel/plugin-transform-function-name": "^7.12.13",- "@babel/plugin-transform-literals": "^7.12.13",- "@babel/plugin-transform-member-expression-literals": "^7.12.13",- "@babel/plugin-transform-modules-amd": "^7.14.2",- "@babel/plugin-transform-modules-commonjs": "^7.14.0",- "@babel/plugin-transform-modules-systemjs": "^7.13.8",- "@babel/plugin-transform-modules-umd": "^7.14.0",- "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13",- "@babel/plugin-transform-new-target": "^7.12.13",- "@babel/plugin-transform-object-super": "^7.12.13",- "@babel/plugin-transform-parameters": "^7.14.2",- "@babel/plugin-transform-property-literals": "^7.12.13",- "@babel/plugin-transform-regenerator": "^7.13.15",- "@babel/plugin-transform-reserved-words": "^7.12.13",- "@babel/plugin-transform-shorthand-properties": "^7.12.13",- "@babel/plugin-transform-spread": "^7.13.0",- "@babel/plugin-transform-sticky-regex": "^7.12.13",- "@babel/plugin-transform-template-literals": "^7.13.0",- "@babel/plugin-transform-typeof-symbol": "^7.12.13",- "@babel/plugin-transform-unicode-escapes": "^7.12.13",- "@babel/plugin-transform-unicode-regex": "^7.12.13",+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5",+ "@babel/plugin-syntax-top-level-await": "^7.14.5",+ "@babel/plugin-transform-arrow-functions": "^7.14.5",+ "@babel/plugin-transform-async-to-generator": "^7.14.5",+ "@babel/plugin-transform-block-scoped-functions": "^7.14.5",+ "@babel/plugin-transform-block-scoping": "^7.14.5",+ "@babel/plugin-transform-classes": "^7.14.5",+ "@babel/plugin-transform-computed-properties": "^7.14.5",+ "@babel/plugin-transform-destructuring": "^7.14.5",+ "@babel/plugin-transform-dotall-regex": "^7.14.5",+ "@babel/plugin-transform-duplicate-keys": "^7.14.5",+ "@babel/plugin-transform-exponentiation-operator": "^7.14.5",+ "@babel/plugin-transform-for-of": "^7.14.5",+ "@babel/plugin-transform-function-name": "^7.14.5",+ "@babel/plugin-transform-literals": "^7.14.5",+ "@babel/plugin-transform-member-expression-literals": "^7.14.5",+ "@babel/plugin-transform-modules-amd": "^7.14.5",+ "@babel/plugin-transform-modules-commonjs": "^7.14.5",+ "@babel/plugin-transform-modules-systemjs": "^7.14.5",+ "@babel/plugin-transform-modules-umd": "^7.14.5",+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.5",+ "@babel/plugin-transform-new-target": "^7.14.5",+ "@babel/plugin-transform-object-super": "^7.14.5",+ "@babel/plugin-transform-parameters": "^7.14.5",+ "@babel/plugin-transform-property-literals": "^7.14.5",+ "@babel/plugin-transform-regenerator": "^7.14.5",+ "@babel/plugin-transform-reserved-words": "^7.14.5",+ "@babel/plugin-transform-shorthand-properties": "^7.14.5",+ "@babel/plugin-transform-spread": "^7.14.5",+ "@babel/plugin-transform-sticky-regex": "^7.14.5",+ "@babel/plugin-transform-template-literals": "^7.14.5",+ "@babel/plugin-transform-typeof-symbol": "^7.14.5",+ "@babel/plugin-transform-unicode-escapes": "^7.14.5",+ "@babel/plugin-transform-unicode-regex": "^7.14.5","@babel/preset-modules": "^0.1.4",- "@babel/types": "^7.14.4",- "babel-plugin-polyfill-corejs2": "^0.2.0",- "babel-plugin-polyfill-corejs3": "^0.2.0",- "babel-plugin-polyfill-regenerator": "^0.2.0",- "core-js-compat": "^3.9.0",+ "@babel/types": "^7.14.5",+ "babel-plugin-polyfill-corejs2": "^0.2.2",+ "babel-plugin-polyfill-corejs3": "^0.2.2",+ "babel-plugin-polyfill-regenerator": "^0.2.2",+ "core-js-compat": "^3.14.0","semver": "^6.3.0"},+ "engines": {+ "node": ">=6.9.0"+ },"peerDependencies": {"@babel/core": "^7.0.0-0"}@@ -1188,22 +1435,25 @@}},"node_modules/@babel/preset-react": {- "version": "7.13.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-validator-option": "^7.12.17",- "@babel/plugin-transform-react-display-name": "^7.12.13",- "@babel/plugin-transform-react-jsx": "^7.13.12",- "@babel/plugin-transform-react-jsx-development": "^7.12.17",- "@babel/plugin-transform-react-pure-annotations": "^7.12.1"+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-validator-option": "^7.14.5",+ "@babel/plugin-transform-react-display-name": "^7.14.5",+ "@babel/plugin-transform-react-jsx": "^7.14.5",+ "@babel/plugin-transform-react-jsx-development": "^7.14.5",+ "@babel/plugin-transform-react-pure-annotations": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"},"peerDependencies": {"@babel/core": "^7.0.0-0"}},"node_modules/@babel/runtime": {- "version": "7.12.5",+ "version": "7.14.0","license": "MIT","dependencies": {"regenerator-runtime": "^0.13.4"@@ -1219,34 +1469,44 @@}},"node_modules/@babel/template": {- "version": "7.12.13",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/code-frame": "^7.12.13",- "@babel/parser": "^7.12.13",- "@babel/types": "^7.12.13"+ "@babel/code-frame": "^7.14.5",+ "@babel/parser": "^7.14.5",+ "@babel/types": "^7.14.5"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/traverse": {- "version": "7.14.2",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/code-frame": "^7.12.13",- "@babel/generator": "^7.14.2",- "@babel/helper-function-name": "^7.14.2",- "@babel/helper-split-export-declaration": "^7.12.13",- "@babel/parser": "^7.14.2",- "@babel/types": "^7.14.2",+ "@babel/code-frame": "^7.14.5",+ "@babel/generator": "^7.14.5",+ "@babel/helper-function-name": "^7.14.5",+ "@babel/helper-hoist-variables": "^7.14.5",+ "@babel/helper-split-export-declaration": "^7.14.5",+ "@babel/parser": "^7.14.5",+ "@babel/types": "^7.14.5","debug": "^4.1.0","globals": "^11.1.0"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@babel/types": {- "version": "7.14.4",+ "version": "7.14.5","license": "MIT","dependencies": {- "@babel/helper-validator-identifier": "^7.14.0",+ "@babel/helper-validator-identifier": "^7.14.5","to-fast-properties": "^2.0.0"+ },+ "engines": {+ "node": ">=6.9.0"}},"node_modules/@discoveryjs/json-ext": {@@ -1256,6 +1516,86 @@"node": ">=10.0.0"}},+ "node_modules/@emotion/cache": {+ "version": "11.4.0",+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.4.0.tgz",+ "integrity": "sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==",+ "dependencies": {+ "@emotion/memoize": "^0.7.4",+ "@emotion/sheet": "^1.0.0",+ "@emotion/utils": "^1.0.0",+ "@emotion/weak-memoize": "^0.2.5",+ "stylis": "^4.0.3"+ }+ },+ "node_modules/@emotion/hash": {+ "version": "0.8.0",+ "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",+ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="+ },+ "node_modules/@emotion/memoize": {+ "version": "0.7.5",+ "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz",+ "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="+ },+ "node_modules/@emotion/react": {+ "version": "11.4.0",+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.4.0.tgz",+ "integrity": "sha512-4XklWsl9BdtatLoJpSjusXhpKv9YVteYKh9hPKP1Sxl+mswEFoUe0WtmtWjxEjkA51DQ2QRMCNOvKcSlCQ7ivg==",+ "dependencies": {+ "@babel/runtime": "^7.13.10",+ "@emotion/cache": "^11.4.0",+ "@emotion/serialize": "^1.0.2",+ "@emotion/sheet": "^1.0.1",+ "@emotion/utils": "^1.0.0",+ "@emotion/weak-memoize": "^0.2.5",+ "hoist-non-react-statics": "^3.3.1"+ },+ "peerDependencies": {+ "@babel/core": "^7.0.0",+ "react": ">=16.8.0"+ },+ "peerDependenciesMeta": {+ "@babel/core": {+ "optional": true+ },+ "@types/react": {+ "optional": true+ }+ }+ },+ "node_modules/@emotion/serialize": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.2.tgz",+ "integrity": "sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==",+ "dependencies": {+ "@emotion/hash": "^0.8.0",+ "@emotion/memoize": "^0.7.4",+ "@emotion/unitless": "^0.7.5",+ "@emotion/utils": "^1.0.0",+ "csstype": "^3.0.2"+ }+ },+ "node_modules/@emotion/sheet": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.1.tgz",+ "integrity": "sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g=="+ },+ "node_modules/@emotion/unitless": {+ "version": "0.7.5",+ "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",+ "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="+ },+ "node_modules/@emotion/utils": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.0.0.tgz",+ "integrity": "sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA=="+ },+ "node_modules/@emotion/weak-memoize": {+ "version": "0.2.5",+ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",+ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="+ },"node_modules/@eslint/eslintrc": {"version": "0.2.2","dev": true,@@ -1356,9 +1696,8 @@},"node_modules/@polka/url": {"version": "1.0.0-next.15",- "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",- "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==",- "dev": true+ "dev": true,+ "license": "MIT"},"node_modules/@stylelint/postcss-css-in-js": {"version": "0.37.2",@@ -1393,7 +1732,7 @@}},"node_modules/@tailwindcss/forms": {- "version": "0.3.2",+ "version": "0.3.3","license": "MIT","dependencies": {"mini-svg-data-uri": "^1.2.3"@@ -1415,19 +1754,12 @@"tailwindcss": ">=2.0.0"}},- "node_modules/@trysound/sax": {- "version": "0.1.1",- "license": "ISC",- "engines": {- "node": ">=10.13.0"- }- },"node_modules/@types/d3": {"version": "3.5.38","license": "MIT"},"node_modules/@types/eslint": {- "version": "7.2.12",+ "version": "7.2.13","license": "MIT","dependencies": {"@types/estree": "*",@@ -1603,7 +1935,7 @@}},"node_modules/@webpack-cli/configtest": {- "version": "1.0.3",+ "version": "1.0.4","license": "MIT","peerDependencies": {"webpack": "4.x.x || 5.x.x",@@ -1611,7 +1943,7 @@}},"node_modules/@webpack-cli/info": {- "version": "1.2.4",+ "version": "1.3.0","license": "MIT","dependencies": {"envinfo": "^7.7.3"@@ -1621,7 +1953,7 @@}},"node_modules/@webpack-cli/serve": {- "version": "1.4.0",+ "version": "1.5.1","license": "MIT","peerDependencies": {"webpack-cli": "4.x.x"@@ -1718,11 +2050,11 @@}},"node_modules/ansi-regex": {- "version": "4.1.0",+ "version": "5.0.0","dev": true,"license": "MIT","engines": {- "node": ">=6"+ "node": ">=8"}},"node_modules/ansi-styles": {@@ -1748,7 +2080,6 @@},"node_modules/argparse": {"version": "1.0.10",- "dev": true,"license": "MIT","dependencies": {"sprintf-js": "~1.0.2"@@ -1937,11 +2268,11 @@"license": "ISC"},"node_modules/astral-regex": {- "version": "1.0.0",+ "version": "2.0.0","dev": true,"license": "MIT","engines": {- "node": ">=4"+ "node": ">=8"}},"node_modules/at-least-node": {@@ -2248,7 +2579,7 @@}},"node_modules/caniuse-lite": {- "version": "1.0.30001230",+ "version": "1.0.30001236","license": "CC-BY-4.0","funding": {"type": "opencollective",@@ -2296,8 +2627,7 @@},"node_modules/chart.js": {"version": "3.3.2",- "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.3.2.tgz",- "integrity": "sha512-H0hSO7xqTIrwxoACqnSoNromEMfXvfuVnrbuSt2TuXfBDDofbnto4zuZlRtRvC73/b37q3wGAWZyUU41QPvNbA=="+ "license": "MIT"},"node_modules/chokidar": {"version": "3.5.1",@@ -2398,8 +2728,11 @@"license": "MIT"},"node_modules/commander": {- "version": "2.20.0",- "license": "MIT"+ "version": "6.2.1",+ "license": "MIT",+ "engines": {+ "node": ">= 6"+ }},"node_modules/commondir": {"version": "1.0.1",@@ -2479,7 +2812,7 @@}},"node_modules/core-js-compat": {- "version": "3.13.1",+ "version": "3.14.0","license": "MIT","dependencies": {"browserslist": "^4.16.6",@@ -2662,11 +2995,11 @@"license": "ISC"},"node_modules/css-minimizer-webpack-plugin": {- "version": "3.0.0",+ "version": "3.0.1","license": "MIT","dependencies": {"cssnano": "^5.0.0",- "jest-worker": "^26.3.0",+ "jest-worker": "^27.0.2","p-limit": "^3.0.2","postcss": "^8.2.9","schema-utils": "^3.0.0",@@ -3078,9 +3411,8 @@},"node_modules/duplexer": {"version": "0.1.2",- "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",- "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",- "dev": true+ "dev": true,+ "license": "MIT"},"node_modules/duplexer2": {"version": "0.1.4",@@ -3094,7 +3426,7 @@"license": "ISC"},"node_modules/emoji-regex": {- "version": "7.0.3",+ "version": "8.0.0","dev": true,"license": "MIT"},@@ -3150,7 +3482,6 @@},"node_modules/es-abstract": {"version": "1.17.5",- "dev": true,"license": "MIT","dependencies": {"es-to-primitive": "^1.2.1",@@ -3174,7 +3505,6 @@},"node_modules/es-abstract/node_modules/object-inspect": {"version": "1.7.0",- "dev": true,"license": "MIT","funding": {"url": "https://github.com/sponsors/ljharb"@@ -3186,7 +3516,6 @@},"node_modules/es-to-primitive": {"version": "1.2.1",- "dev": true,"license": "MIT","dependencies": {"is-callable": "^1.1.4",@@ -3255,28 +3584,30 @@}},"node_modules/eslint": {- "version": "7.15.0",+ "version": "7.28.0","dev": true,"license": "MIT","dependencies": {- "@babel/code-frame": "^7.0.0",- "@eslint/eslintrc": "^0.2.2",+ "@babel/code-frame": "7.12.11",+ "@eslint/eslintrc": "^0.4.2","ajv": "^6.10.0","chalk": "^4.0.0","cross-spawn": "^7.0.2","debug": "^4.0.1","doctrine": "^3.0.0","enquirer": "^2.3.5",+ "escape-string-regexp": "^4.0.0","eslint-scope": "^5.1.1","eslint-utils": "^2.1.0","eslint-visitor-keys": "^2.0.0","espree": "^7.3.1",- "esquery": "^1.2.0",+ "esquery": "^1.4.0","esutils": "^2.0.2",- "file-entry-cache": "^6.0.0",+ "fast-deep-equal": "^3.1.3",+ "file-entry-cache": "^6.0.1","functional-red-black-tree": "^1.0.1",- "glob-parent": "^5.0.0",- "globals": "^12.1.0",+ "glob-parent": "^5.1.2",+ "globals": "^13.6.0","ignore": "^4.0.6","import-fresh": "^3.0.0","imurmurhash": "^0.1.4",@@ -3284,7 +3615,7 @@"js-yaml": "^3.13.1","json-stable-stringify-without-jsonify": "^1.0.1","levn": "^0.4.1",- "lodash": "^4.17.19",+ "lodash.merge": "^4.6.2","minimatch": "^3.0.4","natural-compare": "^1.4.0","optionator": "^0.9.1",@@ -3293,7 +3624,7 @@"semver": "^7.2.1","strip-ansi": "^6.0.0","strip-json-comments": "^3.1.0",- "table": "^5.2.3",+ "table": "^6.0.9","text-table": "^0.2.0","v8-compile-cache": "^2.0.3"},@@ -3675,7 +4006,7 @@}},"node_modules/eslint/node_modules/chalk": {- "version": "4.1.0",+ "version": "4.1.1","dev": true,"license": "MIT","dependencies": {@@ -3706,7 +4037,7 @@"license": "MIT"},"node_modules/eslint/node_modules/glob-parent": {- "version": "5.1.1",+ "version": "5.1.2","dev": true,"license": "ISC","dependencies": {@@ -3717,11 +4048,11 @@}},"node_modules/eslint/node_modules/globals": {- "version": "12.4.0",+ "version": "13.9.0","dev": true,"license": "MIT","dependencies": {- "type-fest": "^0.8.1"+ "type-fest": "^0.20.2"},"engines": {"node": ">=8"@@ -3747,7 +4078,7 @@}},"node_modules/eslint/node_modules/import-fresh": {- "version": "3.2.2",+ "version": "3.3.0","dev": true,"license": "MIT","dependencies": {@@ -3756,6 +4087,9 @@},"engines": {"node": ">=6"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"}},"node_modules/eslint/node_modules/levn": {@@ -3814,7 +4148,7 @@}},"node_modules/eslint/node_modules/semver": {- "version": "7.3.4",+ "version": "7.3.5","dev": true,"license": "ISC","dependencies": {@@ -3974,7 +4308,7 @@}},"node_modules/execa": {- "version": "5.0.0",+ "version": "5.1.1","license": "MIT","dependencies": {"cross-spawn": "^7.0.3",@@ -4092,7 +4426,7 @@}},"node_modules/file-entry-cache": {- "version": "6.0.0",+ "version": "6.0.1","dev": true,"license": "MIT","dependencies": {@@ -4410,9 +4744,8 @@},"node_modules/gzip-size": {"version": "6.0.0",- "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",- "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==","dev": true,+ "license": "MIT","dependencies": {"duplexer": "^0.1.2"},@@ -4694,7 +5027,6 @@},"node_modules/is-callable": {"version": "1.2.2",- "dev": true,"license": "MIT","engines": {"node": ">= 0.4"@@ -4734,7 +5066,6 @@},"node_modules/is-date-object": {"version": "1.0.2",- "dev": true,"license": "MIT","engines": {"node": ">= 0.4"@@ -4831,7 +5162,6 @@},"node_modules/is-regex": {"version": "1.1.1",- "dev": true,"license": "MIT","dependencies": {"has-symbols": "^1.0.1"@@ -4875,7 +5205,6 @@},"node_modules/is-symbol": {"version": "1.0.3",- "dev": true,"license": "MIT","dependencies": {"has-symbols": "^1.0.1"@@ -4908,12 +5237,12 @@}},"node_modules/jest-worker": {- "version": "26.6.2",+ "version": "27.0.2","license": "MIT","dependencies": {"@types/node": "*","merge-stream": "^2.0.0",- "supports-color": "^7.0.0"+ "supports-color": "^8.0.0"},"engines": {"node": ">= 10.13.0"@@ -4927,13 +5256,16 @@}},"node_modules/jest-worker/node_modules/supports-color": {- "version": "7.2.0",+ "version": "8.1.1","license": "MIT","dependencies": {"has-flag": "^4.0.0"},"engines": {- "node": ">=8"+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/chalk/supports-color?sponsor=1"}},"node_modules/js-tokens": {@@ -4942,7 +5274,6 @@},"node_modules/js-yaml": {"version": "3.13.1",- "dev": true,"license": "MIT","dependencies": {"argparse": "^1.0.7",@@ -5344,6 +5675,11 @@"version": "2.0.14","license": "CC0-1.0"},+ "node_modules/memoize-one": {+ "version": "5.2.1",+ "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",+ "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="+ },"node_modules/meow": {"version": "8.0.0","dev": true,@@ -5568,9 +5904,8 @@},"node_modules/mime": {"version": "2.5.2",- "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",- "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==","dev": true,+ "license": "MIT","bin": {"mime": "cli.js"},@@ -5579,17 +5914,17 @@}},"node_modules/mime-db": {- "version": "1.47.0",+ "version": "1.48.0","license": "MIT","engines": {"node": ">= 0.6"}},"node_modules/mime-types": {- "version": "2.1.30",+ "version": "2.1.31","license": "MIT","dependencies": {- "mime-db": "1.47.0"+ "mime-db": "1.48.0"},"engines": {"node": ">= 0.6"@@ -5747,10 +6082,13 @@"license": "MIT"},"node_modules/normalize-url": {- "version": "4.5.1",+ "version": "6.0.1","license": "MIT","engines": {- "node": ">=8"+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"}},"node_modules/npm-run-path": {@@ -5918,7 +6256,6 @@},"node_modules/object.values": {"version": "1.1.1",- "dev": true,"license": "MIT","dependencies": {"define-properties": "^1.1.3",@@ -5955,9 +6292,8 @@},"node_modules/opener": {"version": "1.5.2",- "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",- "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==","dev": true,+ "license": "(WTFPL OR MIT)","bin": {"opener": "bin/opener-bin.js"}@@ -6148,7 +6484,7 @@}},"node_modules/postcss": {- "version": "8.3.0",+ "version": "8.3.2","license": "MIT","dependencies": {"colorette": "^1.2.2",@@ -6323,7 +6659,7 @@}},"node_modules/postcss-less/node_modules/postcss": {- "version": "7.0.35",+ "version": "7.0.36","dev": true,"license": "MIT","dependencies": {@@ -6808,7 +7144,7 @@}},"node_modules/postcss-safe-parser/node_modules/postcss": {- "version": "7.0.35",+ "version": "7.0.36","dev": true,"license": "MIT","dependencies": {@@ -6853,7 +7189,7 @@}},"node_modules/postcss-sass/node_modules/postcss": {- "version": "7.0.35",+ "version": "7.0.36","dev": true,"license": "MIT","dependencies": {@@ -6900,7 +7236,7 @@}},"node_modules/postcss-scss/node_modules/postcss": {- "version": "7.0.35",+ "version": "7.0.36","dev": true,"license": "MIT","dependencies": {@@ -7103,8 +7439,9 @@}},"node_modules/react": {- "version": "16.13.1",- "license": "MIT",+ "version": "16.14.0",+ "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",+ "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==","dependencies": {"loose-envify": "^1.1.0","object-assign": "^4.1.1",@@ -7115,8 +7452,9 @@}},"node_modules/react-dom": {- "version": "16.13.1",- "license": "MIT",+ "version": "16.14.0",+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",+ "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==","dependencies": {"loose-envify": "^1.1.0","object-assign": "^4.1.1",@@ -7124,12 +7462,13 @@"scheduler": "^0.19.1"},"peerDependencies": {- "react": "^16.13.1"+ "react": "^16.14.0"}},"node_modules/react-flatpickr": {"version": "3.10.5",- "license": "MIT",+ "resolved": "https://registry.npmjs.org/react-flatpickr/-/react-flatpickr-3.10.5.tgz",+ "integrity": "sha512-MZlBN9Ml4FLFoR5tS61T9BjJRIrwF0mKDqC+ni5ZgdtIbWVebp6emx9jpg8QuXv5hSr1W1by3Tqv3ebZXU7rhg==","dependencies": {"flatpickr": "^4.6.2","prop-types": "^15.5.10"@@ -7143,6 +7482,17 @@"react-dom": ">=16.3.x"}},+ "node_modules/react-input-autosize": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz",+ "integrity": "sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg==",+ "dependencies": {+ "prop-types": "^15.5.8"+ },+ "peerDependencies": {+ "react": "^16.3.0 || ^17.0.0"+ }+ },"node_modules/react-is": {"version": "16.11.0","license": "MIT"@@ -7182,6 +7532,24 @@"react": ">=15"}},+ "node_modules/react-select": {+ "version": "4.3.1",+ "resolved": "https://registry.npmjs.org/react-select/-/react-select-4.3.1.tgz",+ "integrity": "sha512-HBBd0dYwkF5aZk1zP81Wx5UsLIIT2lSvAY2JiJo199LjoLHoivjn9//KsmvQMEFGNhe58xyuOITjfxKCcGc62Q==",+ "dependencies": {+ "@babel/runtime": "^7.12.0",+ "@emotion/cache": "^11.4.0",+ "@emotion/react": "^11.1.1",+ "memoize-one": "^5.0.0",+ "prop-types": "^15.6.0",+ "react-input-autosize": "^3.0.0",+ "react-transition-group": "^4.3.0"+ },+ "peerDependencies": {+ "react": "^16.8.0 || ^17.0.0",+ "react-dom": "^16.8.0 || ^17.0.0"+ }+ },"node_modules/react-transition-group": {"version": "4.4.2","license": "BSD-3-Clause",@@ -7540,7 +7908,8 @@},"node_modules/scheduler": {"version": "0.19.1",- "license": "MIT",+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",+ "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==","dependencies": {"loose-envify": "^1.1.0","object-assign": "^4.1.1"@@ -7688,9 +8057,8 @@},"node_modules/sirv": {"version": "1.0.12",- "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",- "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==","dev": true,+ "license": "MIT","dependencies": {"@polka/url": "^1.0.0-next.15","mime": "^2.3.1",@@ -7791,7 +8159,6 @@},"node_modules/sprintf-js": {"version": "1.0.3",- "dev": true,"license": "BSD-3-Clause"},"node_modules/stable": {@@ -7926,7 +8293,6 @@},"node_modules/string.prototype.trimend": {"version": "1.0.1",- "dev": true,"license": "MIT","dependencies": {"define-properties": "^1.1.3",@@ -7938,7 +8304,6 @@},"node_modules/string.prototype.trimleft": {"version": "2.1.2",- "dev": true,"license": "MIT","dependencies": {"define-properties": "^1.1.3",@@ -7954,7 +8319,6 @@},"node_modules/string.prototype.trimright": {"version": "2.1.2",- "dev": true,"license": "MIT","dependencies": {"define-properties": "^1.1.3",@@ -7970,7 +8334,6 @@},"node_modules/string.prototype.trimstart": {"version": "1.0.1",- "dev": true,"license": "MIT","dependencies": {"define-properties": "^1.1.3",@@ -7981,14 +8344,14 @@}},"node_modules/strip-ansi": {- "version": "5.2.0",+ "version": "6.0.0","dev": true,"license": "MIT","dependencies": {- "ansi-regex": "^4.1.0"+ "ansi-regex": "^5.0.0"},"engines": {- "node": ">=6"+ "node": ">=8"}},"node_modules/strip-bom": {@@ -8263,7 +8626,7 @@}},"node_modules/stylelint/node_modules/postcss": {- "version": "7.0.35",+ "version": "7.0.36","dev": true,"license": "MIT","dependencies": {@@ -8432,6 +8795,11 @@"node": ">=10.0.0"}},+ "node_modules/stylis": {+ "version": "4.0.10",+ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz",+ "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg=="+ },"node_modules/sugarss": {"version": "2.0.0","dev": true,@@ -8441,7 +8809,7 @@}},"node_modules/sugarss/node_modules/postcss": {- "version": "7.0.35",+ "version": "7.0.36","dev": true,"license": "MIT","dependencies": {@@ -8491,22 +8859,28 @@"dev": true},"node_modules/svgo": {- "version": "2.3.0",+ "version": "1.3.2","license": "MIT","dependencies": {- "@trysound/sax": "0.1.1",- "chalk": "^4.1.0",- "commander": "^7.1.0",- "css-select": "^3.1.2",- "css-tree": "^1.1.2",- "csso": "^4.2.0",- "stable": "^0.1.8"+ "chalk": "^2.4.1",+ "coa": "^2.0.2",+ "css-select": "^2.0.0",+ "css-select-base-adapter": "^0.1.1",+ "css-tree": "1.0.0-alpha.37",+ "csso": "^4.0.2",+ "js-yaml": "^3.13.1",+ "mkdirp": "~0.5.1",+ "object.values": "^1.1.0",+ "sax": "~1.2.4",+ "stable": "^0.1.8",+ "unquote": "~1.1.1",+ "util.promisify": "~1.0.0"},"bin": {"svgo": "bin/svgo"},"engines": {- "node": ">=10.13.0"+ "node": ">=4.0.0"}},"node_modules/svgo/node_modules/ansi-styles": {@@ -8550,13 +8924,6 @@"version": "1.1.4","license": "MIT"},- "node_modules/svgo/node_modules/commander": {- "version": "7.2.0",- "license": "MIT",- "engines": {- "node": ">= 10"- }- },"node_modules/svgo/node_modules/has-flag": {"version": "4.0.0","license": "MIT",@@ -8589,7 +8956,7 @@}},"node_modules/tailwindcss": {- "version": "2.1.2",+ "version": "2.1.4","license": "MIT","dependencies": {"@fullhuman/postcss-purgecss": "^3.1.3",@@ -8727,10 +9094,10 @@}},"node_modules/terser-webpack-plugin": {- "version": "5.1.2",+ "version": "5.1.3","license": "MIT","dependencies": {- "jest-worker": "^26.6.2",+ "jest-worker": "^27.0.2","p-limit": "^3.1.0","schema-utils": "^3.0.0","serialize-javascript": "^5.0.1",@@ -8838,9 +9205,8 @@},"node_modules/totalist": {"version": "1.1.0",- "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",- "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==","dev": true,+ "license": "MIT","engines": {"node": ">=6"}@@ -9192,9 +9558,8 @@},"node_modules/webpack-bundle-analyzer": {"version": "4.4.2",- "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz",- "integrity": "sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ==","dev": true,+ "license": "MIT","dependencies": {"acorn": "^8.0.4","acorn-walk": "^8.0.0",@@ -9215,9 +9580,8 @@},"node_modules/webpack-bundle-analyzer/node_modules/acorn": {"version": "8.3.0",- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz",- "integrity": "sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==","dev": true,+ "license": "MIT","bin": {"acorn": "bin/acorn"},@@ -9227,18 +9591,16 @@},"node_modules/webpack-bundle-analyzer/node_modules/acorn-walk": {"version": "8.1.0",- "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.0.tgz",- "integrity": "sha512-mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg==","dev": true,+ "license": "MIT","engines": {"node": ">=0.4.0"}},"node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": {"version": "4.3.0",- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==","dev": true,+ "license": "MIT","dependencies": {"color-convert": "^2.0.1"},@@ -9251,9 +9613,8 @@},"node_modules/webpack-bundle-analyzer/node_modules/chalk": {"version": "4.1.1",- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",- "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==","dev": true,+ "license": "MIT","dependencies": {"ansi-styles": "^4.1.0","supports-color": "^7.1.0"@@ -9267,9 +9628,8 @@},"node_modules/webpack-bundle-analyzer/node_modules/color-convert": {"version": "2.0.1",- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==","dev": true,+ "license": "MIT","dependencies": {"color-name": "~1.1.4"},@@ -9279,33 +9639,29 @@},"node_modules/webpack-bundle-analyzer/node_modules/color-name": {"version": "1.1.4",- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",- "dev": true+ "dev": true,+ "license": "MIT"},"node_modules/webpack-bundle-analyzer/node_modules/commander": {"version": "6.2.1",- "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",- "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==","dev": true,+ "license": "MIT","engines": {"node": ">= 6"}},"node_modules/webpack-bundle-analyzer/node_modules/has-flag": {"version": "4.0.0",- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==","dev": true,+ "license": "MIT","engines": {"node": ">=8"}},"node_modules/webpack-bundle-analyzer/node_modules/supports-color": {"version": "7.2.0",- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==","dev": true,+ "license": "MIT","dependencies": {"has-flag": "^4.0.0"},@@ -9314,13 +9670,13 @@}},"node_modules/webpack-cli": {- "version": "4.7.0",+ "version": "4.7.2","license": "MIT","dependencies": {"@discoveryjs/json-ext": "^0.5.0",- "@webpack-cli/configtest": "^1.0.3",- "@webpack-cli/info": "^1.2.4",- "@webpack-cli/serve": "^1.4.0",+ "@webpack-cli/configtest": "^1.0.4",+ "@webpack-cli/info": "^1.3.0",+ "@webpack-cli/serve": "^1.5.1","colorette": "^1.2.1","commander": "^7.0.0","execa": "^5.0.0",@@ -9363,7 +9719,7 @@}},"node_modules/webpack-merge": {- "version": "5.7.3",+ "version": "5.8.0","license": "MIT","dependencies": {"clone-deep": "^4.0.1",@@ -9389,7 +9745,7 @@}},"node_modules/webpack/node_modules/acorn": {- "version": "8.2.4",+ "version": "8.3.0","license": "MIT","bin": {"acorn": "bin/acorn"@@ -9462,9 +9818,8 @@},"node_modules/ws": {"version": "7.4.6",- "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",- "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==","dev": true,+ "license": "MIT","engines": {"node": ">=8.3.0"},@@ -9523,20 +9878,20 @@}},"@babel/compat-data": {- "version": "7.14.4"+ "version": "7.14.5"},"@babel/core": {- "version": "7.14.3",- "requires": {- "@babel/code-frame": "^7.12.13",- "@babel/generator": "^7.14.3",- "@babel/helper-compilation-targets": "^7.13.16",- "@babel/helper-module-transforms": "^7.14.2",- "@babel/helpers": "^7.14.0",- "@babel/parser": "^7.14.3",- "@babel/template": "^7.12.13",- "@babel/traverse": "^7.14.2",- "@babel/types": "^7.14.2",+ "version": "7.14.5",+ "requires": {+ "@babel/code-frame": "^7.14.5",+ "@babel/generator": "^7.14.5",+ "@babel/helper-compilation-targets": "^7.14.5",+ "@babel/helper-module-transforms": "^7.14.5",+ "@babel/helpers": "^7.14.5",+ "@babel/parser": "^7.14.5",+ "@babel/template": "^7.14.5",+ "@babel/traverse": "^7.14.5",+ "@babel/types": "^7.14.5","convert-source-map": "^1.7.0","debug": "^4.1.0","gensync": "^1.0.0-beta.2",@@ -9551,31 +9906,31 @@}},"@babel/generator": {- "version": "7.14.3",+ "version": "7.14.5","requires": {- "@babel/types": "^7.14.2",+ "@babel/types": "^7.14.5","jsesc": "^2.5.1","source-map": "^0.5.0"}},"@babel/helper-annotate-as-pure": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/types": "^7.12.13"+ "@babel/types": "^7.14.5"}},"@babel/helper-builder-binary-assignment-operator-visitor": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-explode-assignable-expression": "^7.12.13",- "@babel/types": "^7.12.13"+ "@babel/helper-explode-assignable-expression": "^7.14.5",+ "@babel/types": "^7.14.5"}},"@babel/helper-compilation-targets": {- "version": "7.14.4",+ "version": "7.14.5","requires": {- "@babel/compat-data": "^7.14.4",- "@babel/helper-validator-option": "^7.12.17",+ "@babel/compat-data": "^7.14.5",+ "@babel/helper-validator-option": "^7.14.5","browserslist": "^4.16.6","semver": "^6.3.0"},@@ -9586,20 +9941,20 @@}},"@babel/helper-create-class-features-plugin": {- "version": "7.14.4",+ "version": "7.14.5","requires": {- "@babel/helper-annotate-as-pure": "^7.12.13",- "@babel/helper-function-name": "^7.14.2",- "@babel/helper-member-expression-to-functions": "^7.13.12",- "@babel/helper-optimise-call-expression": "^7.12.13",- "@babel/helper-replace-supers": "^7.14.4",- "@babel/helper-split-export-declaration": "^7.12.13"+ "@babel/helper-annotate-as-pure": "^7.14.5",+ "@babel/helper-function-name": "^7.14.5",+ "@babel/helper-member-expression-to-functions": "^7.14.5",+ "@babel/helper-optimise-call-expression": "^7.14.5",+ "@babel/helper-replace-supers": "^7.14.5",+ "@babel/helper-split-export-declaration": "^7.14.5"}},"@babel/helper-create-regexp-features-plugin": {- "version": "7.14.3",+ "version": "7.14.5","requires": {- "@babel/helper-annotate-as-pure": "^7.12.13",+ "@babel/helper-annotate-as-pure": "^7.14.5","regexpu-core": "^4.7.1"}},@@ -9622,254 +9977,253 @@}},"@babel/helper-explode-assignable-expression": {- "version": "7.13.0",+ "version": "7.14.5","requires": {- "@babel/types": "^7.13.0"+ "@babel/types": "^7.14.5"}},"@babel/helper-function-name": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-get-function-arity": "^7.12.13",- "@babel/template": "^7.12.13",- "@babel/types": "^7.14.2"+ "@babel/helper-get-function-arity": "^7.14.5",+ "@babel/template": "^7.14.5",+ "@babel/types": "^7.14.5"}},"@babel/helper-get-function-arity": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/types": "^7.12.13"+ "@babel/types": "^7.14.5"}},"@babel/helper-hoist-variables": {- "version": "7.13.16",+ "version": "7.14.5","requires": {- "@babel/traverse": "^7.13.15",- "@babel/types": "^7.13.16"+ "@babel/types": "^7.14.5"}},"@babel/helper-member-expression-to-functions": {- "version": "7.13.12",+ "version": "7.14.5","requires": {- "@babel/types": "^7.13.12"+ "@babel/types": "^7.14.5"}},"@babel/helper-module-imports": {- "version": "7.13.12",+ "version": "7.14.5","requires": {- "@babel/types": "^7.13.12"+ "@babel/types": "^7.14.5"}},"@babel/helper-module-transforms": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-module-imports": "^7.13.12",- "@babel/helper-replace-supers": "^7.13.12",- "@babel/helper-simple-access": "^7.13.12",- "@babel/helper-split-export-declaration": "^7.12.13",- "@babel/helper-validator-identifier": "^7.14.0",- "@babel/template": "^7.12.13",- "@babel/traverse": "^7.14.2",- "@babel/types": "^7.14.2"+ "@babel/helper-module-imports": "^7.14.5",+ "@babel/helper-replace-supers": "^7.14.5",+ "@babel/helper-simple-access": "^7.14.5",+ "@babel/helper-split-export-declaration": "^7.14.5",+ "@babel/helper-validator-identifier": "^7.14.5",+ "@babel/template": "^7.14.5",+ "@babel/traverse": "^7.14.5",+ "@babel/types": "^7.14.5"}},"@babel/helper-optimise-call-expression": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/types": "^7.12.13"+ "@babel/types": "^7.14.5"}},"@babel/helper-plugin-utils": {- "version": "7.13.0"+ "version": "7.14.5"},"@babel/helper-remap-async-to-generator": {- "version": "7.13.0",+ "version": "7.14.5","requires": {- "@babel/helper-annotate-as-pure": "^7.12.13",- "@babel/helper-wrap-function": "^7.13.0",- "@babel/types": "^7.13.0"+ "@babel/helper-annotate-as-pure": "^7.14.5",+ "@babel/helper-wrap-function": "^7.14.5",+ "@babel/types": "^7.14.5"}},"@babel/helper-replace-supers": {- "version": "7.14.4",+ "version": "7.14.5","requires": {- "@babel/helper-member-expression-to-functions": "^7.13.12",- "@babel/helper-optimise-call-expression": "^7.12.13",- "@babel/traverse": "^7.14.2",- "@babel/types": "^7.14.4"+ "@babel/helper-member-expression-to-functions": "^7.14.5",+ "@babel/helper-optimise-call-expression": "^7.14.5",+ "@babel/traverse": "^7.14.5",+ "@babel/types": "^7.14.5"}},"@babel/helper-simple-access": {- "version": "7.13.12",+ "version": "7.14.5","requires": {- "@babel/types": "^7.13.12"+ "@babel/types": "^7.14.5"}},"@babel/helper-skip-transparent-expression-wrappers": {- "version": "7.12.1",+ "version": "7.14.5","requires": {- "@babel/types": "^7.12.1"+ "@babel/types": "^7.14.5"}},"@babel/helper-split-export-declaration": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/types": "^7.12.13"+ "@babel/types": "^7.14.5"}},"@babel/helper-validator-identifier": {- "version": "7.14.0"+ "version": "7.14.5"},"@babel/helper-validator-option": {- "version": "7.12.17"+ "version": "7.14.5"},"@babel/helper-wrap-function": {- "version": "7.13.0",+ "version": "7.14.5","requires": {- "@babel/helper-function-name": "^7.12.13",- "@babel/template": "^7.12.13",- "@babel/traverse": "^7.13.0",- "@babel/types": "^7.13.0"+ "@babel/helper-function-name": "^7.14.5",+ "@babel/template": "^7.14.5",+ "@babel/traverse": "^7.14.5",+ "@babel/types": "^7.14.5"}},"@babel/helpers": {- "version": "7.14.0",+ "version": "7.14.5","requires": {- "@babel/template": "^7.12.13",- "@babel/traverse": "^7.14.0",- "@babel/types": "^7.14.0"+ "@babel/template": "^7.14.5",+ "@babel/traverse": "^7.14.5",+ "@babel/types": "^7.14.5"}},"@babel/highlight": {- "version": "7.14.0",+ "version": "7.14.5","requires": {- "@babel/helper-validator-identifier": "^7.14.0",+ "@babel/helper-validator-identifier": "^7.14.5","chalk": "^2.0.0","js-tokens": "^4.0.0"}},"@babel/parser": {- "version": "7.14.4"+ "version": "7.14.5"},"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {- "version": "7.13.12",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",- "@babel/plugin-proposal-optional-chaining": "^7.13.12"+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",+ "@babel/plugin-proposal-optional-chaining": "^7.14.5"}},"@babel/plugin-proposal-async-generator-functions": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-remap-async-to-generator": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-remap-async-to-generator": "^7.14.5","@babel/plugin-syntax-async-generators": "^7.8.4"}},"@babel/plugin-proposal-class-properties": {- "version": "7.13.0",+ "version": "7.14.5","requires": {- "@babel/helper-create-class-features-plugin": "^7.13.0",- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-create-class-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-proposal-class-static-block": {- "version": "7.14.3",+ "version": "7.14.5","requires": {- "@babel/helper-create-class-features-plugin": "^7.14.3",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/plugin-syntax-class-static-block": "^7.12.13"+ "@babel/helper-create-class-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/plugin-syntax-class-static-block": "^7.14.5"}},"@babel/plugin-proposal-dynamic-import": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-dynamic-import": "^7.8.3"}},"@babel/plugin-proposal-export-namespace-from": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-export-namespace-from": "^7.8.3"}},"@babel/plugin-proposal-json-strings": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-json-strings": "^7.8.3"}},"@babel/plugin-proposal-logical-assignment-operators": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"}},"@babel/plugin-proposal-nullish-coalescing-operator": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"}},"@babel/plugin-proposal-numeric-separator": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-numeric-separator": "^7.10.4"}},"@babel/plugin-proposal-object-rest-spread": {- "version": "7.14.4",+ "version": "7.14.5","requires": {- "@babel/compat-data": "^7.14.4",- "@babel/helper-compilation-targets": "^7.14.4",- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/compat-data": "^7.14.5",+ "@babel/helper-compilation-targets": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-object-rest-spread": "^7.8.3",- "@babel/plugin-transform-parameters": "^7.14.2"+ "@babel/plugin-transform-parameters": "^7.14.5"}},"@babel/plugin-proposal-optional-catch-binding": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-plugin-utils": "^7.14.5","@babel/plugin-syntax-optional-catch-binding": "^7.8.3"}},"@babel/plugin-proposal-optional-chaining": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5","@babel/plugin-syntax-optional-chaining": "^7.8.3"}},"@babel/plugin-proposal-private-methods": {- "version": "7.13.0",+ "version": "7.14.5","requires": {- "@babel/helper-create-class-features-plugin": "^7.13.0",- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-create-class-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-proposal-private-property-in-object": {- "version": "7.14.0",+ "version": "7.14.5","requires": {- "@babel/helper-annotate-as-pure": "^7.12.13",- "@babel/helper-create-class-features-plugin": "^7.14.0",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/plugin-syntax-private-property-in-object": "^7.14.0"+ "@babel/helper-annotate-as-pure": "^7.14.5",+ "@babel/helper-create-class-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5"}},"@babel/plugin-proposal-unicode-property-regex": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-create-regexp-features-plugin": "^7.12.13",- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-create-regexp-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-syntax-async-generators": {@@ -9885,9 +10239,9 @@}},"@babel/plugin-syntax-class-static-block": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-syntax-dynamic-import": {@@ -9909,9 +10263,9 @@}},"@babel/plugin-syntax-jsx": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-syntax-logical-assignment-operators": {@@ -9951,288 +10305,288 @@}},"@babel/plugin-syntax-private-property-in-object": {- "version": "7.14.0",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-syntax-top-level-await": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-arrow-functions": {- "version": "7.13.0",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-async-to-generator": {- "version": "7.13.0",+ "version": "7.14.5","requires": {- "@babel/helper-module-imports": "^7.12.13",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-remap-async-to-generator": "^7.13.0"+ "@babel/helper-module-imports": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-remap-async-to-generator": "^7.14.5"}},"@babel/plugin-transform-block-scoped-functions": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-block-scoping": {- "version": "7.14.4",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-classes": {- "version": "7.14.4",- "requires": {- "@babel/helper-annotate-as-pure": "^7.12.13",- "@babel/helper-function-name": "^7.14.2",- "@babel/helper-optimise-call-expression": "^7.12.13",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-replace-supers": "^7.14.4",- "@babel/helper-split-export-declaration": "^7.12.13",+ "version": "7.14.5",+ "requires": {+ "@babel/helper-annotate-as-pure": "^7.14.5",+ "@babel/helper-function-name": "^7.14.5",+ "@babel/helper-optimise-call-expression": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-replace-supers": "^7.14.5",+ "@babel/helper-split-export-declaration": "^7.14.5","globals": "^11.1.0"}},"@babel/plugin-transform-computed-properties": {- "version": "7.13.0",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-destructuring": {- "version": "7.14.4",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-dotall-regex": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-create-regexp-features-plugin": "^7.12.13",- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-create-regexp-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-duplicate-keys": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-exponentiation-operator": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13",- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-for-of": {- "version": "7.13.0",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-function-name": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-function-name": "^7.12.13",- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-function-name": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-literals": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-member-expression-literals": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-modules-amd": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-module-transforms": "^7.14.2",- "@babel/helper-plugin-utils": "^7.13.0",+ "@babel/helper-module-transforms": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5","babel-plugin-dynamic-import-node": "^2.3.3"}},"@babel/plugin-transform-modules-commonjs": {- "version": "7.14.0",+ "version": "7.14.5","requires": {- "@babel/helper-module-transforms": "^7.14.0",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-simple-access": "^7.13.12",+ "@babel/helper-module-transforms": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-simple-access": "^7.14.5","babel-plugin-dynamic-import-node": "^2.3.3"}},"@babel/plugin-transform-modules-systemjs": {- "version": "7.13.8",+ "version": "7.14.5","requires": {- "@babel/helper-hoist-variables": "^7.13.0",- "@babel/helper-module-transforms": "^7.13.0",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-validator-identifier": "^7.12.11",+ "@babel/helper-hoist-variables": "^7.14.5",+ "@babel/helper-module-transforms": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-validator-identifier": "^7.14.5","babel-plugin-dynamic-import-node": "^2.3.3"}},"@babel/plugin-transform-modules-umd": {- "version": "7.14.0",+ "version": "7.14.5","requires": {- "@babel/helper-module-transforms": "^7.14.0",- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-module-transforms": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-named-capturing-groups-regex": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-create-regexp-features-plugin": "^7.12.13"+ "@babel/helper-create-regexp-features-plugin": "^7.14.5"}},"@babel/plugin-transform-new-target": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-object-super": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13",- "@babel/helper-replace-supers": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-replace-supers": "^7.14.5"}},"@babel/plugin-transform-parameters": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-property-literals": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-react-display-name": {- "version": "7.14.2",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-react-jsx": {- "version": "7.14.3",+ "version": "7.14.5","requires": {- "@babel/helper-annotate-as-pure": "^7.12.13",- "@babel/helper-module-imports": "^7.13.12",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/plugin-syntax-jsx": "^7.12.13",- "@babel/types": "^7.14.2"+ "@babel/helper-annotate-as-pure": "^7.14.5",+ "@babel/helper-module-imports": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/plugin-syntax-jsx": "^7.14.5",+ "@babel/types": "^7.14.5"}},"@babel/plugin-transform-react-jsx-development": {- "version": "7.12.17",+ "version": "7.14.5","requires": {- "@babel/plugin-transform-react-jsx": "^7.12.17"+ "@babel/plugin-transform-react-jsx": "^7.14.5"}},"@babel/plugin-transform-react-pure-annotations": {- "version": "7.12.1",+ "version": "7.14.5","requires": {- "@babel/helper-annotate-as-pure": "^7.10.4",- "@babel/helper-plugin-utils": "^7.10.4"+ "@babel/helper-annotate-as-pure": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-regenerator": {- "version": "7.13.15",+ "version": "7.14.5","requires": {"regenerator-transform": "^0.14.2"}},"@babel/plugin-transform-reserved-words": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-shorthand-properties": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-spread": {- "version": "7.13.0",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"}},"@babel/plugin-transform-sticky-regex": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-template-literals": {- "version": "7.13.0",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-typeof-symbol": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-unicode-escapes": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/plugin-transform-unicode-regex": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/helper-create-regexp-features-plugin": "^7.12.13",- "@babel/helper-plugin-utils": "^7.12.13"+ "@babel/helper-create-regexp-features-plugin": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5"}},"@babel/preset-env": {- "version": "7.14.4",- "requires": {- "@babel/compat-data": "^7.14.4",- "@babel/helper-compilation-targets": "^7.14.4",- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-validator-option": "^7.12.17",- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12",- "@babel/plugin-proposal-async-generator-functions": "^7.14.2",- "@babel/plugin-proposal-class-properties": "^7.13.0",- "@babel/plugin-proposal-class-static-block": "^7.14.3",- "@babel/plugin-proposal-dynamic-import": "^7.14.2",- "@babel/plugin-proposal-export-namespace-from": "^7.14.2",- "@babel/plugin-proposal-json-strings": "^7.14.2",- "@babel/plugin-proposal-logical-assignment-operators": "^7.14.2",- "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2",- "@babel/plugin-proposal-numeric-separator": "^7.14.2",- "@babel/plugin-proposal-object-rest-spread": "^7.14.4",- "@babel/plugin-proposal-optional-catch-binding": "^7.14.2",- "@babel/plugin-proposal-optional-chaining": "^7.14.2",- "@babel/plugin-proposal-private-methods": "^7.13.0",- "@babel/plugin-proposal-private-property-in-object": "^7.14.0",- "@babel/plugin-proposal-unicode-property-regex": "^7.12.13",+ "version": "7.14.5",+ "requires": {+ "@babel/compat-data": "^7.14.5",+ "@babel/helper-compilation-targets": "^7.14.5",+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-validator-option": "^7.14.5",+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5",+ "@babel/plugin-proposal-async-generator-functions": "^7.14.5",+ "@babel/plugin-proposal-class-properties": "^7.14.5",+ "@babel/plugin-proposal-class-static-block": "^7.14.5",+ "@babel/plugin-proposal-dynamic-import": "^7.14.5",+ "@babel/plugin-proposal-export-namespace-from": "^7.14.5",+ "@babel/plugin-proposal-json-strings": "^7.14.5",+ "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",+ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",+ "@babel/plugin-proposal-numeric-separator": "^7.14.5",+ "@babel/plugin-proposal-object-rest-spread": "^7.14.5",+ "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",+ "@babel/plugin-proposal-optional-chaining": "^7.14.5",+ "@babel/plugin-proposal-private-methods": "^7.14.5",+ "@babel/plugin-proposal-private-property-in-object": "^7.14.5",+ "@babel/plugin-proposal-unicode-property-regex": "^7.14.5","@babel/plugin-syntax-async-generators": "^7.8.4","@babel/plugin-syntax-class-properties": "^7.12.13",- "@babel/plugin-syntax-class-static-block": "^7.12.13",+ "@babel/plugin-syntax-class-static-block": "^7.14.5","@babel/plugin-syntax-dynamic-import": "^7.8.3","@babel/plugin-syntax-export-namespace-from": "^7.8.3","@babel/plugin-syntax-json-strings": "^7.8.3",@@ -10242,46 +10596,46 @@"@babel/plugin-syntax-object-rest-spread": "^7.8.3","@babel/plugin-syntax-optional-catch-binding": "^7.8.3","@babel/plugin-syntax-optional-chaining": "^7.8.3",- "@babel/plugin-syntax-private-property-in-object": "^7.14.0",- "@babel/plugin-syntax-top-level-await": "^7.12.13",- "@babel/plugin-transform-arrow-functions": "^7.13.0",- "@babel/plugin-transform-async-to-generator": "^7.13.0",- "@babel/plugin-transform-block-scoped-functions": "^7.12.13",- "@babel/plugin-transform-block-scoping": "^7.14.4",- "@babel/plugin-transform-classes": "^7.14.4",- "@babel/plugin-transform-computed-properties": "^7.13.0",- "@babel/plugin-transform-destructuring": "^7.14.4",- "@babel/plugin-transform-dotall-regex": "^7.12.13",- "@babel/plugin-transform-duplicate-keys": "^7.12.13",- "@babel/plugin-transform-exponentiation-operator": "^7.12.13",- "@babel/plugin-transform-for-of": "^7.13.0",- "@babel/plugin-transform-function-name": "^7.12.13",- "@babel/plugin-transform-literals": "^7.12.13",- "@babel/plugin-transform-member-expression-literals": "^7.12.13",- "@babel/plugin-transform-modules-amd": "^7.14.2",- "@babel/plugin-transform-modules-commonjs": "^7.14.0",- "@babel/plugin-transform-modules-systemjs": "^7.13.8",- "@babel/plugin-transform-modules-umd": "^7.14.0",- "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13",- "@babel/plugin-transform-new-target": "^7.12.13",- "@babel/plugin-transform-object-super": "^7.12.13",- "@babel/plugin-transform-parameters": "^7.14.2",- "@babel/plugin-transform-property-literals": "^7.12.13",- "@babel/plugin-transform-regenerator": "^7.13.15",- "@babel/plugin-transform-reserved-words": "^7.12.13",- "@babel/plugin-transform-shorthand-properties": "^7.12.13",- "@babel/plugin-transform-spread": "^7.13.0",- "@babel/plugin-transform-sticky-regex": "^7.12.13",- "@babel/plugin-transform-template-literals": "^7.13.0",- "@babel/plugin-transform-typeof-symbol": "^7.12.13",- "@babel/plugin-transform-unicode-escapes": "^7.12.13",- "@babel/plugin-transform-unicode-regex": "^7.12.13",+ "@babel/plugin-syntax-private-property-in-object": "^7.14.5",+ "@babel/plugin-syntax-top-level-await": "^7.14.5",+ "@babel/plugin-transform-arrow-functions": "^7.14.5",+ "@babel/plugin-transform-async-to-generator": "^7.14.5",+ "@babel/plugin-transform-block-scoped-functions": "^7.14.5",+ "@babel/plugin-transform-block-scoping": "^7.14.5",+ "@babel/plugin-transform-classes": "^7.14.5",+ "@babel/plugin-transform-computed-properties": "^7.14.5",+ "@babel/plugin-transform-destructuring": "^7.14.5",+ "@babel/plugin-transform-dotall-regex": "^7.14.5",+ "@babel/plugin-transform-duplicate-keys": "^7.14.5",+ "@babel/plugin-transform-exponentiation-operator": "^7.14.5",+ "@babel/plugin-transform-for-of": "^7.14.5",+ "@babel/plugin-transform-function-name": "^7.14.5",+ "@babel/plugin-transform-literals": "^7.14.5",+ "@babel/plugin-transform-member-expression-literals": "^7.14.5",+ "@babel/plugin-transform-modules-amd": "^7.14.5",+ "@babel/plugin-transform-modules-commonjs": "^7.14.5",+ "@babel/plugin-transform-modules-systemjs": "^7.14.5",+ "@babel/plugin-transform-modules-umd": "^7.14.5",+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.5",+ "@babel/plugin-transform-new-target": "^7.14.5",+ "@babel/plugin-transform-object-super": "^7.14.5",+ "@babel/plugin-transform-parameters": "^7.14.5",+ "@babel/plugin-transform-property-literals": "^7.14.5",+ "@babel/plugin-transform-regenerator": "^7.14.5",+ "@babel/plugin-transform-reserved-words": "^7.14.5",+ "@babel/plugin-transform-shorthand-properties": "^7.14.5",+ "@babel/plugin-transform-spread": "^7.14.5",+ "@babel/plugin-transform-sticky-regex": "^7.14.5",+ "@babel/plugin-transform-template-literals": "^7.14.5",+ "@babel/plugin-transform-typeof-symbol": "^7.14.5",+ "@babel/plugin-transform-unicode-escapes": "^7.14.5",+ "@babel/plugin-transform-unicode-regex": "^7.14.5","@babel/preset-modules": "^0.1.4",- "@babel/types": "^7.14.4",- "babel-plugin-polyfill-corejs2": "^0.2.0",- "babel-plugin-polyfill-corejs3": "^0.2.0",- "babel-plugin-polyfill-regenerator": "^0.2.0",- "core-js-compat": "^3.9.0",+ "@babel/types": "^7.14.5",+ "babel-plugin-polyfill-corejs2": "^0.2.2",+ "babel-plugin-polyfill-corejs3": "^0.2.2",+ "babel-plugin-polyfill-regenerator": "^0.2.2",+ "core-js-compat": "^3.14.0","semver": "^6.3.0"},"dependencies": {@@ -10301,18 +10655,18 @@}},"@babel/preset-react": {- "version": "7.13.13",+ "version": "7.14.5","requires": {- "@babel/helper-plugin-utils": "^7.13.0",- "@babel/helper-validator-option": "^7.12.17",- "@babel/plugin-transform-react-display-name": "^7.12.13",- "@babel/plugin-transform-react-jsx": "^7.13.12",- "@babel/plugin-transform-react-jsx-development": "^7.12.17",- "@babel/plugin-transform-react-pure-annotations": "^7.12.1"+ "@babel/helper-plugin-utils": "^7.14.5",+ "@babel/helper-validator-option": "^7.14.5",+ "@babel/plugin-transform-react-display-name": "^7.14.5",+ "@babel/plugin-transform-react-jsx": "^7.14.5",+ "@babel/plugin-transform-react-jsx-development": "^7.14.5",+ "@babel/plugin-transform-react-pure-annotations": "^7.14.5"}},"@babel/runtime": {- "version": "7.12.5",+ "version": "7.14.0","requires": {"regenerator-runtime": "^0.13.4"}@@ -10326,36 +10680,105 @@}},"@babel/template": {- "version": "7.12.13",+ "version": "7.14.5","requires": {- "@babel/code-frame": "^7.12.13",- "@babel/parser": "^7.12.13",- "@babel/types": "^7.12.13"+ "@babel/code-frame": "^7.14.5",+ "@babel/parser": "^7.14.5",+ "@babel/types": "^7.14.5"}},"@babel/traverse": {- "version": "7.14.2",- "requires": {- "@babel/code-frame": "^7.12.13",- "@babel/generator": "^7.14.2",- "@babel/helper-function-name": "^7.14.2",- "@babel/helper-split-export-declaration": "^7.12.13",- "@babel/parser": "^7.14.2",- "@babel/types": "^7.14.2",+ "version": "7.14.5",+ "requires": {+ "@babel/code-frame": "^7.14.5",+ "@babel/generator": "^7.14.5",+ "@babel/helper-function-name": "^7.14.5",+ "@babel/helper-hoist-variables": "^7.14.5",+ "@babel/helper-split-export-declaration": "^7.14.5",+ "@babel/parser": "^7.14.5",+ "@babel/types": "^7.14.5","debug": "^4.1.0","globals": "^11.1.0"}},"@babel/types": {- "version": "7.14.4",+ "version": "7.14.5","requires": {- "@babel/helper-validator-identifier": "^7.14.0",+ "@babel/helper-validator-identifier": "^7.14.5","to-fast-properties": "^2.0.0"}},"@discoveryjs/json-ext": {"version": "0.5.3"},+ "@emotion/cache": {+ "version": "11.4.0",+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.4.0.tgz",+ "integrity": "sha512-Zx70bjE7LErRO9OaZrhf22Qye1y4F7iDl+ITjet0J+i+B88PrAOBkKvaAWhxsZf72tDLajwCgfCjJ2dvH77C3g==",+ "requires": {+ "@emotion/memoize": "^0.7.4",+ "@emotion/sheet": "^1.0.0",+ "@emotion/utils": "^1.0.0",+ "@emotion/weak-memoize": "^0.2.5",+ "stylis": "^4.0.3"+ }+ },+ "@emotion/hash": {+ "version": "0.8.0",+ "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",+ "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="+ },+ "@emotion/memoize": {+ "version": "0.7.5",+ "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz",+ "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="+ },+ "@emotion/react": {+ "version": "11.4.0",+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.4.0.tgz",+ "integrity": "sha512-4XklWsl9BdtatLoJpSjusXhpKv9YVteYKh9hPKP1Sxl+mswEFoUe0WtmtWjxEjkA51DQ2QRMCNOvKcSlCQ7ivg==",+ "requires": {+ "@babel/runtime": "^7.13.10",+ "@emotion/cache": "^11.4.0",+ "@emotion/serialize": "^1.0.2",+ "@emotion/sheet": "^1.0.1",+ "@emotion/utils": "^1.0.0",+ "@emotion/weak-memoize": "^0.2.5",+ "hoist-non-react-statics": "^3.3.1"+ }+ },+ "@emotion/serialize": {+ "version": "1.0.2",+ "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.2.tgz",+ "integrity": "sha512-95MgNJ9+/ajxU7QIAruiOAdYNjxZX7G2mhgrtDWswA21VviYIRP1R5QilZ/bDY42xiKsaktP4egJb3QdYQZi1A==",+ "requires": {+ "@emotion/hash": "^0.8.0",+ "@emotion/memoize": "^0.7.4",+ "@emotion/unitless": "^0.7.5",+ "@emotion/utils": "^1.0.0",+ "csstype": "^3.0.2"+ }+ },+ "@emotion/sheet": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.0.1.tgz",+ "integrity": "sha512-GbIvVMe4U+Zc+929N1V7nW6YYJtidj31lidSmdYcWozwoBIObXBnaJkKNDjZrLm9Nc0BR+ZyHNaRZxqNZbof5g=="+ },+ "@emotion/unitless": {+ "version": "0.7.5",+ "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",+ "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="+ },+ "@emotion/utils": {+ "version": "1.0.0",+ "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.0.0.tgz",+ "integrity": "sha512-mQC2b3XLDs6QCW+pDQDiyO/EdGZYOygE8s5N5rrzjSI4M3IejPE/JPndCBwRT9z982aqQNi6beWs1UeayrQxxA=="+ },+ "@emotion/weak-memoize": {+ "version": "0.2.5",+ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",+ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="+ },"@eslint/eslintrc": {"version": "0.2.2","dev": true,@@ -10422,8 +10845,6 @@},"@polka/url": {"version": "1.0.0-next.15",- "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",- "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==","dev": true},"@stylelint/postcss-css-in-js": {@@ -10446,7 +10867,7 @@"requires": {}},"@tailwindcss/forms": {- "version": "0.3.2",+ "version": "0.3.3","requires": {"mini-svg-data-uri": "^1.2.3"}@@ -10460,14 +10881,11 @@"lodash.uniq": "^4.5.0"}},- "@trysound/sax": {- "version": "0.1.1"- },"@types/d3": {"version": "3.5.38"},"@types/eslint": {- "version": "7.2.12",+ "version": "7.2.13","requires": {"@types/estree": "*","@types/json-schema": "*"@@ -10617,17 +11035,17 @@}},"@webpack-cli/configtest": {- "version": "1.0.3",+ "version": "1.0.4","requires": {}},"@webpack-cli/info": {- "version": "1.2.4",+ "version": "1.3.0","requires": {"envinfo": "^7.7.3"}},"@webpack-cli/serve": {- "version": "1.4.0",+ "version": "1.5.1","requires": {}},"@xtuc/ieee754": {@@ -10682,7 +11100,7 @@"dev": true},"ansi-regex": {- "version": "4.1.0",+ "version": "5.0.0","dev": true},"ansi-styles": {@@ -10700,7 +11118,6 @@},"argparse": {"version": "1.0.10",- "dev": true,"requires": {"sprintf-js": "~1.0.2"}@@ -10827,7 +11244,7 @@"dev": true},"astral-regex": {- "version": "1.0.0",+ "version": "2.0.0","dev": true},"at-least-node": {@@ -11011,7 +11428,7 @@}},"caniuse-lite": {- "version": "1.0.30001230"+ "version": "1.0.30001236"},"chalk": {"version": "2.4.2",@@ -11034,9 +11451,7 @@"dev": true},"chart.js": {- "version": "3.3.2",- "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-3.3.2.tgz",- "integrity": "sha512-H0hSO7xqTIrwxoACqnSoNromEMfXvfuVnrbuSt2TuXfBDDofbnto4zuZlRtRvC73/b37q3wGAWZyUU41QPvNbA=="+ "version": "3.3.2"},"chokidar": {"version": "3.5.1",@@ -11110,7 +11525,7 @@"version": "1.2.2"},"commander": {- "version": "2.20.0"+ "version": "6.2.1"},"commondir": {"version": "1.0.1"@@ -11162,7 +11577,7 @@}},"core-js-compat": {- "version": "3.13.1",+ "version": "3.14.0","requires": {"browserslist": "^4.16.6","semver": "7.0.0"@@ -11272,10 +11687,10 @@}},"css-minimizer-webpack-plugin": {- "version": "3.0.0",+ "version": "3.0.1","requires": {"cssnano": "^5.0.0",- "jest-worker": "^26.3.0",+ "jest-worker": "^27.0.2","p-limit": "^3.0.2","postcss": "^8.2.9","schema-utils": "^3.0.0",@@ -11536,8 +11951,6 @@},"duplexer": {"version": "0.1.2",- "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",- "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==","dev": true},"duplexer2": {@@ -11550,7 +11963,7 @@"version": "1.3.742"},"emoji-regex": {- "version": "7.0.3",+ "version": "8.0.0","dev": true},"emojis-list": {@@ -11584,7 +11997,6 @@},"es-abstract": {"version": "1.17.5",- "dev": true,"requires": {"es-to-primitive": "^1.2.1","function-bind": "^1.1.1",@@ -11600,8 +12012,7 @@},"dependencies": {"object-inspect": {- "version": "1.7.0",- "dev": true+ "version": "1.7.0"}}},@@ -11610,7 +12021,6 @@},"es-to-primitive": {"version": "1.2.1",- "dev": true,"requires": {"is-callable": "^1.1.4","is-date-object": "^1.0.1",@@ -11643,27 +12053,29 @@}},"eslint": {- "version": "7.15.0",+ "version": "7.28.0","dev": true,"requires": {- "@babel/code-frame": "^7.0.0",- "@eslint/eslintrc": "^0.2.2",+ "@babel/code-frame": "7.12.11",+ "@eslint/eslintrc": "^0.4.2","ajv": "^6.10.0","chalk": "^4.0.0","cross-spawn": "^7.0.2","debug": "^4.0.1","doctrine": "^3.0.0","enquirer": "^2.3.5",+ "escape-string-regexp": "^4.0.0","eslint-scope": "^5.1.1","eslint-utils": "^2.1.0","eslint-visitor-keys": "^2.0.0","espree": "^7.3.1",- "esquery": "^1.2.0",+ "esquery": "^1.4.0","esutils": "^2.0.2",- "file-entry-cache": "^6.0.0",+ "fast-deep-equal": "^3.1.3",+ "file-entry-cache": "^6.0.1","functional-red-black-tree": "^1.0.1",- "glob-parent": "^5.0.0",- "globals": "^12.1.0",+ "glob-parent": "^5.1.2",+ "globals": "^13.6.0","ignore": "^4.0.6","import-fresh": "^3.0.0","imurmurhash": "^0.1.4",@@ -11671,7 +12083,7 @@"js-yaml": "^3.13.1","json-stable-stringify-without-jsonify": "^1.0.1","levn": "^0.4.1",- "lodash": "^4.17.19",+ "lodash.merge": "^4.6.2","minimatch": "^3.0.4","natural-compare": "^1.4.0","optionator": "^0.9.1",@@ -11680,7 +12092,7 @@"semver": "^7.2.1","strip-ansi": "^6.0.0","strip-json-comments": "^3.1.0",- "table": "^5.2.3",+ "table": "^6.0.9","text-table": "^0.2.0","v8-compile-cache": "^2.0.3"},@@ -11697,7 +12109,7 @@}},"chalk": {- "version": "4.1.0",+ "version": "4.1.1","dev": true,"requires": {"ansi-styles": "^4.1.0",@@ -11716,17 +12128,17 @@"dev": true},"glob-parent": {- "version": "5.1.1",+ "version": "5.1.2","dev": true,"requires": {"is-glob": "^4.0.1"}},"globals": {- "version": "12.4.0",+ "version": "13.9.0","dev": true,"requires": {- "type-fest": "^0.8.1"+ "type-fest": "^0.20.2"}},"has-flag": {@@ -11738,7 +12150,7 @@"dev": true},"import-fresh": {- "version": "3.2.2",+ "version": "3.3.0","dev": true,"requires": {"parent-module": "^1.0.0",@@ -11781,7 +12193,7 @@"dev": true},"semver": {- "version": "7.3.4",+ "version": "7.3.5","dev": true,"requires": {"lru-cache": "^6.0.0"@@ -12105,7 +12517,7 @@"version": "3.3.0"},"execa": {- "version": "5.0.0",+ "version": "5.1.1","requires": {"cross-spawn": "^7.0.3","get-stream": "^6.0.0",@@ -12192,7 +12604,7 @@}},"file-entry-cache": {- "version": "6.0.0",+ "version": "6.0.1","dev": true,"requires": {"flat-cache": "^3.0.4"@@ -12387,8 +12799,6 @@},"gzip-size": {"version": "6.0.0",- "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",- "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==","dev": true,"requires": {"duplexer": "^0.1.2"@@ -12556,8 +12966,7 @@}},"is-callable": {- "version": "1.2.2",- "dev": true+ "version": "1.2.2"},"is-color-stop": {"version": "1.1.0",@@ -12582,8 +12991,7 @@}},"is-date-object": {- "version": "1.0.2",- "dev": true+ "version": "1.0.2"},"is-decimal": {"version": "1.0.4",@@ -12628,7 +13036,6 @@},"is-regex": {"version": "1.1.1",- "dev": true,"requires": {"has-symbols": "^1.0.1"}@@ -12649,7 +13056,6 @@},"is-symbol": {"version": "1.0.3",- "dev": true,"requires": {"has-symbols": "^1.0.1"}@@ -12668,18 +13074,18 @@"version": "3.0.1"},"jest-worker": {- "version": "26.6.2",+ "version": "27.0.2","requires": {"@types/node": "*","merge-stream": "^2.0.0",- "supports-color": "^7.0.0"+ "supports-color": "^8.0.0"},"dependencies": {"has-flag": {"version": "4.0.0"},"supports-color": {- "version": "7.2.0",+ "version": "8.1.1","requires": {"has-flag": "^4.0.0"}@@ -12691,7 +13097,6 @@},"js-yaml": {"version": "3.13.1",- "dev": true,"requires": {"argparse": "^1.0.7","esprima": "^4.0.0"@@ -12943,6 +13348,11 @@"mdn-data": {"version": "2.0.14"},+ "memoize-one": {+ "version": "5.2.1",+ "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",+ "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="+ },"meow": {"version": "8.0.0","dev": true,@@ -13086,17 +13496,15 @@},"mime": {"version": "2.5.2",- "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",- "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==","dev": true},"mime-db": {- "version": "1.47.0"+ "version": "1.48.0"},"mime-types": {- "version": "2.1.30",+ "version": "2.1.31","requires": {- "mime-db": "1.47.0"+ "mime-db": "1.48.0"}},"mimic-fn": {@@ -13188,7 +13596,7 @@"dev": true},"normalize-url": {- "version": "4.5.1"+ "version": "6.0.1"},"npm-run-path": {"version": "4.0.1",@@ -13297,7 +13705,6 @@},"object.values": {"version": "1.1.1",- "dev": true,"requires": {"define-properties": "^1.1.3","es-abstract": "^1.17.0-next.1",@@ -13319,8 +13726,6 @@},"opener": {"version": "1.5.2",- "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",- "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==","dev": true},"optimist": {@@ -13441,7 +13846,7 @@}},"postcss": {- "version": "8.3.0",+ "version": "8.3.2","requires": {"colorette": "^1.2.2","nanoid": "^3.1.23",@@ -13545,7 +13950,7 @@},"dependencies": {"postcss": {- "version": "7.0.35",+ "version": "7.0.36","dev": true,"requires": {"chalk": "^2.4.2",@@ -13840,7 +14245,7 @@},"dependencies": {"postcss": {- "version": "7.0.35",+ "version": "7.0.36","dev": true,"requires": {"chalk": "^2.4.2",@@ -13870,7 +14275,7 @@},"dependencies": {"postcss": {- "version": "7.0.35",+ "version": "7.0.36","dev": true,"requires": {"chalk": "^2.4.2",@@ -13899,7 +14304,7 @@},"dependencies": {"postcss": {- "version": "7.0.35",+ "version": "7.0.36","dev": true,"requires": {"chalk": "^2.4.2",@@ -14024,7 +14429,9 @@}},"react": {- "version": "16.13.1",+ "version": "16.14.0",+ "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",+ "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==","requires": {"loose-envify": "^1.1.0","object-assign": "^4.1.1",@@ -14032,7 +14439,9 @@}},"react-dom": {- "version": "16.13.1",+ "version": "16.14.0",+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",+ "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==","requires": {"loose-envify": "^1.1.0","object-assign": "^4.1.1",@@ -14042,6 +14451,8 @@},"react-flatpickr": {"version": "3.10.5",+ "resolved": "https://registry.npmjs.org/react-flatpickr/-/react-flatpickr-3.10.5.tgz",+ "integrity": "sha512-MZlBN9Ml4FLFoR5tS61T9BjJRIrwF0mKDqC+ni5ZgdtIbWVebp6emx9jpg8QuXv5hSr1W1by3Tqv3ebZXU7rhg==","requires": {"flatpickr": "^4.6.2","prop-types": "^15.5.10"@@ -14051,6 +14462,14 @@"version": "3.0.4","requires": {}},+ "react-input-autosize": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-3.0.0.tgz",+ "integrity": "sha512-nL9uS7jEs/zu8sqwFE5MAPx6pPkNAriACQ2rGLlqmKr2sPGtN7TXTyDdQt4lbNXVx7Uzadb40x8qotIuru6Rhg==",+ "requires": {+ "prop-types": "^15.5.8"+ }+ },"react-is": {"version": "16.11.0"},@@ -14081,6 +14500,20 @@"tiny-warning": "^1.0.0"}},+ "react-select": {+ "version": "4.3.1",+ "resolved": "https://registry.npmjs.org/react-select/-/react-select-4.3.1.tgz",+ "integrity": "sha512-HBBd0dYwkF5aZk1zP81Wx5UsLIIT2lSvAY2JiJo199LjoLHoivjn9//KsmvQMEFGNhe58xyuOITjfxKCcGc62Q==",+ "requires": {+ "@babel/runtime": "^7.12.0",+ "@emotion/cache": "^11.4.0",+ "@emotion/react": "^11.1.1",+ "memoize-one": "^5.0.0",+ "prop-types": "^15.6.0",+ "react-input-autosize": "^3.0.0",+ "react-transition-group": "^4.3.0"+ }+ },"react-transition-group": {"version": "4.4.2","requires": {@@ -14317,6 +14750,8 @@},"scheduler": {"version": "0.19.1",+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",+ "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==","requires": {"loose-envify": "^1.1.0","object-assign": "^4.1.1"@@ -14419,8 +14854,6 @@},"sirv": {"version": "1.0.12",- "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",- "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==","dev": true,"requires": {"@polka/url": "^1.0.0-next.15",@@ -14490,8 +14923,7 @@"dev": true},"sprintf-js": {- "version": "1.0.3",- "dev": true+ "version": "1.0.3"},"stable": {"version": "0.1.8"@@ -14591,7 +15023,6 @@},"string.prototype.trimend": {"version": "1.0.1",- "dev": true,"requires": {"define-properties": "^1.1.3","es-abstract": "^1.17.5"@@ -14599,7 +15030,6 @@},"string.prototype.trimleft": {"version": "2.1.2",- "dev": true,"requires": {"define-properties": "^1.1.3","es-abstract": "^1.17.5",@@ -14608,7 +15038,6 @@},"string.prototype.trimright": {"version": "2.1.2",- "dev": true,"requires": {"define-properties": "^1.1.3","es-abstract": "^1.17.5",@@ -14617,17 +15046,16 @@},"string.prototype.trimstart": {"version": "1.0.1",- "dev": true,"requires": {"define-properties": "^1.1.3","es-abstract": "^1.17.5"}},"strip-ansi": {- "version": "5.2.0",+ "version": "6.0.0","dev": true,"requires": {- "ansi-regex": "^4.1.0"+ "ansi-regex": "^5.0.0"}},"strip-bom": {@@ -14781,7 +15209,7 @@}},"postcss": {- "version": "7.0.35",+ "version": "7.0.36","dev": true,"requires": {"chalk": "^2.4.2",@@ -14911,6 +15339,11 @@"stylelint-config-recommended": "^3.0.0"}},+ "stylis": {+ "version": "4.0.10",+ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.10.tgz",+ "integrity": "sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg=="+ },"sugarss": {"version": "2.0.0","dev": true,@@ -14919,7 +15352,7 @@},"dependencies": {"postcss": {- "version": "7.0.35",+ "version": "7.0.36","dev": true,"requires": {"chalk": "^2.4.2",@@ -14951,15 +15384,21 @@"dev": true},"svgo": {- "version": "2.3.0",+ "version": "1.3.2","requires": {- "@trysound/sax": "0.1.1",- "chalk": "^4.1.0",- "commander": "^7.1.0",- "css-select": "^3.1.2",- "css-tree": "^1.1.2",- "csso": "^4.2.0",- "stable": "^0.1.8"+ "chalk": "^2.4.1",+ "coa": "^2.0.2",+ "css-select": "^2.0.0",+ "css-select-base-adapter": "^0.1.1",+ "css-tree": "1.0.0-alpha.37",+ "csso": "^4.0.2",+ "js-yaml": "^3.13.1",+ "mkdirp": "~0.5.1",+ "object.values": "^1.1.0",+ "sax": "~1.2.4",+ "stable": "^0.1.8",+ "unquote": "~1.1.1",+ "util.promisify": "~1.0.0"},"dependencies": {"ansi-styles": {@@ -14984,9 +15423,6 @@"color-name": {"version": "1.1.4"},- "commander": {- "version": "7.2.0"- },"has-flag": {"version": "4.0.0"},@@ -15009,7 +15445,7 @@}},"tailwindcss": {- "version": "2.1.2",+ "version": "2.1.4","requires": {"@fullhuman/postcss-purgecss": "^3.1.3","bytes": "^3.0.0",@@ -15096,9 +15532,9 @@}},"terser-webpack-plugin": {- "version": "5.1.2",+ "version": "5.1.3","requires": {- "jest-worker": "^26.6.2",+ "jest-worker": "^27.0.2","p-limit": "^3.1.0","schema-utils": "^3.0.0","serialize-javascript": "^5.0.1",@@ -15159,8 +15595,6 @@},"totalist": {"version": "1.1.0",- "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",- "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==","dev": true},"trim-newlines": {@@ -15367,7 +15801,7 @@},"dependencies": {"acorn": {- "version": "8.2.4"+ "version": "8.3.0"},"source-map": {"version": "0.6.1"@@ -15383,8 +15817,6 @@},"webpack-bundle-analyzer": {"version": "4.4.2",- "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.4.2.tgz",- "integrity": "sha512-PIagMYhlEzFfhMYOzs5gFT55DkUdkyrJi/SxJp8EF3YMWhS+T9vvs2EoTetpk5qb6VsCq02eXTlRDOydRhDFAQ==","dev": true,"requires": {"acorn": "^8.0.4",@@ -15400,20 +15832,14 @@"dependencies": {"acorn": {"version": "8.3.0",- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.3.0.tgz",- "integrity": "sha512-tqPKHZ5CaBJw0Xmy0ZZvLs1qTV+BNFSyvn77ASXkpBNfIRk8ev26fKrD9iLGwGA9zedPao52GSHzq8lyZG0NUw==","dev": true},"acorn-walk": {"version": "8.1.0",- "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.1.0.tgz",- "integrity": "sha512-mjmzmv12YIG/G8JQdQuz2MUDShEJ6teYpT5bmWA4q7iwoGen8xtt3twF3OvzIUl+Q06aWIjvnwQUKvQ6TtMRjg==","dev": true},"ansi-styles": {"version": "4.3.0",- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==","dev": true,"requires": {"color-convert": "^2.0.1"@@ -15421,8 +15847,6 @@},"chalk": {"version": "4.1.1",- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",- "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==","dev": true,"requires": {"ansi-styles": "^4.1.0",@@ -15431,8 +15855,6 @@},"color-convert": {"version": "2.0.1",- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==","dev": true,"requires": {"color-name": "~1.1.4"@@ -15440,26 +15862,18 @@},"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},"commander": {"version": "6.2.1",- "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",- "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==","dev": true},"has-flag": {"version": "4.0.0",- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==","dev": true},"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"@@ -15468,12 +15882,12 @@}},"webpack-cli": {- "version": "4.7.0",+ "version": "4.7.2","requires": {"@discoveryjs/json-ext": "^0.5.0",- "@webpack-cli/configtest": "^1.0.3",- "@webpack-cli/info": "^1.2.4",- "@webpack-cli/serve": "^1.4.0",+ "@webpack-cli/configtest": "^1.0.4",+ "@webpack-cli/info": "^1.3.0",+ "@webpack-cli/serve": "^1.5.1","colorette": "^1.2.1","commander": "^7.0.0","execa": "^5.0.0",@@ -15491,7 +15905,7 @@}},"webpack-merge": {- "version": "5.7.3",+ "version": "5.8.0","requires": {"clone-deep": "^4.0.1","wildcard": "^2.0.0"@@ -15540,8 +15954,6 @@},"ws": {"version": "7.4.6",- "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",- "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==","dev": true,"requires": {}},diff --git a/assets/package.json b/assets/package.jsonindex 33ed60ec4e..6dcb468168 100644--- a/assets/package.json+++ b/assets/package.json@@ -22,6 +22,7 @@"css-minimizer-webpack-plugin": "^3.0.0","datamaps": "^0.5.9","iframe-resizer": "^4.3.2",+ "lodash.debounce": "^4.0.8","mini-css-extract-plugin": "^1.6.0","phoenix": "file:../deps/phoenix","phoenix_html": "file:../deps/phoenix_html",@@ -32,6 +33,7 @@"react-flatpickr": "3.10.5","react-flip-move": "^3.0.4","react-router-dom": "^5.2.0",+ "react-select": "^4.3.1","react-transition-group": "^4.4.2","tailwindcss": "^2.1.2","terser-webpack-plugin": "^5.1.2",diff --git a/assets/tailwind.config.js b/assets/tailwind.config.jsindex 1e781ce1be..f36c7b823b 100644--- a/assets/tailwind.config.js+++ b/assets/tailwind.config.js@@ -14,6 +14,7 @@ module.exports = {extend: {colors: {orange: colors.orange,+ 'gray-950': 'rgb(13, 18, 30)','gray-850': 'rgb(26, 32, 44)','gray-825': 'rgb(37, 47, 63)'},@@ -30,7 +31,7 @@ module.exports = {'9': 9,},maxWidth: {- '2xs': '16rem',+ '2xs': '15rem','3xs': '12rem',}},diff --git a/lib/plausible/stats/clickhouse.ex b/lib/plausible/stats/clickhouse.exindex c16a4ec477..60607f6a83 100644--- a/lib/plausible/stats/clickhouse.ex+++ b/lib/plausible/stats/clickhouse.ex@@ -257,13 +257,7 @@ defmodule Plausible.Stats.Clickhouse dofrom(s in referrers, where: s.referrer_source != "")end- referrers =- if query.filters["page"] do- page = query.filters["page"]- from(s in referrers, where: s.entry_page == ^page)- else- referrers- end+ referrers = apply_page_as_entry_page(referrers, site, query)referrers =if include_details do@@ -326,13 +320,7 @@ defmodule Plausible.Stats.Clickhouse doenddefp apply_page_as_entry_page(db_query, _site, query) do- page = query.filters["page"]-- if is_binary(page) do- from(s in db_query, where: s.entry_page == ^page)- else- db_query- end+ include_path_filter_entry(db_query, query.filters["page"])enddef utm_mediums(site, query, limit \\ 9, page \\ 1, show_noref \\ false) do@@ -691,6 +679,55 @@ defmodule Plausible.Stats.Clickhouse do|> Enum.into(%{})end+ def page_times_by_page_url(site, query, page_list \\ nil)++ def page_times_by_page_url(site, query, _page_list = nil) do+ {negated, updated_page_selection} = query.filters["page"] |> check_negated_filter()+ {_, page_regex} = updated_page_selection |> convert_path_regex()++ q =+ from(+ e in base_query_w_sessions(site, %Query{+ query+ | filters: Map.delete(query.filters, "page")+ }),+ select: {+ fragment("? as p", e.pathname),+ fragment("? as t", e.timestamp),+ fragment("? as s", e.session_id)+ },+ order_by: [e.session_id, e.timestamp]+ )++ {base_query_raw, base_query_raw_params} = ClickhouseRepo.to_sql(:all, q)++ time_query = "+ SELECT+ avg(ifNotFinite(avgTime, null))+ FROM+ (SELECT+ p,+ sum(td)/count(case when p2 != p then 1 end) as avgTime+ FROM+ (SELECT+ p,+ p2,+ sum(t2-t) as td+ FROM+ (SELECT+ *,+ neighbor(t, 1) as t2,+ neighbor(p, 1) as p2,+ neighbor(s, 1) as s2+ FROM (#{base_query_raw}))+ WHERE s=s2 AND+ #{if negated, do: "not(match(p, ?))", else: "match(p, ?)"}+ GROUP BY p,p2,s)+ GROUP BY p)"++ time_query |> ClickhouseRepo.query(base_query_raw_params ++ [page_regex])+ end+def page_times_by_page_url(site, query, page_list) doq =from(@@ -708,24 +745,27 @@ defmodule Plausible.Stats.Clickhouse do{base_query_raw, base_query_raw_params} = ClickhouseRepo.to_sql(:all, q)- "SELECT- p,- sum(td)/count(case when p2 != p then 1 end) as avgTime- FROM- (SELECT+ time_query = "+ SELECTp,- p2,- sum(t2-t) as td+ sum(td)/count(case when p2 != p then 1 end) as avgTimeFROM(SELECT- *,- neighbor(t, 1) as t2,- neighbor(p, 1) as p2,- neighbor(s, 1) as s2- FROM (#{base_query_raw}))- WHERE s=s2 AND p IN tuple(?)- GROUP BY p,p2,s)- GROUP BY p"+ p,+ p2,+ sum(t2-t) as td+ FROM+ (SELECT+ *,+ neighbor(t, 1) as t2,+ neighbor(p, 1) as p2,+ neighbor(s, 1) as s2+ FROM (#{base_query_raw}))+ WHERE s=s2 AND p IN tuple(?)+ GROUP BY p,p2,s)+ GROUP BY p"++ time_query|> ClickhouseRepo.query(base_query_raw_params ++ [(Enum.count(page_list) > 0 && page_list) || ["/"]])@@ -1156,21 +1196,9 @@ defmodule Plausible.Stats.Clickhouse dosessions_qend- sessions_q =- if query.filters["entry_page"] do- entry_page = query.filters["entry_page"]- from(s in sessions_q, where: s.entry_page == ^entry_page)- else- sessions_q- end+ sessions_q = include_path_filter_entry(sessions_q, query.filters["entry_page"])- sessions_q =- if query.filters["exit_page"] do- exit_page = query.filters["exit_page"]- from(s in sessions_q, where: s.exit_page == ^exit_page)- else- sessions_q- end+ sessions_q = include_path_filter_exit(sessions_q, query.filters["exit_page"])q =from(e in "events",@@ -1194,13 +1222,7 @@ defmodule Plausible.Stats.Clickhouse doqend- q =- if query.filters["page"] do- page = query.filters["page"]- from(e in q, where: e.pathname == ^page)- else- q- end+ q = include_path_filter(q, query.filters["page"])if query.filters["props"] do[{key, val}] = query.filters["props"] |> Enum.into([])@@ -1350,21 +1372,9 @@ defmodule Plausible.Stats.Clickhouse doqend- q =- if query.filters["entry_page"] do- entry_page = query.filters["entry_page"]- from(s in q, where: s.entry_page == ^entry_page)- else- q- end+ q = include_path_filter_entry(q, query.filters["entry_page"])- q =- if query.filters["exit_page"] do- exit_page = query.filters["exit_page"]- from(s in q, where: s.exit_page == ^exit_page)- else- q- end+ q = include_path_filter_exit(q, query.filters["exit_page"])if query.filters["referrer"] doref = query.filters["referrer"]@@ -1464,13 +1474,7 @@ defmodule Plausible.Stats.Clickhouse doqend- q =- if query.filters["page"] do- page = query.filters["page"]- from(e in q, where: e.pathname == ^page)- else- q- end+ q = include_path_filter(q, query.filters["page"])if query.filters["props"] do[{key, val}] = query.filters["props"] |> Enum.into([])@@ -1550,12 +1554,9 @@ defmodule Plausible.Stats.Clickhouse doendif path do- if String.match?(path, ~r/\*/) do- path_regex =- "^#{path}\/?$"- |> String.replace(~r/\*\*/, ".*")- |> String.replace(~r/(?<!\.)\*/, "[^/]*")+ {contains_regex, path_regex} = convert_path_regex(path)+ if contains_regex dofrom(e in q, where: fragment("match(?, ?)", e.pathname, ^path_regex))elsefrom(e in q, where: e.pathname == ^path)@@ -1564,4 +1565,234 @@ defmodule Plausible.Stats.Clickhouse doqendend++ defp check_negated_filter(filter) do+ negated = String.at(filter, 0) == "!"+ updated_filter = if negated, do: String.slice(filter, 1..-1), else: filter++ {negated, updated_filter}+ end++ defp convert_path_regex(path) do+ contains_regex = String.match?(path, ~r/\*/)++ regex =+ "^#{path}\/?$"+ |> String.replace(~r/\*\*/, ".*")+ |> String.replace(~r/(?<!\.)\*/, "[^/]*")++ {contains_regex, regex}+ end++ defp include_path_filter(db_query, path) do+ if path do+ {negated, path} = check_negated_filter(path)+ {contains_regex, path_regex} = convert_path_regex(path)++ if contains_regex do+ if negated do+ from(e in db_query, where: fragment("not(match(?, ?))", e.pathname, ^path_regex))+ else+ from(e in db_query, where: fragment("match(?, ?)", e.pathname, ^path_regex))+ end+ else+ if negated do+ from(e in db_query, where: e.pathname != ^path)+ else+ from(e in db_query, where: e.pathname == ^path)+ end+ end+ else+ db_query+ end+ end++ defp include_path_filter_entry(db_query, path) do+ if path do+ {negated, path} = check_negated_filter(path)+ {contains_regex, path_regex} = convert_path_regex(path)++ if contains_regex do+ if negated do+ from(e in db_query, where: fragment("not(match(?, ?))", e.entry_page, ^path_regex))+ else+ from(e in db_query, where: fragment("match(?, ?)", e.entry_page, ^path_regex))+ end+ else+ if negated do+ from(e in db_query, where: e.entry_page != ^path)+ else+ from(e in db_query, where: e.entry_page == ^path)+ end+ end+ else+ db_query+ end+ end++ defp include_path_filter_exit(db_query, path) do+ if path do+ {negated, path} = check_negated_filter(path)+ {contains_regex, path_regex} = convert_path_regex(path)++ if contains_regex do+ if negated do+ from(e in db_query, where: fragment("not(match(?, ?))", e.exit_page, ^path_regex))+ else+ from(e in db_query, where: fragment("match(?, ?)", e.exit_page, ^path_regex))+ end+ else+ if negated do+ from(e in db_query, where: e.exit_page != ^path)+ else+ from(e in db_query, where: e.exit_page == ^path)+ end+ end+ else+ db_query+ end+ end++ def make_suggestions(site, query, "country", filter_search) do+ filter_search =+ String.split(filter_search, ",")+ |> Enum.map(fn c -> Plausible.Stats.CountryName.to_alpha2(c) end)++ q =+ from(+ e in base_session_query(site, query),+ group_by: e.country_code,+ order_by: [desc: fragment("count(*)")],+ select: {e.country_code}+ )++ ClickhouseRepo.all(q)+ |> Enum.map(fn {x} -> x end)+ |> Enum.filter(fn c -> Enum.find(filter_search, false, fn x -> x == c end) end)+ |> Enum.map(fn c -> Plausible.Stats.CountryName.to_alpha3(c) end)+ |> Enum.slice(0..24)+ end++ def make_suggestions(site, _query, "goal", filter_search) do+ Repo.all(from g in Plausible.Goal, where: g.domain == ^site.domain)+ |> Enum.map(fn x -> if x.event_name, do: x.event_name, else: "Visit #{x.page_path}" end)+ |> Enum.filter(fn goal ->+ String.contains?(+ String.downcase(goal),+ String.downcase(filter_search)+ )+ end)+ end++ def make_suggestions(site, query, filter_name, filter_search) do+ filter_search = if filter_search == nil, do: "", else: filter_search++ filter_query =+ if Enum.member?(["entry_page", "page", "exit_page"], filter_name),+ do: "%#{String.replace(filter_search, "*", "")}%",+ else: "%#{filter_search}%"++ filter_name =+ case filter_name do+ "page" -> "pathname"+ "source" -> "referrer_source"+ "os" -> "operating_system"+ "os_version" -> "operating_system_version"+ "screen" -> "screen_size"+ _ -> filter_name+ end++ q =+ if(filter_name == "pathname",+ do: base_query(site, query),+ else: base_session_query(site, query)+ )+ |> from(+ group_by: ^String.to_atom(filter_name),+ order_by: [desc: fragment("count(*)")],+ limit: 25+ )++ q =+ case filter_name do+ "pathname" ->+ from(e in q,+ select: {e.pathname},+ where: fragment("? ilike ?", e.pathname, ^filter_query)+ )++ "entry_page" ->+ from(e in q,+ select: {e.entry_page},+ where: fragment("? ilike ?", e.entry_page, ^filter_query)+ )++ "exit_page" ->+ from(e in q,+ select: {e.exit_page},+ where: fragment("? ilike ?", e.exit_page, ^filter_query)+ )++ "referrer_source" ->+ from(e in q,+ select: {e.referrer_source},+ where: fragment("? ilike ?", e.referrer_source, ^filter_query)+ )++ "utm_medium" ->+ from(e in q,+ select: {e.utm_medium},+ where: fragment("? ilike ?", e.utm_medium, ^filter_query)+ )++ "utm_source" ->+ from(e in q,+ select: {e.utm_source},+ where: fragment("? ilike ?", e.utm_source, ^filter_query)+ )++ "utm_campaign" ->+ from(e in q,+ select: {e.utm_campaign},+ where: fragment("? ilike ?", e.utm_campaign, ^filter_query)+ )++ "referrer" ->+ from(e in q,+ select: {e.referrer},+ where: fragment("? ilike ?", e.referrer, ^filter_query)+ )++ "browser" ->+ from(e in q, select: {e.browser}, where: fragment("? ilike ?", e.browser, ^filter_query))++ "browser_version" ->+ from(e in q,+ select: {e.browser_version},+ where: fragment("? ilike ?", e.browser_version, ^filter_query)+ )++ "operating_system" ->+ from(e in q,+ select: {e.operating_system},+ where: fragment("? ilike ?", e.operating_system, ^filter_query)+ )++ "operating_system_version" ->+ from(e in q,+ select: {e.operating_system_version},+ where: fragment("? ilike ?", e.operating_system_version, ^filter_query)+ )++ "screen_size" ->+ from(e in q,+ select: {e.screen_size},+ where: fragment("? ilike ?", e.screen_size, ^filter_query)+ )+ end++ ClickhouseRepo.all(q)+ |> Enum.map(fn {suggestion} -> suggestion end)+ |> Enum.filter(fn suggestion -> suggestion != "" end)+ endenddiff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.exindex 6f3806fdde..afaa9e0bb7 100644--- a/lib/plausible_web/controllers/api/stats_controller.ex+++ b/lib/plausible_web/controllers/api/stats_controller.ex@@ -110,14 +110,12 @@ defmodule PlausibleWeb.Api.StatsController doTask.yield_many([Task.async(fn ->- {:ok, page_times} =- Stats.page_times_by_page_url(site, query, [query.filters["page"]])+ {:ok, page_times} = Stats.page_times_by_page_url(site, query)page_timesend),Task.async(fn ->- {:ok, page_times} =- Stats.page_times_by_page_url(site, prev_query, [query.filters["page"]])+ {:ok, page_times} = Stats.page_times_by_page_url(site, prev_query)page_timesend)@@ -132,8 +130,8 @@ defmodule PlausibleWeb.Api.StatsController do{:ok, page_times} ->result = Enum.at(page_times.rows, 0)- result = if result, do: Enum.at(result, 1), else: nil- if result, do: {:ok, round(result)}, else: {:ok, 0}+ result = if result, do: Enum.at(result, 0), else: nil+ if result, do: {:ok, round(result)}, else: {nil, nil}_ ->response@@ -386,4 +384,11 @@ defmodule PlausibleWeb.Api.StatsController dodef handle_errors(conn, %{kind: kind, reason: reason}) dojson(conn, %{error: Exception.format_banner(kind, reason)})end++ def filter_suggestions(conn, params) do+ site = conn.assigns[:site]+ query = Query.from(site.timezone, params)++ json(conn, Stats.make_suggestions(site, query, params["filter_name"], params["q"]))+ endenddiff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.exindex b8778693dd..ab5f7ee87b 100644--- a/lib/plausible_web/router.ex+++ b/lib/plausible_web/router.ex@@ -69,6 +69,7 @@ defmodule PlausibleWeb.Router doget "/:domain/screen-sizes", StatsController, :screen_sizesget "/:domain/conversions", StatsController, :conversionsget "/:domain/property/:prop_name", StatsController, :prop_breakdown+ get "/:domain/suggestions/:filter_name", StatsController, :filter_suggestionsendscope "/api/v1/stats", PlausibleWeb.Api dodiff --git a/test/plausible_web/controllers/api/stats_controller/suggestions_test.exs b/test/plausible_web/controllers/api/stats_controller/suggestions_test.exsnew file mode 100644index 0000000000..48f009a1f2--- /dev/null+++ b/test/plausible_web/controllers/api/stats_controller/suggestions_test.exs@@ -0,0 +1,133 @@+defmodule PlausibleWeb.Api.StatsController.SuggestionsTest do+ use PlausibleWeb.ConnCase+ import Plausible.TestUtils++ describe "GET /api/stats/:domain/suggestions/:filter_name" do+ setup [:create_user, :log_in, :create_site]++ test "returns suggestions for pages without a query", %{conn: conn, site: site} do+ conn = get(conn, "/api/stats/#{site.domain}/suggestions/page?period=month&date=2019-01-01")++ assert json_response(conn, 200) == ["/", "/register", "/contact", "/irrelevant"]+ end++ test "returns suggestions for pages with a query", %{conn: conn, site: site} do+ conn =+ get(conn, "/api/stats/#{site.domain}/suggestions/page?period=month&date=2019-01-01&q=re")++ assert json_response(conn, 200) == ["/register", "/irrelevant"]+ end++ test "returns suggestions for pages without any suggestions", %{conn: conn, site: site} do+ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/suggestions/page?period=month&date=2019-01-01&q=/123"+ )++ assert json_response(conn, 200) == []+ end++ test "returns suggestions for goals", %{conn: conn, site: site} do+ conn = get(conn, "/api/stats/#{site.domain}/suggestions/goal?period=month&date=2019-01-01")++ assert json_response(conn, 200) == []+ end++ test "returns suggestions for sources", %{conn: conn, site: site} do+ conn =+ get(conn, "/api/stats/#{site.domain}/suggestions/source?period=month&date=2019-01-01")++ assert json_response(conn, 200) == ["10words", "Bing"]+ end++ test "returns suggestions for countries", %{conn: conn, site: site} do+ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/suggestions/country?period=month&date=2019-01-01&q=GBR,UKR,URY,USA"+ )++ assert json_response(conn, 200) == ["USA"]+ end++ test "returns suggestions for countries without country in search", %{conn: conn, site: site} do+ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/suggestions/country?period=month&date=2019-01-01&q=GBR,UKR,URY"+ )++ assert json_response(conn, 200) == []+ end++ test "returns suggestions for screen sizes", %{conn: conn, site: site} do+ conn =+ get(conn, "/api/stats/#{site.domain}/suggestions/screen?period=month&date=2019-01-01")++ assert json_response(conn, 200) == ["Desktop"]+ end++ test "returns suggestions for browsers", %{conn: conn, site: site} do+ conn =+ get(conn, "/api/stats/#{site.domain}/suggestions/browser?period=month&date=2019-01-01")++ assert json_response(conn, 200) == ["Chrome"]+ end++ test "returns suggestions for browser versions", %{conn: conn, site: site} do+ filters = Jason.encode!(%{browser: "Chrome"})++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/suggestions/browser_version?period=month&date=2019-01-01&filters=#{+ filters+ }"+ )++ assert json_response(conn, 200) == ["78.0"]+ end++ test "returns suggestions for OS", %{conn: conn, site: site} do+ conn = get(conn, "/api/stats/#{site.domain}/suggestions/os?period=month&date=2019-01-01")++ assert json_response(conn, 200) == ["Mac"]+ end++ test "returns suggestions for OS versions", %{conn: conn, site: site} do+ filters = Jason.encode!(%{os: "Mac"})++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/suggestions/os_version?period=month&date=2019-01-01&filters=#{+ filters+ }"+ )++ assert json_response(conn, 200) == ["10.15"]+ end++ test "returns suggestions for OS versions with search", %{conn: conn, site: site} do+ filters = Jason.encode!(%{os: "Mac"})++ conn =+ get(+ conn,+ "/api/stats/#{site.domain}/suggestions/os_version?period=month&date=2019-01-01&filters=#{+ filters+ }&q=11"+ )++ assert json_response(conn, 200) == []+ end++ test "returns suggestions for referrers", %{conn: conn, site: site} do+ conn =+ get(conn, "/api/stats/#{site.domain}/suggestions/referrer?period=month&date=2019-01-01")++ assert json_response(conn, 200) == ["10words.com/page1"]+ end+ end+end