From d5393d75c541da1dcf8cf3ca77fefd00f46ad756 Mon Sep 17 00:00:00 2001 From: Snowmee Date: Sat, 8 Aug 2020 21:09:16 +0200 Subject: [PATCH 001/448] =?UTF-8?q?Dienstgetr=C3=A4nke=20UI=20ohne=20backe?= =?UTF-8?q?ndanschluss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/baruser/BarFreedrinks.vue | 349 +++++++++++++++++++++++ src/components/baruser/BarNavigation.vue | 13 +- src/components/baruser/SearchBar.vue | 1 + src/plugins/routes.js | 4 +- src/router/index.js | 6 + src/views/contents/BarFreedrinksView.vue | 24 ++ 6 files changed, 393 insertions(+), 4 deletions(-) create mode 100644 src/components/baruser/BarFreedrinks.vue create mode 100644 src/views/contents/BarFreedrinksView.vue diff --git a/src/components/baruser/BarFreedrinks.vue b/src/components/baruser/BarFreedrinks.vue new file mode 100644 index 0000000..654e841 --- /dev/null +++ b/src/components/baruser/BarFreedrinks.vue @@ -0,0 +1,349 @@ + + + + + diff --git a/src/components/baruser/BarNavigation.vue b/src/components/baruser/BarNavigation.vue index ef58718..c08adc4 100644 --- a/src/components/baruser/BarNavigation.vue +++ b/src/components/baruser/BarNavigation.vue @@ -8,16 +8,25 @@ Geruecht + + + {{ beer }} + + + Freigetränke + + + + From 22c5ebce1b6cf11ce3f582ed1898e15bf4e4e836 Mon Sep 17 00:00:00 2001 From: Snowmee Date: Sat, 8 Aug 2020 23:15:04 +0200 Subject: [PATCH 002/448] add freedrink to user --- src/components/baruser/BarFreedrinks.vue | 7 +- src/components/user/UserNavigation.vue | 30 +- .../user/freedrink/freedrinkUserView.vue | 407 ++++++++++++++++++ src/router/index.js | 6 + 4 files changed, 432 insertions(+), 18 deletions(-) create mode 100644 src/components/user/freedrink/freedrinkUserView.vue diff --git a/src/components/baruser/BarFreedrinks.vue b/src/components/baruser/BarFreedrinks.vue index 654e841..0358179 100644 --- a/src/components/baruser/BarFreedrinks.vue +++ b/src/components/baruser/BarFreedrinks.vue @@ -170,6 +170,7 @@ + + + + diff --git a/src/router/index.js b/src/router/index.js index 2dc6732..9e2ba9d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -17,6 +17,7 @@ import Overview from '../components/finanzer/Overview' import User from '../components/finanzer/User' import ServiceManagement from '../components/vorstand/ServiceManagement' import Config from '@/components/user/Config' +import FreedrinkUserView from '@/components/user/freedrink/freedrinkUserView' import Jobs from '@/components/user/Jobs' import PriceList from '@/components/pricelist/PriceList' import ManagementNavigation from '@/components/vorstand/ManagementNavigation' @@ -94,6 +95,11 @@ const routes = [ name: 'add', component: AddAmount }, + { + path: 'freedrinkUser', + name: 'freedrinkUser', + component: FreedrinkUserView + }, { path: 'overview', name: 'userOverview', From 8ac74c9f64f8f9875661fdb7dd5be108c81b2b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Thu, 20 Aug 2020 08:39:38 +0200 Subject: [PATCH 003/448] =?UTF-8?q?Backend=20Connection=20f=C3=BCr=20Freig?= =?UTF-8?q?etr=C3=A4nke=20Band=20und=20Dienste?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Es wurde die Verbindung zur Schnittstelle aufgebaut. Freigetränke werden Dynamisch gehalten. --- src/components/baruser/BarFreedrinks.vue | 229 +++++++++++------------ src/plugins/routes.js | 7 +- src/store/index.js | 4 +- src/store/modules/freeDrinkList.js | 155 +++++++++++++++ 4 files changed, 271 insertions(+), 124 deletions(-) create mode 100644 src/store/modules/freeDrinkList.js diff --git a/src/components/baruser/BarFreedrinks.vue b/src/components/baruser/BarFreedrinks.vue index 0358179..8299945 100644 --- a/src/components/baruser/BarFreedrinks.vue +++ b/src/components/baruser/BarFreedrinks.vue @@ -9,106 +9,30 @@ {{ menuIcon }} - - Noch {{ ((limit - amount) / 100).toFixed(2) }} € + + Noch {{ ((limit - free_drink_list_history_job_credit) / 100).toFixed(2) }} € übrig!! - + Bier - - - Cuba - - - Schnaps - - - Wein - - - Gin Tonic - - - Fritz - - - Saft - - - Wasser + class="drinkBtn" + block + :disabled="locked" + :color="color" + @click="addAmount(freeDrink, freeDrinkTypeJob)" + >{{freeDrink.label}} - - - - - - - {{ plus }} - - - + + - {{ (amount / 100).toFixed(2) }} + {{ (free_drink_list_history_job_credit / 100).toFixed(2) }} € @@ -119,6 +43,41 @@ + + +
Bandgetränke
+ + {{ menuIcon }} + +
+ + + + + + {{freeDrink.label}} + + + + + + + + {{ free_drink_list_history_band_without_canceled.length }} Getränke + + + + + + + + +
@@ -127,13 +86,13 @@ Verlauf -
- + {{ now(message.date) }} @@ -141,9 +100,28 @@ createMessage(message) }} - STORNIERT!!! + STORNIERT!!! Klicken um zu Stornieren + + +
--> +
+ + + {{ now(freeDrinkHistory.timestamp) }} + {{ freeDrinkHistory.free_drink_type.name }}: {{ freeDrinkHistory.free_drink_config.label }} wurde für + {{ + (freeDrinkHistory.free_drink_config.price/100).toFixed(2) + }} € hinzugefügt + + STORNIERT!!! + Klicken um zu Stornieren @@ -151,18 +129,16 @@ - + Willst du wirklich?? - - Willst du wirklich den Betrag - {{ (stornoMessage.amount / 100).toFixed(2) }}€ von - den Dienstgetränke stornieren? + + {{canceledMessage.free_drink_type.name}}: Willst du wirklich ein {{canceledMessage.free_drink_config.label}} im Wert von {{(canceledMessage.free_drink_config.price/100).toFixed(2)}} € stornieren? - Abbrechen - Stornieren + Abbrechen + Stornieren @@ -176,58 +152,66 @@ + + diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue new file mode 100644 index 0000000..c1cedc7 --- /dev/null +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue @@ -0,0 +1,76 @@ + + + + + diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListMain.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListMain.vue new file mode 100644 index 0000000..bc04564 --- /dev/null +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListMain.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/components/vorstand/ManagementNavigation.vue b/src/components/vorstand/ManagementNavigation.vue index 6631763..fb61006 100644 --- a/src/components/vorstand/ManagementNavigation.vue +++ b/src/components/vorstand/ManagementNavigation.vue @@ -31,6 +31,14 @@ Dienstarten + + + mdi-beer + + + Freigetränke + + diff --git a/src/plugins/routes.js b/src/plugins/routes.js index 6d9c6e1..953a34a 100644 --- a/src/plugins/routes.js +++ b/src/plugins/routes.js @@ -32,6 +32,7 @@ const url = { freeDrinkListHistory: main + 'freeDrinkListHistory', deleteDrinkListHistory: main + 'deleteDrinkListHistory', freeDrinkListReasons: main + 'freeDrinkListReasons', + freeDrinkTypes: main + 'freeDrinkTypes', vorstand: { sm: { addUser: main + 'sm/addUser', diff --git a/src/router/index.js b/src/router/index.js index 9e2ba9d..b90dbcf 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -28,6 +28,9 @@ import WorkgroupManagement from '@/components/vorstand/WorkgroupManagement' import JobKindManager from '@/components/vorstand/JobKindManager' import JobsRequest from '@/components/user/JobsRequest' import ResetPassword from '@/components/ResetPassword' +import FreeDrinkList from '@/components/vorstand/FreeDrinkList' +import FreeDrinkListMain from '@/components/vorstand/FreeDrinkList/FreeDrinkListMain' +import FreeDrinkListConfig from '@/components/vorstand/FreeDrinkList/FreeDrinkListConfig' Vue.use(VueRouter) @@ -82,6 +85,23 @@ const routes = [ path: 'jobkindmanagement', name: 'jobkindManagement', component: JobKindManager + }, + { + path: 'freeDrinkList', + name: 'freeDrinkList', + component: FreeDrinkList, + children: [ + { + path: 'main', + name: 'freeDrinkListMain', + component: FreeDrinkListMain + }, + { + path: 'config', + name: 'freeDrinkListConfig', + component: FreeDrinkListConfig + } + ] } ] }, diff --git a/src/store/modules/freeDrinkList.js b/src/store/modules/freeDrinkList.js index 338aafb..7d434d5 100644 --- a/src/store/modules/freeDrinkList.js +++ b/src/store/modules/freeDrinkList.js @@ -6,9 +6,11 @@ const state = { free_drink_list_config: [], free_drink_list_history: [], free_drink_list_reasons: [], + free_drink_types: [], free_drink_list_config_loading: false, free_drink_list_history_loading: false, free_drink_list_reasons_loading: false, + free_drink_types_loading: false, snackbar_messages: [] } @@ -55,6 +57,12 @@ const mutations = { }, set_free_drink_list_reasons(state, data) { state.free_drink_list_reasons = data + }, + set_free_drink_types(state, data) { + state.free_drink_types = data + }, + set_free_drink_types_loading(state, loading) { + state.free_drink_types_loading = loading } } @@ -158,6 +166,25 @@ const actions = { } finally { commit('set_free_drink_list_reasons_loading', false) } + }, + async get_free_drink_types({ commit, dispatch, rootState }) { + try { + commit('set_free_drink_types_loading', true) + const response = await axios.get(url.freeDrinkTypes, { + headers: { Token: rootState.login.user.accessToken }, + timeout + }) + commit('set_free_drink_types', response.data) + } catch (e) { + dispatch('connectionError/addError', null, { root: true }) + if (e.message == 'Network Error') { + dispatch('connectionError/addError', null, { root: true }) + } + if (e.response) + if (e.response.status === 401) dispatch('logout', null, { root: true }) + } finally { + commit('set_free_drink_types_loading', false) + } } } @@ -234,6 +261,12 @@ const getters = { }, free_drink_list_reasons_loading(state) { return state.free_drink_list_reasons_loading + }, + free_drink_types(state) { + return state.free_drink_types + }, + free_drink_types_loading(state) { + return state.free_drink_types_loading } } From a28bbe8e0ae836d81854b21d5feac957e94af554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sat, 22 Aug 2020 18:10:39 +0200 Subject: [PATCH 007/448] better view for freedrinklistconfig --- .../FreeDrinkList/FreeDrinkListConfig.vue | 81 +++++++++++-------- 1 file changed, 49 insertions(+), 32 deletions(-) diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue index c1cedc7..2c3b77c 100644 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue @@ -6,39 +6,56 @@ - - + + + + + + + + + + + + + + + + + + + - - - - + From 8a442d029b5cc54ed38bf4bbe9aed4411cb9492e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sun, 23 Aug 2020 21:16:56 +0200 Subject: [PATCH 008/448] =?UTF-8?q?L=C3=B6schen,=20Modifizieren=20und=20Hi?= =?UTF-8?q?nzuf=C3=BCgen=20von=20Freigetr=C3=A4nken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Der Vorstand kann nun Freigetränke löschen, modifizieren und hinzufügen. --- .../FreeDrinkList/FreeDrinkListConfig.vue | 132 +++++++++++------- .../FreeDrinkListConfigConfigItem.vue | 116 +++++++++++++++ src/plugins/routes.js | 1 + src/store/modules/freeDrinkList.js | 66 +++++++++ 4 files changed, 268 insertions(+), 47 deletions(-) create mode 100644 src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigConfigItem.vue diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue index 2c3b77c..326e95a 100644 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue @@ -9,83 +9,121 @@ + + + + + - - LOG + + + mdi-plus Gründe für Freigetränke + + + + + Wirklich löschen? + + + Willst du wirklich {{check_model.label}} mit dem Getränk {{check_model.drink.name}} löschen? + Wenn du dies löscht, wird auch der ganze Verlauf gelöscht. Dh. es ist nicht mehr vollständig nachvollziehbar, was getrunken wurde. + + + + Abbrechen + Löschen + + +
diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigConfigItem.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigConfigItem.vue new file mode 100644 index 0000000..8f8bd70 --- /dev/null +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigConfigItem.vue @@ -0,0 +1,116 @@ + + + + + \ No newline at end of file diff --git a/src/plugins/routes.js b/src/plugins/routes.js index 953a34a..cef3e5a 100644 --- a/src/plugins/routes.js +++ b/src/plugins/routes.js @@ -33,6 +33,7 @@ const url = { deleteDrinkListHistory: main + 'deleteDrinkListHistory', freeDrinkListReasons: main + 'freeDrinkListReasons', freeDrinkTypes: main + 'freeDrinkTypes', + deleteFreeDrinkListConfig: main + 'deleteFreeDrinkListConfig', vorstand: { sm: { addUser: main + 'sm/addUser', diff --git a/src/store/modules/freeDrinkList.js b/src/store/modules/freeDrinkList.js index 7d434d5..44f9434 100644 --- a/src/store/modules/freeDrinkList.js +++ b/src/store/modules/freeDrinkList.js @@ -63,6 +63,12 @@ const mutations = { }, set_free_drink_types_loading(state, loading) { state.free_drink_types_loading = loading + }, + set_free_drink_config(state, data) { + let config = state.free_drink_list_config.find(item => { + return item.id == data.id + }) + Object.assign(config, data) } } @@ -185,6 +191,63 @@ const actions = { } finally { commit('set_free_drink_types_loading', false) } + }, + async set_free_drink_list_config({commit, dispatch, rootState}, data) { + try { + commit('set_free_drink_list_config_loading', true) + const response = await axios.post(url.freeDrinkListConfig, {...data},{ + headers: { Token: rootState.login.user.accessToken }, + timeout + }) + commit('set_free_drink_list_config', response.data) + } catch (e) { + dispatch('connectionError/addError', null, { root: true }) + if (e.message == 'Network Error') { + dispatch('connectionError/addError', null, { root: true }) + } + if (e.response) + if (e.response.status === 401) dispatch('logout', null, { root: true }) + } finally { + commit('set_free_drink_list_config_loading', false) + } + }, + async update_free_drink_list_config({commit, dispatch, rootState}, data) { + try { + commit('set_free_drink_list_config_loading', true) + const response = await axios.put(url.freeDrinkListConfig, {...data},{ + headers: { Token: rootState.login.user.accessToken }, + timeout + }) + commit('set_free_drink_list_config', response.data) + } catch (e) { + dispatch('connectionError/addError', null, { root: true }) + if (e.message == 'Network Error') { + dispatch('connectionError/addError', null, { root: true }) + } + if (e.response) + if (e.response.status === 401) dispatch('logout', null, { root: true }) + } finally { + commit('set_free_drink_list_config_loading', false) + } + }, + async delete_free_drink_list_config({commit, dispatch, rootState}, data) { + try { + commit('set_free_drink_list_config_loading', true) + const response = await axios.post(url.deleteFreeDrinkListConfig, {...data},{ + headers: { Token: rootState.login.user.accessToken }, + timeout + }) + commit('set_free_drink_list_config', response.data) + } catch (e) { + dispatch('connectionError/addError', null, { root: true }) + if (e.message == 'Network Error') { + dispatch('connectionError/addError', null, { root: true }) + } + if (e.response) + if (e.response.status === 401) dispatch('logout', null, { root: true }) + } finally { + commit('set_free_drink_list_config_loading', false) + } } } @@ -267,6 +330,9 @@ const getters = { }, free_drink_types_loading(state) { return state.free_drink_types_loading + }, + free_drink_list_config_by_id: (state) => (id) => { + return state.free_drink_list_config.find(item => { return item.id == id}) } } From 0fcbbe23c211da919dbb6824762e9d4d2d2802bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sun, 23 Aug 2020 23:18:36 +0200 Subject: [PATCH 009/448] =?UTF-8?q?Overview=20f=C3=BCr=20Freigetr=C3=A4nke?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit es gibt nun eine Gesamtübersicht aller Freigetränke für einen bestimmten Monat. Für Dienstgetränke funktioniert es schon auch ist aber noch nicht vollständig. --- src/components/vorstand/FreeDrinkList.vue | 82 ++++++++- .../FreeDrinkList/FreeDrinkListJob.vue | 108 ++++++++++++ .../FreeDrinkList/FreeDrinkListMain.vue | 155 +++++++++++++++++- src/plugins/routes.js | 1 + src/router/index.js | 6 + src/store/modules/freeDrinkList.js | 28 ++++ 6 files changed, 372 insertions(+), 8 deletions(-) create mode 100644 src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue diff --git a/src/components/vorstand/FreeDrinkList.vue b/src/components/vorstand/FreeDrinkList.vue index 4c36c83..7335494 100644 --- a/src/components/vorstand/FreeDrinkList.vue +++ b/src/components/vorstand/FreeDrinkList.vue @@ -4,8 +4,8 @@ Übersicht - - Liste 1 + + Dienstgetränke Liste 2 @@ -18,6 +18,23 @@ mdi-cogs + + + + + mdi-chevron-left + + + + {{month[date.getMonth()]}} {{date.getFullYear()}} + + + + mdi-chevron-right + + + +
@@ -30,24 +47,77 @@ export default { name: 'FreeDrinkList', data() { return { - bottom_nav: true + bottom_nav: true, + date: new Date(), + month: [ + 'Januar', + 'Februar', + 'März', + 'April', + 'Mai', + 'Juni', + 'Juli', + 'August', + 'September', + 'Oktober', + 'November', + 'Dezember' + ] } }, created() { this.get_free_drink_list_reasons() this.get_free_drink_list_config() - this.get_free_drink_list_history() + this.get_free_drink_list_history_from_to({ + from_date: { + year: this.from_date.getFullYear(), + month: this.from_date.getMonth() + 1, + day: 1 + }, + to_date: { + year: this.to_date.getFullYear(), + month: this.to_date.getMonth() + 1, + day: 1 + } + }) this.get_free_drink_types() this.getPriceList() }, methods: { ...mapActions('freeDrinkList', [ 'get_free_drink_list_config', - 'get_free_drink_list_history', + 'get_free_drink_list_history_from_to', 'get_free_drink_list_reasons', 'get_free_drink_types' ]), - ...mapActions('priceList', ['getPriceList']) + ...mapActions('priceList', ['getPriceList']), + change_month(payload) { + this.date = new Date(this.date.getFullYear(), this.date.getMonth() + payload, 1) + } + }, + computed: { + to_date() { + return new Date(this.date.getFullYear(), this.date.getMonth()+1,1) + }, + from_date() { + return new Date(this.date.getFullYear(), this.date.getMonth(), 1) + } + }, + watch: { + date() { + this.get_free_drink_list_history_from_to({ + from_date: { + year: this.from_date.getFullYear(), + month: this.from_date.getMonth() + 1, + day: 1 + }, + to_date: { + year: this.to_date.getFullYear(), + month: this.to_date.getMonth() + 1, + day: 1 + } + }) + } } } diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue new file mode 100644 index 0000000..ba66a1f --- /dev/null +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue @@ -0,0 +1,108 @@ + + + + + \ No newline at end of file diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListMain.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListMain.vue index bc04564..f5f8801 100644 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListMain.vue +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListMain.vue @@ -1,12 +1,163 @@ diff --git a/src/plugins/routes.js b/src/plugins/routes.js index cef3e5a..e974d25 100644 --- a/src/plugins/routes.js +++ b/src/plugins/routes.js @@ -30,6 +30,7 @@ const url = { resetPassword: main + 'passwordReset', freeDrinkListConfig: main + 'freeDrinkListConfig', freeDrinkListHistory: main + 'freeDrinkListHistory', + freeDrinkListHistoryFromTo: main + 'freeDrinkListHistoryFromTo', deleteDrinkListHistory: main + 'deleteDrinkListHistory', freeDrinkListReasons: main + 'freeDrinkListReasons', freeDrinkTypes: main + 'freeDrinkTypes', diff --git a/src/router/index.js b/src/router/index.js index b90dbcf..55690e2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -31,6 +31,7 @@ import ResetPassword from '@/components/ResetPassword' import FreeDrinkList from '@/components/vorstand/FreeDrinkList' import FreeDrinkListMain from '@/components/vorstand/FreeDrinkList/FreeDrinkListMain' import FreeDrinkListConfig from '@/components/vorstand/FreeDrinkList/FreeDrinkListConfig' +import FreeDrinkListJob from '@/components/vorstand/FreeDrinkList/FreeDrinkListJob' Vue.use(VueRouter) @@ -100,6 +101,11 @@ const routes = [ path: 'config', name: 'freeDrinkListConfig', component: FreeDrinkListConfig + }, + { + path: 'freeDrinkListJob', + name: 'freeDrinkListJob', + component: FreeDrinkListJob } ] } diff --git a/src/store/modules/freeDrinkList.js b/src/store/modules/freeDrinkList.js index 44f9434..c46d651 100644 --- a/src/store/modules/freeDrinkList.js +++ b/src/store/modules/freeDrinkList.js @@ -109,6 +109,24 @@ const actions = { commit('set_free_drink_list_history_loading', false) } }, + async get_free_drink_list_history_from_to({ commit, dispatch, rootState }, data) { + try { + commit('set_free_drink_list_history_loading', true) + const response = await axios.post(url.freeDrinkListHistoryFromTo, {...data},{ + headers: { Token: rootState.login.user.accessToken }, + timeout + }) + commit('set_free_drink_list_history', response.data) + } catch (e) { + if (e.message == 'Network Error') { + dispatch('connectionError/addError', null, { root: true }) + } + if (e.response) + if (e.response.status === 401) dispatch('logout', null, { root: true }) + } finally { + commit('set_free_drink_list_history_loading', false) + } + }, async set_free_drink_list_history({ commit, dispatch, rootState }, data) { try { commit('set_free_drink_list_history_loading', true) @@ -280,6 +298,11 @@ const getters = { free_drink_list_history(state) { return state.free_drink_list_history }, + free_drink_list_history_without_canceled(state) { + return state.free_drink_list_history.filter(item => { + return !item.canceled + }) + }, free_drink_list_history_band(state) { return state.free_drink_list_history.filter(item => { return item.free_drink_type.id == 3 @@ -290,6 +313,11 @@ const getters = { return item.free_drink_type.id == 3 && !item.canceled }) }, + free_drink_list_history_job_without_canceled(state) { + return state.free_drink_list_history.filter(item => { + return item.free_drink_type.id == 1 && !item.canceled + }) + }, free_drink_list_history_job_credit(state) { let jobDrinks = state.free_drink_list_history.filter(item => { return item.free_drink_type.id == 1 && !item.canceled From 6c5c67f45b03a5c077dbe7432e17482302dca3df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Mon, 24 Aug 2020 14:04:21 +0200 Subject: [PATCH 010/448] =?UTF-8?q?Freigetr=C3=A4nke=20Listen=20f=C3=BCr?= =?UTF-8?q?=20Dienst,=20AG=20und=20Band?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Der Vorstand kann nun die Freigetränkelisten von Diensten, AG's und Bands anschauen. --- src/components/vorstand/FreeDrinkList.vue | 8 +- .../FreeDrinkList/FreeDrinkListBand.vue | 123 ++++++++++++++++++ .../FreeDrinkList/FreeDrinkListConfig.vue | 5 +- .../FreeDrinkListConfigConfigItem.vue | 12 +- .../FreeDrinkList/FreeDrinkListJob.vue | 27 +++- .../FreeDrinkList/FreeDrinkListWorkgroup.vue | 112 ++++++++++++++++ src/router/index.js | 12 ++ 7 files changed, 283 insertions(+), 16 deletions(-) create mode 100644 src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue create mode 100644 src/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup.vue diff --git a/src/components/vorstand/FreeDrinkList.vue b/src/components/vorstand/FreeDrinkList.vue index 7335494..546be23 100644 --- a/src/components/vorstand/FreeDrinkList.vue +++ b/src/components/vorstand/FreeDrinkList.vue @@ -7,11 +7,11 @@ Dienstgetränke - - Liste 2 + + AG-Getränke - - Liste 3 + + Bandgetränke Einstellungen diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue new file mode 100644 index 0000000..98848c1 --- /dev/null +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue @@ -0,0 +1,123 @@ + + + + + \ No newline at end of file diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue index 326e95a..e7b4951 100644 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue @@ -10,6 +10,7 @@ v-for="(free_drink_config, index) in free_drink_list_config"> @@ -27,9 +28,9 @@ - + - + mdi-plus diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigConfigItem.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigConfigItem.vue index 8f8bd70..ea797f5 100644 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigConfigItem.vue +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigConfigItem.vue @@ -2,15 +2,16 @@
- + - + - + - + diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue index ba66a1f..7d35878 100644 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue @@ -46,6 +46,10 @@ data() { text: 'Anzahl', value: 'count' }, + { + text: 'User', + value: 'user' + }, { text: 'Preis pro Getränk', value: 'pricepro' @@ -62,9 +66,7 @@ computed: { sum() { let sum = 0 this.free_drink_list_history_job_without_canceled.forEach(item => { - if (item.canceled) { - sum += item.free_drink_config.price - } + sum += item.free_drink_config.price }) return sum }, @@ -85,16 +87,29 @@ computed: { let history_of_config = history_of_date.filter(item => { return item.free_drink_config_id == drink_config.id }) - if (history_of_config.length > 0) { + // eslint-disable-next-line no-unused-vars + let users = [] + history_of_config.forEach(history_config => { + if (!users.find(user_id => { return user_id == history_config.user_id})) { + users.push(history_config.user_id) + } + }) + users.forEach(user_id => { + let history_of_user = history_of_config.filter(item => { + return item.user_id == user_id + }) + if (history_of_user.length > 0) { retVal.push({ date: `${from.getDate()}.${from.getMonth() + 1}.${from.getFullYear()}`, label: drink_config.label, name: drink_config.drink.name, - count: history_of_config.length, + user: `${history_of_user[0].user.firstname} ${history_of_user[0].user.lastname}`, + count: history_of_user.length, pricepro: (drink_config.price / 100).toFixed(2), - sum: (drink_config.price / 100 * history_of_config.length).toFixed(2) + sum: (drink_config.price / 100 * history_of_user.length).toFixed(2) }) } + }) }) } return retVal diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup.vue new file mode 100644 index 0000000..71e2d94 --- /dev/null +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup.vue @@ -0,0 +1,112 @@ + + + + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 55690e2..4a4a7cb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -32,6 +32,8 @@ import FreeDrinkList from '@/components/vorstand/FreeDrinkList' import FreeDrinkListMain from '@/components/vorstand/FreeDrinkList/FreeDrinkListMain' import FreeDrinkListConfig from '@/components/vorstand/FreeDrinkList/FreeDrinkListConfig' import FreeDrinkListJob from '@/components/vorstand/FreeDrinkList/FreeDrinkListJob' +import FreeDrinkListWorkgroup from '@/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup' +import FreeDrinkListBand from '@/components/vorstand/FreeDrinkList/FreeDrinkListBand' Vue.use(VueRouter) @@ -106,6 +108,16 @@ const routes = [ path: 'freeDrinkListJob', name: 'freeDrinkListJob', component: FreeDrinkListJob + }, + { + path: 'freeDrinkListWorkgroup', + name: 'freeDrinkListWorkgroup', + component: FreeDrinkListWorkgroup + }, + { + path: 'freeDrinkListBand', + name: 'freeDrinkListBand', + component: FreeDrinkListBand } ] } From c8a6ab7d351228746a55a5507a5988b27f91f617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Mon, 24 Aug 2020 15:18:21 +0200 Subject: [PATCH 011/448] =?UTF-8?q?Gr=C3=BCnde=20f=C3=BCr=20Freigetr=C3=A4?= =?UTF-8?q?nke=20k=C3=B6nnen=20erstellt=20und=20gel=C3=B6scht=20werden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Außerdem wurd überall ein Loading balken hinzugefügt. --- src/components/vorstand/FreeDrinkList.vue | 17 +++- .../FreeDrinkList/FreeDrinkListConfig.vue | 88 ++++++++++++++++++- .../FreeDrinkListConfigReasonItem.vue | 70 +++++++++++++++ .../FreeDrinkList/FreeDrinkListWorkgroup.vue | 2 +- src/plugins/routes.js | 1 + src/store/modules/freeDrinkList.js | 65 ++++++++++++++ 6 files changed, 236 insertions(+), 7 deletions(-) create mode 100644 src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigReasonItem.vue diff --git a/src/components/vorstand/FreeDrinkList.vue b/src/components/vorstand/FreeDrinkList.vue index 546be23..d4189a7 100644 --- a/src/components/vorstand/FreeDrinkList.vue +++ b/src/components/vorstand/FreeDrinkList.vue @@ -35,6 +35,7 @@ +
@@ -42,7 +43,7 @@ + + \ No newline at end of file diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup.vue index 71e2d94..84b6f77 100644 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup.vue +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup.vue @@ -94,7 +94,7 @@ name: "FreeDrinkListWorkgroup", label: drink_config.label, name: drink_config.drink.name, user: `${history_config.user.firstname} ${history_config.user.lastname}`, - reason: history_config.free_drink_list_reason.name, + reason: history_config.free_drink_list_reason ? history_config.free_drink_list_reason.name : null, description: history_config.description, pricepro: (drink_config.price / 100).toFixed(2) }) diff --git a/src/plugins/routes.js b/src/plugins/routes.js index e974d25..cfa1742 100644 --- a/src/plugins/routes.js +++ b/src/plugins/routes.js @@ -33,6 +33,7 @@ const url = { freeDrinkListHistoryFromTo: main + 'freeDrinkListHistoryFromTo', deleteDrinkListHistory: main + 'deleteDrinkListHistory', freeDrinkListReasons: main + 'freeDrinkListReasons', + deleteFreeDrinkListReason: main + 'deleteFreeDrinkListReason', freeDrinkTypes: main + 'freeDrinkTypes', deleteFreeDrinkListConfig: main + 'deleteFreeDrinkListConfig', vorstand: { diff --git a/src/store/modules/freeDrinkList.js b/src/store/modules/freeDrinkList.js index c46d651..f95451b 100644 --- a/src/store/modules/freeDrinkList.js +++ b/src/store/modules/freeDrinkList.js @@ -266,7 +266,66 @@ const actions = { } finally { commit('set_free_drink_list_config_loading', false) } + }, + async set_free_drink_list_reason({ commit, dispatch, rootState }, data) { + try { + commit('set_free_drink_list_reasons_loading', true) + const response = await axios.post(url.freeDrinkListReasons, {...data},{ + headers: { Token: rootState.login.user.accessToken }, + timeout + }) + commit('set_free_drink_list_reasons', response.data) + } catch (e) { + dispatch('connectionError/addError', null, { root: true }) + if (e.message == 'Network Error') { + dispatch('connectionError/addError', null, { root: true }) + } + if (e.response) + if (e.response.status === 401) dispatch('logout', null, { root: true }) + } finally { + commit('set_free_drink_list_reasons_loading', false) + } } + , + async update_free_drink_list_reason({ commit, dispatch, rootState }, data) { + try { + commit('set_free_drink_list_reasons_loading', true) + const response = await axios.put(url.freeDrinkListReasons, {...data},{ + headers: { Token: rootState.login.user.accessToken }, + timeout + }) + commit('set_free_drink_list_reasons', response.data) + } catch (e) { + dispatch('connectionError/addError', null, { root: true }) + if (e.message == 'Network Error') { + dispatch('connectionError/addError', null, { root: true }) + } + if (e.response) + if (e.response.status === 401) dispatch('logout', null, { root: true }) + } finally { + commit('set_free_drink_list_reasons_loading', false) + } + }, + async delete_free_drink_list_reason({ commit, dispatch, rootState }, data) { + try { + commit('set_free_drink_list_reasons_loading', true) + const response = await axios.post(url.deleteFreeDrinkListReason, {...data},{ + headers: { Token: rootState.login.user.accessToken }, + timeout + }) + commit('set_free_drink_list_reasons', response.data) + } catch (e) { + dispatch('connectionError/addError', null, { root: true }) + if (e.message == 'Network Error') { + dispatch('connectionError/addError', null, { root: true }) + } + if (e.response) + if (e.response.status === 401) dispatch('logout', null, { root: true }) + } finally { + commit('set_free_drink_list_reasons_loading', false) + } + } + } const getters = { @@ -356,6 +415,12 @@ const getters = { free_drink_types(state) { return state.free_drink_types }, + free_drink_list_history_loading(state) { + return state.free_drink_list_history_loading + }, + free_drink_list_config_loading(state) { + return state.free_drink_list_config_loading + }, free_drink_types_loading(state) { return state.free_drink_types_loading }, From f8e486bad9c910ad164d5a3c0380591561cbe970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Mon, 24 Aug 2020 16:07:30 +0200 Subject: [PATCH 012/448] =?UTF-8?q?Version=20und=20Backend=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/components/TitleBar.vue | 2 +- src/plugins/routes.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index f8c4b13..58ab58e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "newgruecht-vue", - "version": "1.0.1", + "version": "1.1.0", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/components/TitleBar.vue b/src/components/TitleBar.vue index 5396f36..865cafa 100644 --- a/src/components/TitleBar.vue +++ b/src/components/TitleBar.vue @@ -12,7 +12,7 @@ - Flaschengeist v1.0.1 + Flaschengeist v1.1.0 beta 0 diff --git a/src/plugins/routes.js b/src/plugins/routes.js index a4bc5de..9fbb4d4 100644 --- a/src/plugins/routes.js +++ b/src/plugins/routes.js @@ -1,8 +1,8 @@ //const main = 'https://192.168.5.128:5000/' //const main = 'http://localhost:5000/' //const main = 'http://192.168.5.118:5000/' -//const main = 'https://groeger-clan.duckdns.org:5000/' -const main = 'https://flaschengeist.wu5.de:5000/' +const main = 'https://groeger-clan.duckdns.org:5000/' +//const main = 'https://flaschengeist.wu5.de:5000/' const url = { login: main + 'login', From c83ba2d20d758d71d20b3923d411b57ad2837bcb Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 25 Aug 2020 04:21:16 +0200 Subject: [PATCH 013/448] Fix security issues found by npm audit --- package-lock.json | 166 ++++++++++++++++++++++++++++++---------------- 1 file changed, 108 insertions(+), 58 deletions(-) diff --git a/package-lock.json b/package-lock.json index b099db4..2236e9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "newgruecht-vue", - "version": "0.1.0", + "version": "1.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2233,14 +2233,15 @@ } }, "asn1.js": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", - "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", "dev": true, "requires": { "bn.js": "^4.0.0", "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" }, "dependencies": { "bn.js": { @@ -2561,9 +2562,9 @@ "dev": true }, "bn.js": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz", - "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz", + "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==", "dev": true }, "body-parser": { @@ -2736,16 +2737,16 @@ } }, "browserify-sign": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz", - "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "dev": true, "requires": { "bn.js": "^5.1.1", "browserify-rsa": "^4.0.1", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.2", + "elliptic": "^6.5.3", "inherits": "^2.0.4", "parse-asn1": "^5.1.5", "readable-stream": "^3.6.0", @@ -3748,13 +3749,13 @@ } }, "create-ecdh": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", - "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", + "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", "dev": true, "requires": { "bn.js": "^4.1.0", - "elliptic": "^6.0.0" + "elliptic": "^6.5.3" }, "dependencies": { "bn.js": { @@ -4591,9 +4592,9 @@ } }, "enhanced-resolve": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz", - "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz", + "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==", "dev": true, "requires": { "graceful-fs": "^4.1.2", @@ -4896,9 +4897,9 @@ "dev": true }, "events": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz", - "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz", + "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==", "dev": true }, "eventsource": { @@ -7818,14 +7819,13 @@ } }, "parse-asn1": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz", - "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", + "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", "dev": true, "requires": { - "asn1.js": "^4.0.0", + "asn1.js": "^5.2.0", "browserify-aes": "^1.0.0", - "create-hash": "^1.1.0", "evp_bytestokey": "^1.0.0", "pbkdf2": "^3.0.3", "safe-buffer": "^5.1.1" @@ -7936,9 +7936,9 @@ } }, "pbkdf2": { - "version": "3.0.17", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", - "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz", + "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==", "dev": true, "requires": { "create-hash": "^1.1.2", @@ -10334,16 +10334,16 @@ } }, "terser-webpack-plugin": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz", - "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==", + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", + "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", "dev": true, "requires": { "cacache": "^12.0.2", "find-cache-dir": "^2.1.0", "is-wsl": "^1.1.0", "schema-utils": "^1.0.0", - "serialize-javascript": "^2.1.2", + "serialize-javascript": "^4.0.0", "source-map": "^0.6.1", "terser": "^4.1.2", "webpack-sources": "^1.4.0", @@ -10361,6 +10361,15 @@ "ajv-keywords": "^3.1.0" } }, + "serialize-javascript": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -11049,15 +11058,71 @@ "integrity": "sha512-ajtqwEW/QhnrBZQsZxCLHThZZaa+Db45c92Asf46ZDXu6uHXgbfVuBaJ4gzD2r4UX0oMJHstFwd2r2HM4l8umg==" }, "watchpack": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz", - "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz", + "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==", "dev": true, "requires": { - "chokidar": "^3.4.0", + "chokidar": "^3.4.1", "graceful-fs": "^4.1.2", "neo-async": "^2.5.0", "watchpack-chokidar2": "^2.0.0" + }, + "dependencies": { + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "optional": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "chokidar": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", + "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", + "dev": true, + "optional": true, + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.4.0" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "optional": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "optional": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "optional": true, + "requires": { + "is-number": "^7.0.0" + } + } } }, "watchpack-chokidar2": { @@ -11198,9 +11263,9 @@ } }, "webpack": { - "version": "4.43.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz", - "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==", + "version": "4.44.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz", + "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==", "dev": true, "requires": { "@webassemblyjs/ast": "1.9.0", @@ -11211,7 +11276,7 @@ "ajv": "^6.10.2", "ajv-keywords": "^3.4.1", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.1.0", + "enhanced-resolve": "^4.3.0", "eslint-scope": "^4.0.3", "json-parse-better-errors": "^1.0.2", "loader-runner": "^2.4.0", @@ -11224,25 +11289,10 @@ "schema-utils": "^1.0.0", "tapable": "^1.1.3", "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.6.1", + "watchpack": "^1.7.4", "webpack-sources": "^1.4.1" }, "dependencies": { - "acorn": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", - "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", - "dev": true - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, "schema-utils": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", From c379656f3eff4eadc7f524ff50c5421ea477ea8a Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 25 Aug 2020 04:27:27 +0200 Subject: [PATCH 014/448] Sidewards compatibility with pluginify --- src/App.vue | 12 +++++------ src/plugins/routes.js | 8 ++++---- src/store/modules/barUsers.js | 26 ++++++++++++------------ src/store/modules/finanzerUsers.js | 18 ++++++++-------- src/store/modules/jobInvites.js | 10 ++++----- src/store/modules/jobRequests.js | 6 +++--- src/store/modules/jobkindManager.js | 8 ++++---- src/store/modules/jobs.js | 8 ++++---- src/store/modules/login.js | 26 ++++++++++++------------ src/store/modules/pricelist.js | 16 +++++++-------- src/store/modules/serviceManagement.js | 10 ++++----- src/store/modules/user.js | 16 +++++++-------- src/store/modules/userManager.js | 12 +++++------ src/store/modules/workgroupManagement.js | 8 ++++---- 14 files changed, 92 insertions(+), 92 deletions(-) diff --git a/src/App.vue b/src/App.vue index 10e70c6..f1720e7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -65,7 +65,7 @@ :items="lifeTimes" item-text="text" item-value="value" - v-model="selectLifeTime" + v-model="selectLifetime" return-object /> @@ -90,7 +90,7 @@ export default { render: 0, timer: null, change: false, - selectLifeTime: { text: '30 Minuten', value: 1800 }, + selectLifetime: { text: '30 Minuten', value: 1800 }, lifeTimes: [ { text: '5 Minuten', @@ -140,20 +140,20 @@ export default { }), created() { if (this.isLoggedIn) { - this.getLifeTime() + this.getLifetime() } this.timer = setInterval(this.test, 1000) }, methods: { - ...mapActions(['setLifeTime', 'saveLifeTime', 'logout', 'getLifeTime']), + ...mapActions(['setLifetime', 'saveLifetime', 'logout', 'getLifetime']), test() { if (this.isLoggedIn) { if (this.lifeTime == 0) this.logout() - this.setLifeTime(this.lifeTime - 1) + this.setLifetime(this.lifeTime - 1) } }, save() { - this.saveLifeTime(this.selectLifeTime.value) + this.saveLifetime(this.selectLifetime.value) this.change = false } }, diff --git a/src/plugins/routes.js b/src/plugins/routes.js index 9fbb4d4..6282c3d 100644 --- a/src/plugins/routes.js +++ b/src/plugins/routes.js @@ -1,8 +1,8 @@ //const main = 'https://192.168.5.128:5000/' //const main = 'http://localhost:5000/' //const main = 'http://192.168.5.118:5000/' -const main = 'https://groeger-clan.duckdns.org:5000/' -//const main = 'https://flaschengeist.wu5.de:5000/' +//const main = 'https://groeger-clan.duckdns.org:5000/' +const main = 'https://flaschengeist.wu5.de:5000/' const url = { login: main + 'login', @@ -25,8 +25,8 @@ const url = { finanzerSendOneMail: main + 'finanzerSendOneMail', userMain: main + 'user/main', userAddAmount: main + 'user/addAmount', - saveLifeTime: main + 'saveLifeTime', - getLifeTime: main + 'getLifeTime', + saveLifetime: main + 'setLifetime', + getLifetime: main + 'getLifetime', resetPassword: main + 'passwordReset', freeDrinkListConfig: main + 'freeDrinkListConfig', freeDrinkListHistory: main + 'freeDrinkListHistory', diff --git a/src/store/modules/barUsers.js b/src/store/modules/barUsers.js index e6c1eda..1971017 100644 --- a/src/store/modules/barUsers.js +++ b/src/store/modules/barUsers.js @@ -160,14 +160,14 @@ const actions = { timeout }) commit('setUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) } if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -191,7 +191,7 @@ const actions = { amount: data.amount, error: false }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { console.log(typeof e) for (const [key, value] of Object.entries(e)) { @@ -207,7 +207,7 @@ const actions = { }) if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -230,14 +230,14 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) commit('setUsers', { [response.data.username]: response.data }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) } if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -259,14 +259,14 @@ const actions = { timeout }) commit('setAllUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) } if (e.response) if (e.response.data === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -285,14 +285,14 @@ const actions = { ) commit('setUsers', { [response.data.username]: response.data }) commit('updateMessage', { date: data.date, storno: true }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) } if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -311,7 +311,7 @@ const actions = { } if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -330,7 +330,7 @@ const actions = { } if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } @@ -356,7 +356,7 @@ const actions = { } if (e.response) if (e.response.status === 401) { - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) location.reload() } } diff --git a/src/store/modules/finanzerUsers.js b/src/store/modules/finanzerUsers.js index ec9b33a..51d0289 100644 --- a/src/store/modules/finanzerUsers.js +++ b/src/store/modules/finanzerUsers.js @@ -257,7 +257,7 @@ const actions = { timeout }) commit('setAllUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (err) { if (err.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -276,7 +276,7 @@ const actions = { timeout }) commit('setUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (err) { if (err.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -310,7 +310,7 @@ const actions = { locked: response.data.locked, username: data.user.username }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (err) { if (err.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -341,7 +341,7 @@ const actions = { locked: response.data.locked, username: data.user.username }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (err) { if (err.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -361,7 +361,7 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) commit('updateUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -384,7 +384,7 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) commit('updateUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -403,7 +403,7 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) commit('setUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -421,7 +421,7 @@ const actions = { timeout: 60000 }) commit('setMails', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -440,7 +440,7 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) commit('setMail', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/jobInvites.js b/src/store/modules/jobInvites.js index 8ba94ee..d3de850 100644 --- a/src/store/modules/jobInvites.js +++ b/src/store/modules/jobInvites.js @@ -265,7 +265,7 @@ const actions = { }) }) commit('setJobInvitesLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -283,7 +283,7 @@ const actions = { }) commit('setJobInvitesFromMe', response.data) commit('setJobInvitesLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -312,7 +312,7 @@ const actions = { from_me: false }) commit('setDayLoading', { date, getters, value: false }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) commit('setJobInvitesLoading', false) } catch (e) { if (e.message == 'Network Error') { @@ -342,7 +342,7 @@ const actions = { getters }) commit('setDayLoading', { date, getters, value: false }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) commit('setJobInvitesLoading', false) } catch (e) { if (e.message == 'Network Error') { @@ -360,7 +360,7 @@ const actions = { timeout }) commit('updateJobInviteToMe', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) commit('setJobInvitesLoading', false) } catch (e) { if (e.message == 'Network Error') { diff --git a/src/store/modules/jobRequests.js b/src/store/modules/jobRequests.js index a6f4c27..65b0ffa 100644 --- a/src/store/modules/jobRequests.js +++ b/src/store/modules/jobRequests.js @@ -265,7 +265,7 @@ const actions = { }) }) commit('setJobRequestsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -283,7 +283,7 @@ const actions = { }) commit('setJobRequestsFromMe', response.data) commit('setJobRequestsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -311,7 +311,7 @@ const actions = { ) commit('updateJobRequestToMe', response.data) commit('setJobRequestsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/jobkindManager.js b/src/store/modules/jobkindManager.js index 4e03d07..3ec1ebf 100644 --- a/src/store/modules/jobkindManager.js +++ b/src/store/modules/jobkindManager.js @@ -46,7 +46,7 @@ const actions = { }) commit('setJobkinds', response.data) commit('setJobkindsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -65,7 +65,7 @@ const actions = { ) commit('updateJobKind', response.data) commit('setJobkindsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -84,7 +84,7 @@ const actions = { ) commit('updateJobKind', response.data) commit('setJobkindsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -103,7 +103,7 @@ const actions = { ) commit('deleteJobKind', data) commit('setJobkindsLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/jobs.js b/src/store/modules/jobs.js index 1aec212..85ae0e9 100644 --- a/src/store/modules/jobs.js +++ b/src/store/modules/jobs.js @@ -306,7 +306,7 @@ const actions = { users: response.data, username: rootState.login.user.username }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -383,7 +383,7 @@ const actions = { getters }) commit('setDayNotLoading', { date, getters }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -412,7 +412,7 @@ const actions = { getters }) commit('setDayNotLoading', { date, getters }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -429,7 +429,7 @@ const actions = { { ...data }, { headers: { Token: rootState.login.user.accessToken }, timeout } ) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/login.js b/src/store/modules/login.js index 910e03c..fa78076 100644 --- a/src/store/modules/login.js +++ b/src/store/modules/login.js @@ -34,7 +34,7 @@ const mutations = { } else { state.user.username = data.username state.user.accessToken = data.accessToken - state.user.group = data.group + state.user.group = data.groups state.user.firstname = data.firstname state.user.lastname = data.lastname } @@ -52,7 +52,7 @@ const mutations = { setCookieAccepted(state, value) { state.cookieAccepted = value }, - setLifeTime(state, value) { + setLifetime(state, value) { state.lifeTime = value } } @@ -73,8 +73,8 @@ const actions = { 'user', JSON.stringify({ username: response.data.username, - accessToken: response.data.token, - group: response.data.group, + accessToken: response.data.accessToken, + group: response.data.groups, firstname: response.data.firstname, lastname: response.data.lastname }) @@ -132,17 +132,17 @@ const actions = { var cookie = localStorage.getItem('cookie:accepted') commit('setCookieAccepted', cookie) }, - setLifeTime({ commit }, value) { - commit('setLifeTime', value) + setLifetime({ commit }, value) { + commit('setLifetime', value) }, - async saveLifeTime({ commit, rootState, dispatch }, value) { + async saveLifetime({ commit, rootState, dispatch }, value) { try { const response = await axios.post( - url.saveLifeTime, + url.saveLifetime, { value: value }, { headers: { Token: rootState.login.user.accessToken }, timeout } ) - commit('setLifeTime', response.data.value) + commit('setLifetime', response.data.value) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -151,18 +151,18 @@ const actions = { if (e.response.status === 401) dispatch('logout', null, { root: true }) } }, - async getLifeTime({ commit, rootState, dispatch }) { + async getLifetime({ commit, rootState, dispatch }) { try { if (!rootState.login.user.accessToken) { return } - const response = await axios.get(url.getLifeTime, { + const response = await axios.get(url.getLifetime, { headers: { Token: rootState.login.user.accessToken }, timeout }) - commit('setLifeTime', response.data.value) + commit('setLifetime', response.data.value) var user = JSON.parse(localStorage.getItem('user')) - user.group = response.data.group + user.group = response.data.groups localStorage.setItem('user', JSON.stringify(user)) commit('updateAccessToken', user) dispatch('barUsers/setLockStatus', response.data.lock_bar, { diff --git a/src/store/modules/pricelist.js b/src/store/modules/pricelist.js index 77ddcba..b87a8e4 100644 --- a/src/store/modules/pricelist.js +++ b/src/store/modules/pricelist.js @@ -101,7 +101,7 @@ const actions = { const response = await axios.get(url.pricelist, { timeout }) commit('setPriceList', response.data) commit('setPriceListLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -115,7 +115,7 @@ const actions = { const response = await axios.get(url.getTypes, { timeout }) commit('setTypes', response.data) commit('setTypesLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -133,7 +133,7 @@ const actions = { ) commit('updatePriceList', response.data) commit('setPriceListLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -153,7 +153,7 @@ const actions = { ) commit('updatePriceList', response.data) commit('setPriceListLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -173,7 +173,7 @@ const actions = { ) commit('deleteDrinkPrice', data) commit('setPriceListLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -193,7 +193,7 @@ const actions = { ) commit('updateDrinkType', response.data) commit('setTypesLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -213,7 +213,7 @@ const actions = { ) commit('updateDrinkType', response.data) commit('setTypesLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -233,7 +233,7 @@ const actions = { ) commit('deleteDrinkType', data) commit('setTypesLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/serviceManagement.js b/src/store/modules/serviceManagement.js index c2a32db..d9cef29 100644 --- a/src/store/modules/serviceManagement.js +++ b/src/store/modules/serviceManagement.js @@ -274,7 +274,7 @@ const actions = { timeout }) commit('setAllUsers', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -296,7 +296,7 @@ const actions = { } ) //commit('updateMonth', { ...response.data[0], com: 'add' }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -355,7 +355,7 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) //commit('updateMonth', { ...data, com: 'delete' }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -382,7 +382,7 @@ const actions = { date, getters }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -404,7 +404,7 @@ const actions = { ) commit('updateMonthJobkind', { data: response.data, date, getters }) commit('setDayNotLoading', { date, getters }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 2f91407..7e4d467 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -223,7 +223,7 @@ const actions = { }) commit('setUser', response.data) commit('setError', '') - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -248,7 +248,7 @@ const actions = { error: false }) commit('setError', '') - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -274,7 +274,7 @@ const actions = { console.log(response.data) commit('setUser', response.data) commit('setError', { value: 'Daten gespeichert', error: false }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -300,7 +300,7 @@ const actions = { { headers: { Token: rootState.login.user.accessToken }, timeout } ) commit('updateDay', { ...response.data, date: data.date }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -326,7 +326,7 @@ const actions = { ) commit('setUser', response.data) commit('updateMessage', { date: data.date, storno: true }) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -343,7 +343,7 @@ const actions = { timeout }) commit('setStatus', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -359,7 +359,7 @@ const actions = { timeout }) commit('setTokens', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -375,7 +375,7 @@ const actions = { timeout }) commit('setTokens', response.data) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/userManager.js b/src/store/modules/userManager.js index 3ab8f0b..60c11d0 100644 --- a/src/store/modules/userManager.js +++ b/src/store/modules/userManager.js @@ -82,7 +82,7 @@ const actions = { }) commit('setUsers', response.data) commit('setUsersLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -101,7 +101,7 @@ const actions = { }) commit('setUsers', response.data) commit('setUsersLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -120,7 +120,7 @@ const actions = { }) commit('setStatus', response.data) commit('setStatusLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -140,7 +140,7 @@ const actions = { ) commit('updateUser', response.data) commit('setUsersLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -160,7 +160,7 @@ const actions = { ) commit('updateUser', response.data) commit('setUsersLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -180,7 +180,7 @@ const actions = { ) commit('updateWorkgroups', { id: data.id, workgroups: response.data }) commit('setUsersLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) diff --git a/src/store/modules/workgroupManagement.js b/src/store/modules/workgroupManagement.js index c43f41e..7fa0a79 100644 --- a/src/store/modules/workgroupManagement.js +++ b/src/store/modules/workgroupManagement.js @@ -46,7 +46,7 @@ const actions = { }) commit('setWorkgroups', response.data) commit('setWorkgroupLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -66,7 +66,7 @@ const actions = { ) commit('updateWorkgroup', response.data) commit('setWorkgroupLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -85,7 +85,7 @@ const actions = { ) commit('updateWorkgroup', repsonse.data) commit('setWorkgroupLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -104,7 +104,7 @@ const actions = { ) commit('deleteWorkgroup', data) commit('setWorkgroupLoading', false) - dispatch('getLifeTime', null, { root: true }) + dispatch('getLifetime', null, { root: true }) } catch (e) { if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) From b92a94adb0e6419b7e5c21d144c373633bcbeec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Tue, 1 Sep 2020 09:02:55 +0200 Subject: [PATCH 015/448] Fix sidewards-compability Bei der Sidewards-compability wurde durch das umschreiben die Gruppen des Nutzers nicht mehr richtig gespeichert. Dieser Fehler wurde behoben. --- src/store/modules/login.js | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/store/modules/login.js b/src/store/modules/login.js index fa78076..2597370 100644 --- a/src/store/modules/login.js +++ b/src/store/modules/login.js @@ -8,7 +8,7 @@ const state = { firstname: null, lastname: null, accessToken: null, - group: null + groups: null }, loggingIn: false, loginError: null, @@ -30,11 +30,11 @@ const mutations = { if (data === null || data === undefined) { state.user.username = null state.user.accessToken = null - state.user.group = null + state.user.groups = null } else { state.user.username = data.username state.user.accessToken = data.accessToken - state.user.group = data.groups + state.user.groups = data.groups state.user.firstname = data.firstname state.user.lastname = data.lastname } @@ -42,7 +42,7 @@ const mutations = { logout(state) { state.user.accessToken = null state.user.username = null - state.user.group = null + state.user.groups = null state.user.firstname = null state.user.lastname = null }, @@ -74,18 +74,18 @@ const actions = { JSON.stringify({ username: response.data.username, accessToken: response.data.accessToken, - group: response.data.groups, + groups: response.data.groups, firstname: response.data.firstname, lastname: response.data.lastname }) ) commit('loginStop', null) commit('updateAccessToken', response.data) - if (state.user.group.includes('bar')) { + if (state.user.groups.includes('bar')) { router.push('/main/bar/geruecht') - } else if (state.user.group.includes('user')) { + } else if (state.user.groups.includes('user')) { router.push('/main/user/add') - } else if (state.user.group.includes('extern')) { + } else if (state.user.groups.includes('extern')) { router.push('/main') } } catch (err) { @@ -96,7 +96,7 @@ const actions = { commit('updateAccessToken', { username: null, accessToken: null, - group: null, + groups: null, firstname: null, lastname: null }) @@ -162,7 +162,7 @@ const actions = { }) commit('setLifetime', response.data.value) var user = JSON.parse(localStorage.getItem('user')) - user.group = response.data.groups + user.groups = response.data.groups localStorage.setItem('user', JSON.stringify(user)) commit('updateAccessToken', user) dispatch('barUsers/setLockStatus', response.data.lock_bar, { @@ -183,10 +183,10 @@ const getters = { return state.loggingIn }, getGroup: state => { - return state.user.group + return state.user.groups }, group: state => { - return state.user.group + return state.user.groups }, getToken: state => { return state.user.accessToken @@ -199,35 +199,35 @@ const getters = { }, isBar: state => { try { - return state.user.group.includes('bar') + return state.user.groups.includes('bar') } catch (e) { return false } }, isFinanzer: state => { try { - return state.user.group.includes('moneymaster') + return state.user.groups.includes('moneymaster') } catch (e) { return false } }, isUser: state => { try { - return state.user.group.includes('user') + return state.user.groups.includes('user') } catch (e) { return false } }, isGastro: state => { try { - return state.user.group.includes('gastro') + return state.user.groups.includes('gastro') } catch (e) { return false } }, isExtern: state => { try { - return state.user.group.includes('extern') + return state.user.groups.includes('extern') } catch (e) { return false } @@ -235,9 +235,9 @@ const getters = { isManagement: state => { try { return ( - state.user.group.includes('vorstand') || - state.user.group.includes('gastro') || - state.user.group.includes('moneymaster') + state.user.groups.includes('vorstand') || + state.user.groups.includes('gastro') || + state.user.groups.includes('moneymaster') ) } catch (e) { return false From 10eccba914154b5aebd43f4766d5e87340778868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Tue, 1 Sep 2020 09:16:24 +0200 Subject: [PATCH 016/448] Entfernen der User aus den FreeDrinkLists --- .../FreeDrinkList/FreeDrinkListBand.vue | 23 +++---------------- .../FreeDrinkList/FreeDrinkListJob.vue | 23 +++---------------- 2 files changed, 6 insertions(+), 40 deletions(-) diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue index 98848c1..c8548eb 100644 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue @@ -46,10 +46,6 @@ name: "FreeDrinkListBand", text: 'Anzahl', value: 'count' }, - { - text: 'User', - value: 'user' - }, { text: 'Preis pro Getränk', value: 'pricepro' @@ -87,29 +83,16 @@ name: "FreeDrinkListBand", let history_of_config = history_of_date.filter(item => { return item.free_drink_config_id == drink_config.id }) - // eslint-disable-next-line no-unused-vars - let users = [] - history_of_config.forEach(history_config => { - if (!users.find(user_id => { return user_id == history_config.user_id})) { - users.push(history_config.user_id) - } - }) - users.forEach(user_id => { - let history_of_user = history_of_config.filter(item => { - return item.user_id == user_id - }) - if (history_of_user.length > 0) { + if (history_of_config.length > 0) { retVal.push({ date: `${from.getDate()}.${from.getMonth() + 1}.${from.getFullYear()}`, label: drink_config.label, name: drink_config.drink.name, - user: `${history_of_user[0].user.firstname} ${history_of_user[0].user.lastname}`, - count: history_of_user.length, + count: history_of_config.length, pricepro: (drink_config.price / 100).toFixed(2), - sum: (drink_config.price / 100 * history_of_user.length).toFixed(2) + sum: (drink_config.price / 100 * history_of_config.length).toFixed(2) }) } - }) }) } return retVal diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue index 7d35878..f0fd708 100644 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue +++ b/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue @@ -46,10 +46,6 @@ data() { text: 'Anzahl', value: 'count' }, - { - text: 'User', - value: 'user' - }, { text: 'Preis pro Getränk', value: 'pricepro' @@ -87,29 +83,16 @@ computed: { let history_of_config = history_of_date.filter(item => { return item.free_drink_config_id == drink_config.id }) - // eslint-disable-next-line no-unused-vars - let users = [] - history_of_config.forEach(history_config => { - if (!users.find(user_id => { return user_id == history_config.user_id})) { - users.push(history_config.user_id) - } - }) - users.forEach(user_id => { - let history_of_user = history_of_config.filter(item => { - return item.user_id == user_id - }) - if (history_of_user.length > 0) { + if (history_of_config.length > 0) { retVal.push({ date: `${from.getDate()}.${from.getMonth() + 1}.${from.getFullYear()}`, label: drink_config.label, name: drink_config.drink.name, - user: `${history_of_user[0].user.firstname} ${history_of_user[0].user.lastname}`, - count: history_of_user.length, + count: history_of_config.length, pricepro: (drink_config.price / 100).toFixed(2), - sum: (drink_config.price / 100 * history_of_user.length).toFixed(2) + sum: (drink_config.price / 100 * history_of_config.length).toFixed(2) }) } - }) }) } return retVal From 3d311d3677c0b868a0a54188363478b6779448e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Tue, 1 Sep 2020 09:31:03 +0200 Subject: [PATCH 017/448] =?UTF-8?q?BarUser=20FreeDrinkList=20zeigt=20Summe?= =?UTF-8?q?=20von=20Bandgetr=C3=A4nken=20an.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/baruser/BarFreedrinks.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/baruser/BarFreedrinks.vue b/src/components/baruser/BarFreedrinks.vue index bc47eba..e3ba181 100644 --- a/src/components/baruser/BarFreedrinks.vue +++ b/src/components/baruser/BarFreedrinks.vue @@ -90,9 +90,8 @@ {{ - free_drink_list_history_band_without_canceled.length - }} - Getränke + (free_drink_list_history_band_without_canceled_price/100).toFixed(2) + }} € @@ -398,6 +397,13 @@ export default { this.free_drink_list_config_band.length == 0 && this.free_drink_list_config_job.length == 0 ) + }, + free_drink_list_history_band_without_canceled_price() { + let sum = 0 + this.free_drink_list_history_band_without_canceled.forEach(item => { + sum += item.free_drink_config.price + }) + return sum } }, beforeDestroy() { From f212c5962c9628e06e821c5ea97c5f0f358bc9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Tue, 1 Sep 2020 10:04:21 +0200 Subject: [PATCH 018/448] Bugfix: Beim updaten der FreeDrinkListHistory kommt kein Networkfehler --- src/components/baruser/BarFreedrinks.vue | 2 ++ src/components/user/freedrink/freedrinkUserView.vue | 4 +++- src/store/modules/freeDrinkList.js | 12 ++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/baruser/BarFreedrinks.vue b/src/components/baruser/BarFreedrinks.vue index e3ba181..82ccf53 100644 --- a/src/components/baruser/BarFreedrinks.vue +++ b/src/components/baruser/BarFreedrinks.vue @@ -285,6 +285,8 @@ export default { 'ERROR: ' + message.free_drink_type.name +': Konnte ' + message.label + ' für ' + (message.price / 100).toFixed(2) + '€ nicht hinzufügen.' + } else if (message.canceled) { + text = `${message.free_drink_type.name}: ${message.label} wurde für ${(message.price/100).toFixed(2)}€ storniert.` } else { text = message.free_drink_type.name + ': ' + message.label + ' wurde für ' + (message.price / 100).toFixed(2) + '€ hinzugefügt.' } diff --git a/src/components/user/freedrink/freedrinkUserView.vue b/src/components/user/freedrink/freedrinkUserView.vue index 1a94a5a..487a35e 100644 --- a/src/components/user/freedrink/freedrinkUserView.vue +++ b/src/components/user/freedrink/freedrinkUserView.vue @@ -296,7 +296,7 @@ export default { this.amount = null this.selectedReason = null this.reasonDescription = null - this.drinkCount = 0 + this.drinkCount = 1 this.free_drink_type_id = null this.free_drink = null }, @@ -321,6 +321,8 @@ export default { ' für ' + (message.price / 100).toFixed(2) + '€ nicht hinzufügen.' + } else if (message.canceled) { + text = `${message.free_drink_type.name}: ${message.label} wurde für ${(message.price/100).toFixed(2)}€ storniert.` } else { text = message.free_drink_type.name + diff --git a/src/store/modules/freeDrinkList.js b/src/store/modules/freeDrinkList.js index f95451b..acf03d6 100644 --- a/src/store/modules/freeDrinkList.js +++ b/src/store/modules/freeDrinkList.js @@ -44,9 +44,11 @@ const mutations = { add_snackbar_message(state, { data, error }) { data.error = error data.visible = true - data.free_drink_type = data.free_drink_types.find(item => { + data.label = data.free_drink_config != null && data.label == null ? data.free_drink_config.label : data.label + data.price = data.free_drink_config != null && data.price == null ? data.free_drink_config.price : data.price + data.free_drink_type = data.free_drink_type == null ? data.free_drink_types.find(item => { return item.id == data.free_drink_type_id - }) + }) : data.free_drink_type data.timer = setTimeout(() => { if (!data.error) { data.visible = false @@ -98,8 +100,10 @@ const actions = { headers: { Token: rootState.login.user.accessToken }, timeout }) + console.log(response.data) commit('set_free_drink_list_history', response.data) } catch (e) { + console.log(e) if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) } @@ -138,6 +142,7 @@ const actions = { timeout } ) + console.log(data) commit('set_free_drink_list_history', response.data) commit('add_snackbar_message', { data, error: false }) } catch (e) { @@ -153,15 +158,18 @@ const actions = { }, async update_free_drink_list_history({ commit, dispatch, rootState }, data) { try { + console.log(data) commit('set_free_drink_list_history_loading', true) const response = await axios.put( url.freeDrinkListHistory, { ...data }, { headers: { Token: rootState.login.user.accessToken }, timeout } ) + console.log(response.data) commit('set_free_drink_list_history', response.data) commit('add_snackbar_message', { data, error: false }) } catch (e) { + console.log(e) dispatch('connectionError/addError', null, { root: true }) if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) From 0563740e9ced56fee20e55eb7e87fc188aec8f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Tue, 1 Sep 2020 10:18:09 +0200 Subject: [PATCH 019/448] Fehler im Verlauf der FreeDrinkList in der baransicht wurde behoben --- src/components/baruser/BarFreedrinks.vue | 7 ++++++- src/plugins/routes.js | 4 ++-- src/store/modules/freeDrinkList.js | 8 -------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/components/baruser/BarFreedrinks.vue b/src/components/baruser/BarFreedrinks.vue index 82ccf53..eec219f 100644 --- a/src/components/baruser/BarFreedrinks.vue +++ b/src/components/baruser/BarFreedrinks.vue @@ -110,7 +110,7 @@
{ + return item.free_drink_type.id == 1 || item.free_drink_type.id == 3 + }) } }, beforeDestroy() { diff --git a/src/plugins/routes.js b/src/plugins/routes.js index 6282c3d..d25a4da 100644 --- a/src/plugins/routes.js +++ b/src/plugins/routes.js @@ -1,8 +1,8 @@ //const main = 'https://192.168.5.128:5000/' -//const main = 'http://localhost:5000/' +const main = 'http://localhost:5000/' //const main = 'http://192.168.5.118:5000/' //const main = 'https://groeger-clan.duckdns.org:5000/' -const main = 'https://flaschengeist.wu5.de:5000/' +//const main = 'https://flaschengeist.wu5.de:5000/' const url = { login: main + 'login', diff --git a/src/store/modules/freeDrinkList.js b/src/store/modules/freeDrinkList.js index acf03d6..e9fc998 100644 --- a/src/store/modules/freeDrinkList.js +++ b/src/store/modules/freeDrinkList.js @@ -54,7 +54,6 @@ const mutations = { data.visible = false } }, 5000) - console.log(data) state.snackbar_messages.unshift(data) }, set_free_drink_list_reasons(state, data) { @@ -100,10 +99,8 @@ const actions = { headers: { Token: rootState.login.user.accessToken }, timeout }) - console.log(response.data) commit('set_free_drink_list_history', response.data) } catch (e) { - console.log(e) if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) } @@ -142,7 +139,6 @@ const actions = { timeout } ) - console.log(data) commit('set_free_drink_list_history', response.data) commit('add_snackbar_message', { data, error: false }) } catch (e) { @@ -158,18 +154,15 @@ const actions = { }, async update_free_drink_list_history({ commit, dispatch, rootState }, data) { try { - console.log(data) commit('set_free_drink_list_history_loading', true) const response = await axios.put( url.freeDrinkListHistory, { ...data }, { headers: { Token: rootState.login.user.accessToken }, timeout } ) - console.log(response.data) commit('set_free_drink_list_history', response.data) commit('add_snackbar_message', { data, error: false }) } catch (e) { - console.log(e) dispatch('connectionError/addError', null, { root: true }) if (e.message == 'Network Error') { dispatch('connectionError/addError', null, { root: true }) @@ -342,7 +335,6 @@ const getters = { }, free_drink_list_config_job(state) { return state.free_drink_list_config.filter(item => { - console.log(item) return item.free_drink_types.find(drink_type => { return drink_type.id == 1 }) From 4f6493355517377d1905e57611820bd7248788b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Fri, 2 Oct 2020 09:13:14 +0200 Subject: [PATCH 020/448] new Project with Quasar --- .editorconfig | 9 + .eslintignore | 7 + .eslintrc.js | 86 + .gitignore | 22 +- .postcssrc.js | 8 + .prettierrc | 4 + .vscode/extensions.json | 12 + .vscode/settings.json | 7 + README.md | 32 +- babel.config.js | 3 +- cert/server.crt | 21 - cert/server.key | 28 - package-lock.json | 12282 ++++++++++------ package.json | 85 +- public/favicon.ico | Bin 4286 -> 16645 bytes public/icons/favicon-128x128.png | Bin 0 -> 4565 bytes public/icons/favicon-16x16.png | Bin 0 -> 555 bytes public/icons/favicon-32x32.png | Bin 0 -> 998 bytes public/icons/favicon-96x96.png | Bin 0 -> 3295 bytes public/index.html | 19 - public/wuicon.ico | Bin 3518 -> 0 bytes quasar.conf.js | 207 + src/App.vue | 232 +- src/assets/logo-64.png | Bin 4487 -> 0 bytes src/assets/logo-big.png | Bin 329633 -> 0 bytes src/assets/logo.png | Bin 6849 -> 0 bytes src/assets/logo.svg | 1 - src/assets/logo_256.png | Bin 1906 -> 0 bytes src/assets/quasar-logo-full.svg | 191 + src/boot/.gitkeep | 0 src/boot/axios.ts | 13 + src/boot/composition-api.ts | 6 + src/components/CompositionComponent.vue | 59 + src/components/ConnectionError.vue | 40 - src/components/CookieNotification.vue | 48 - src/components/EssentialLink.vue | 51 + src/components/ResetPassword.vue | 146 - src/components/TitleBar.vue | 94 - src/components/baruser/BarFreedrinks.vue | 446 - src/components/baruser/BarNavigation.vue | 35 - src/components/baruser/CreditLists.vue | 595 - src/components/baruser/SearchBar.vue | 133 - .../finanzer/FinanzerNavigation.vue | 49 - src/components/finanzer/Overview.vue | 400 - .../finanzer/Skeleton/TableSkeleton.vue | 60 - .../finanzer/Skeleton/UserSkeleton.vue | 82 - src/components/finanzer/Table.vue | 125 - src/components/finanzer/User.vue | 363 - src/components/gastro/GastroNavigation.vue | 28 - src/components/models.ts | 8 + src/components/pricelist/PriceList.vue | 497 - src/components/user/AddAmount.vue | 497 - src/components/user/Config.vue | 458 - src/components/user/CreditOverview.vue | 116 - .../user/JobRequests/JobInvites.vue | 208 - .../user/JobRequests/JobTransfer.vue | 224 - src/components/user/Jobs.vue | 192 - src/components/user/Jobs/Day.vue | 438 - src/components/user/JobsRequest.vue | 55 - .../user/Skeleton/AddAmountSkeleton.vue | 50 - .../user/Skeleton/CreditOverviewSkeleton.vue | 35 - src/components/user/UserNavigation.vue | 107 - .../user/freedrink/freedrinkUserView.vue | 474 - src/components/vorstand/FreeDrinkList.vue | 138 - .../FreeDrinkList/FreeDrinkListBand.vue | 106 - .../FreeDrinkList/FreeDrinkListConfig.vue | 212 - .../FreeDrinkListConfigConfigItem.vue | 120 - .../FreeDrinkListConfigReasonItem.vue | 70 - .../FreeDrinkList/FreeDrinkListJob.vue | 106 - .../FreeDrinkList/FreeDrinkListMain.vue | 166 - .../FreeDrinkList/FreeDrinkListWorkgroup.vue | 112 - src/components/vorstand/JobKindManager.vue | 171 - .../vorstand/ManagementNavigation.vue | 60 - src/components/vorstand/ServiceManagement.vue | 169 - .../ServiceManagementComponents/Day.vue | 518 - src/components/vorstand/UserManager.vue | 320 - .../vorstand/WorkgroupManagement.vue | 190 - src/css/app.scss | 1 + src/css/quasar.variables.scss | 24 + src/env.d.ts | 7 + src/index.template.html | 22 + src/layouts/MainLayout.vue | 109 + src/main.js | 14 - src/pages/Error404.vue | 31 + src/pages/Index.vue | 49 + src/plugins/routes.js | 103 - src/plugins/vuetify.js | 10 - src/router/index.js | 274 - src/router/index.ts | 27 + src/router/routes.ts | 20 + src/shims-vue.d.ts | 5 + src/store/index.js | 37 - src/store/index.ts | 33 + src/store/module-example/actions.ts | 11 + src/store/module-example/getters.ts | 11 + src/store/module-example/index.ts | 16 + src/store/module-example/mutations.ts | 10 + src/store/module-example/state.ts | 9 + src/store/modules/barUsers.js | 411 - src/store/modules/connectionError.js | 43 - src/store/modules/finanzerUsers.js | 512 - src/store/modules/freeDrinkList.js | 438 - src/store/modules/jobInvites.js | 437 - src/store/modules/jobRequests.js | 387 - src/store/modules/jobkindManager.js | 132 - src/store/modules/jobs.js | 476 - src/store/modules/login.js | 268 - src/store/modules/pricelist.js | 269 - src/store/modules/serviceManagement.js | 460 - src/store/modules/user.js | 430 - src/store/modules/userManager.js | 216 - src/store/modules/workgroupManagement.js | 133 - src/store/store-flag.d.ts | 9 + src/views/About.vue | 5 - src/views/BarView.vue | 13 - src/views/FinanzerView.vue | 27 - src/views/Login.vue | 93 - src/views/MainView.vue | 117 - src/views/UserView.vue | 27 - src/views/contents/BarFreedrinksView.vue | 24 - src/views/contents/GeruechteView.vue | 27 - src/views/contents/PriceListView.vue | 17 - tsconfig.json | 6 + vue.config.js | 15 - 124 files changed, 8666 insertions(+), 18995 deletions(-) create mode 100644 .editorconfig create mode 100644 .eslintignore create mode 100644 .eslintrc.js create mode 100644 .postcssrc.js create mode 100644 .prettierrc create mode 100644 .vscode/extensions.json create mode 100644 .vscode/settings.json delete mode 100644 cert/server.crt delete mode 100644 cert/server.key create mode 100644 public/icons/favicon-128x128.png create mode 100644 public/icons/favicon-16x16.png create mode 100644 public/icons/favicon-32x32.png create mode 100644 public/icons/favicon-96x96.png delete mode 100644 public/index.html delete mode 100644 public/wuicon.ico create mode 100644 quasar.conf.js delete mode 100644 src/assets/logo-64.png delete mode 100644 src/assets/logo-big.png delete mode 100644 src/assets/logo.png delete mode 100644 src/assets/logo.svg delete mode 100644 src/assets/logo_256.png create mode 100644 src/assets/quasar-logo-full.svg create mode 100644 src/boot/.gitkeep create mode 100644 src/boot/axios.ts create mode 100644 src/boot/composition-api.ts create mode 100644 src/components/CompositionComponent.vue delete mode 100644 src/components/ConnectionError.vue delete mode 100644 src/components/CookieNotification.vue create mode 100644 src/components/EssentialLink.vue delete mode 100644 src/components/ResetPassword.vue delete mode 100644 src/components/TitleBar.vue delete mode 100644 src/components/baruser/BarFreedrinks.vue delete mode 100644 src/components/baruser/BarNavigation.vue delete mode 100644 src/components/baruser/CreditLists.vue delete mode 100644 src/components/baruser/SearchBar.vue delete mode 100644 src/components/finanzer/FinanzerNavigation.vue delete mode 100644 src/components/finanzer/Overview.vue delete mode 100644 src/components/finanzer/Skeleton/TableSkeleton.vue delete mode 100644 src/components/finanzer/Skeleton/UserSkeleton.vue delete mode 100644 src/components/finanzer/Table.vue delete mode 100644 src/components/finanzer/User.vue delete mode 100644 src/components/gastro/GastroNavigation.vue create mode 100644 src/components/models.ts delete mode 100644 src/components/pricelist/PriceList.vue delete mode 100644 src/components/user/AddAmount.vue delete mode 100644 src/components/user/Config.vue delete mode 100644 src/components/user/CreditOverview.vue delete mode 100644 src/components/user/JobRequests/JobInvites.vue delete mode 100644 src/components/user/JobRequests/JobTransfer.vue delete mode 100644 src/components/user/Jobs.vue delete mode 100644 src/components/user/Jobs/Day.vue delete mode 100644 src/components/user/JobsRequest.vue delete mode 100644 src/components/user/Skeleton/AddAmountSkeleton.vue delete mode 100644 src/components/user/Skeleton/CreditOverviewSkeleton.vue delete mode 100644 src/components/user/UserNavigation.vue delete mode 100644 src/components/user/freedrink/freedrinkUserView.vue delete mode 100644 src/components/vorstand/FreeDrinkList.vue delete mode 100644 src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue delete mode 100644 src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue delete mode 100644 src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigConfigItem.vue delete mode 100644 src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigReasonItem.vue delete mode 100644 src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue delete mode 100644 src/components/vorstand/FreeDrinkList/FreeDrinkListMain.vue delete mode 100644 src/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup.vue delete mode 100644 src/components/vorstand/JobKindManager.vue delete mode 100644 src/components/vorstand/ManagementNavigation.vue delete mode 100644 src/components/vorstand/ServiceManagement.vue delete mode 100644 src/components/vorstand/ServiceManagementComponents/Day.vue delete mode 100644 src/components/vorstand/UserManager.vue delete mode 100644 src/components/vorstand/WorkgroupManagement.vue create mode 100644 src/css/app.scss create mode 100644 src/css/quasar.variables.scss create mode 100644 src/env.d.ts create mode 100644 src/index.template.html create mode 100644 src/layouts/MainLayout.vue delete mode 100644 src/main.js create mode 100644 src/pages/Error404.vue create mode 100644 src/pages/Index.vue delete mode 100644 src/plugins/routes.js delete mode 100644 src/plugins/vuetify.js delete mode 100644 src/router/index.js create mode 100644 src/router/index.ts create mode 100644 src/router/routes.ts create mode 100644 src/shims-vue.d.ts delete mode 100644 src/store/index.js create mode 100644 src/store/index.ts create mode 100644 src/store/module-example/actions.ts create mode 100644 src/store/module-example/getters.ts create mode 100644 src/store/module-example/index.ts create mode 100644 src/store/module-example/mutations.ts create mode 100644 src/store/module-example/state.ts delete mode 100644 src/store/modules/barUsers.js delete mode 100644 src/store/modules/connectionError.js delete mode 100644 src/store/modules/finanzerUsers.js delete mode 100644 src/store/modules/freeDrinkList.js delete mode 100644 src/store/modules/jobInvites.js delete mode 100644 src/store/modules/jobRequests.js delete mode 100644 src/store/modules/jobkindManager.js delete mode 100644 src/store/modules/jobs.js delete mode 100644 src/store/modules/login.js delete mode 100644 src/store/modules/pricelist.js delete mode 100644 src/store/modules/serviceManagement.js delete mode 100644 src/store/modules/user.js delete mode 100644 src/store/modules/userManager.js delete mode 100644 src/store/modules/workgroupManagement.js create mode 100644 src/store/store-flag.d.ts delete mode 100644 src/views/About.vue delete mode 100644 src/views/BarView.vue delete mode 100644 src/views/FinanzerView.vue delete mode 100644 src/views/Login.vue delete mode 100644 src/views/MainView.vue delete mode 100644 src/views/UserView.vue delete mode 100644 src/views/contents/BarFreedrinksView.vue delete mode 100644 src/views/contents/GeruechteView.vue delete mode 100644 src/views/contents/PriceListView.vue create mode 100644 tsconfig.json delete mode 100644 vue.config.js diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..9d08a1a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 2 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..6c826df --- /dev/null +++ b/.eslintignore @@ -0,0 +1,7 @@ +/dist +/src-bex/www +/src-capacitor +/src-cordova +/.quasar +/node_modules +/src-ssr \ No newline at end of file diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..7afec26 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,86 @@ +const { resolve } = require('path'); +module.exports = { + // https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy + // This option interrupts the configuration hierarchy at this file + // Remove this if you have an higher level ESLint config file (it usually happens into a monorepos) + root: true, + + // https://eslint.vuejs.org/user-guide/#how-to-use-custom-parser + // Must use parserOptions instead of "parser" to allow vue-eslint-parser to keep working + // `parser: 'vue-eslint-parser'` is already included with any 'plugin:vue/**' config and should be omitted + parserOptions: { + // https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/parser#configuration + // https://github.com/TypeStrong/fork-ts-checker-webpack-plugin#eslint + // Needed to make the parser take into account 'vue' files + extraFileExtensions: ['.vue'], + parser: '@typescript-eslint/parser', + project: resolve(__dirname, './tsconfig.json'), + tsconfigRootDir: __dirname, + ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features + sourceType: 'module' // Allows for the use of imports + }, + + env: { + browser: true + }, + + // Rules order is important, please avoid shuffling them + extends: [ + // Base ESLint recommended rules + // 'eslint:recommended', + + // https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin#usage + // ESLint typescript rules + 'plugin:@typescript-eslint/recommended', + // consider disabling this class of rules if linting takes too long + 'plugin:@typescript-eslint/recommended-requiring-type-checking', + + // Uncomment any of the lines below to choose desired strictness, + // but leave only one uncommented! + // See https://eslint.vuejs.org/rules/#available-rules + 'plugin:vue/essential', // Priority A: Essential (Error Prevention) + // 'plugin:vue/strongly-recommended', // Priority B: Strongly Recommended (Improving Readability) + // 'plugin:vue/recommended', // Priority C: Recommended (Minimizing Arbitrary Choices and Cognitive Overhead) + + // https://github.com/prettier/eslint-config-prettier#installation + // usage with Prettier, provided by 'eslint-config-prettier'. + 'prettier', + 'prettier/@typescript-eslint', + 'prettier/vue' + ], + + plugins: [ + // required to apply rules which need type information + '@typescript-eslint', + + // https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-file + // required to lint *.vue files + 'vue', + + // https://github.com/typescript-eslint/typescript-eslint/issues/389#issuecomment-509292674 + // Prettier has not been included as plugin to avoid performance impact + // add it as an extension for your IDE + ], + + globals: { + ga: true, // Google Analytics + cordova: true, + __statics: true, + process: true, + Capacitor: true, + chrome: true + }, + + // add your custom rules here + rules: { + 'prefer-promise-reject-errors': 'off', + + // TypeScript + quotes: ['warn', 'single', { avoidEscape: true }], + '@typescript-eslint/explicit-function-return-type': 'off', + '@typescript-eslint/explicit-module-boundary-types': 'off', + + // allow debugger during development only + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' + } +} diff --git a/.gitignore b/.gitignore index a0dddc6..553e134 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,24 @@ .DS_Store +.thumbs.db node_modules + +# Quasar core related directories +.quasar /dist -# local env files -.env.local -.env.*.local +# Cordova related directories and files +/src-cordova/node_modules +/src-cordova/platforms +/src-cordova/plugins +/src-cordova/www + +# Capacitor related directories and files +/src-capacitor/www +/src-capacitor/node_modules + +# BEX related directories and files +/src-bex/www +/src-bex/js/core # Log files npm-debug.log* @@ -13,9 +27,7 @@ yarn-error.log* # Editor directories and files .idea -.vscode *.suo *.ntvs* *.njsproj *.sln -*.sw? diff --git a/.postcssrc.js b/.postcssrc.js new file mode 100644 index 0000000..1174fe5 --- /dev/null +++ b/.postcssrc.js @@ -0,0 +1,8 @@ +// https://github.com/michael-ciniawsky/postcss-load-config + +module.exports = { + plugins: [ + // to edit target browsers: use "browserslist" field in package.json + require('autoprefixer') + ] +} diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..650cb88 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +{ + "singleQuote": true, + "semi": true +} diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..cf4458d --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,12 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode", + "octref.vetur" + ], + "unwantedRecommendations": [ + "hookyqr.beautify", + "dbaeumer.jshint", + "ms-vscode.vscode-typescript-tslint-plugin" + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..d4af05c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "vetur.validation.template": false, + "vetur.format.enable": false, + "eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"], + "typescript.tsdk": "node_modules/typescript/lib", + "vetur.experimental.templateInterpolationService": true +} diff --git a/README.md b/README.md index 299c735..0e98c90 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,26 @@ -# newgruecht-vue +# Flaschengeist (flaschengeist-frontend) -## Project setup -``` +Dynamischen Managementsystem für Studentenclubs + +## Install the dependencies +```bash npm install ``` -### Compiles and hot-reloads for development -``` -npm run serve +### Start the app in development mode (hot-code reloading, error reporting, etc.) +```bash +quasar dev ``` -### Compiles and minifies for production -``` -npm run build -``` - -### Lints and fixes files -``` +### Lint the files +```bash npm run lint ``` -### Customize configuration -See [Configuration Reference](https://cli.vuejs.org/config/). +### Build the app for production +```bash +quasar build +``` + +### Customize the configuration +See [Configuring quasar.conf.js](https://quasar.dev/quasar-cli/quasar-conf-js). diff --git a/babel.config.js b/babel.config.js index e955840..7744537 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,5 +1,6 @@ +/* eslint-env node */ module.exports = { presets: [ - '@vue/cli-plugin-babel/preset' + '@quasar/babel-preset-app' ] } diff --git a/cert/server.crt b/cert/server.crt deleted file mode 100644 index e804409..0000000 --- a/cert/server.crt +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDazCCAlOgAwIBAgIJAJGH2ozWvd1RMA0GCSqGSIb3DQEBCwUAMFMxCzAJBgNV -BAYTAkRFMQ8wDQYDVQQIDAZTYXhvbnkxEDAOBgNVBAcMB0RyZXNkZW4xITAfBgNV -BAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0yMDAxMTcwOTA0MDFaFw0z -MDAxMDQwOTA0MDFaMEQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIDAZTYXhvbnkxEDAO -BgNVBAcMB0RyZXNkZW4xEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcN -AQEBBQADggEPADCCAQoCggEBALlkr1UOQypLKicESRnse52d5mAX9MjZQpH0/Y5u -V5WxpPSasmOpt4MRj5MWTfTK2ukj/jLtPAMsggUh7wMXb1uytHj7T5mtiahXBM0H -1sUi2nScXR6doQZlmqKWDGrVS7WHULM01WhirsnxI8S8e6Evpk4F5/RafKA8FgYI -Ongg6S1B16+7T0e/FnILoMjKr1jpgzXnVkPFIneu/qVevSNco5/aw+bc6sjeS/ZA -65dXFGpDlw0lPRHLT5/CgNyMyiLYov7KwMycZw7uxa1ynO+73tqe5tvO/DiMpAPJ -EkrSz/StYBsGJxDhwq5RT31tHVtHhTf0rk1BmaoQJ0Aq7iECAwEAAaNRME8wHwYD -VR0jBBgwFoAUt8P5gBfN9hCUAiWhtPH5fTWnctAwCQYDVR0TBAIwADALBgNVHQ8E -BAMCBPAwFAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBAQCD -fBByVq8AbV1DMrY+MElb/nZA5/cuGnUpBpjSlk5OnYHWtywuQk6veiiJ0S2fNfqf -RzwOFuZDHKmIcH0574VssLfUynMKP3w3xb2ZNic3AxAdhzZ6LXLx6+qF5tYcL7oC -UWmj5Mo9SkX5HZLEGamQlVyGOGKNatxep4liyoSeKXr0AOHYfB4AkDhVZn7yQc/v -But42fLBg4mE+rk4UBYOHA4XdoFwqgTCNZq2RxKzvG9LIcok6lOc6gDnfTsH8GqE -byGpfIIQAXF8aftCm4dGXxtzMh8C5d0t2Ell9g+Rr8i/enebT2nJ9B9ptldDjhcZ -7I0ywGsXwrh0EwFsX74/ ------END CERTIFICATE----- diff --git a/cert/server.key b/cert/server.key deleted file mode 100644 index 153fd6b..0000000 --- a/cert/server.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC5ZK9VDkMqSyon -BEkZ7HudneZgF/TI2UKR9P2ObleVsaT0mrJjqbeDEY+TFk30ytrpI/4y7TwDLIIF -Ie8DF29bsrR4+0+ZrYmoVwTNB9bFItp0nF0enaEGZZqilgxq1Uu1h1CzNNVoYq7J -8SPEvHuhL6ZOBef0WnygPBYGCDp4IOktQdevu09HvxZyC6DIyq9Y6YM151ZDxSJ3 -rv6lXr0jXKOf2sPm3OrI3kv2QOuXVxRqQ5cNJT0Ry0+fwoDcjMoi2KL+ysDMnGcO -7sWtcpzvu97anubbzvw4jKQDyRJK0s/0rWAbBicQ4cKuUU99bR1bR4U39K5NQZmq -ECdAKu4hAgMBAAECggEABoMQ3Y34sf2d52zxHGYAGZM4SlvND1kCS5otZdleXjW1 -M5pTdci6V3JAdswrxNNzSQkonqVSnFHt5zw/5v3lvXTTfgRl0WIVGcKkuobx9k65 -Gat8YdzrkQv0mI1otj/zvtaX8ROEA3yj4xgDR5/PP+QqlUcD1MNw6TfzFhcn5pxB -/RDPmvarMhzMdDW60Uub6Z7e/kVPuXWrW4bDyULd1d1NoSibnFZi+vGY0Lc1ctDW -2Vl7A8RFTcQi6Cjx/FwgPGJTBE4UMjIBO3wnoPQBMrsSxeGhcarerqIlEafgT4XN -p9BMtRyaXE7TTb1BXc35ZYNJLDLJKQxABhrEHtFreQKBgQDpiGwuKAFK8BLPlbAx -zkShhKd9fhlwm2bfRv3cojPQZsxn0BjefmtrISbKCD79Ivyn7TnOyYAoKAxdp2q9 -wtz94aAXV2lfhUw2lhcb/aw4sXuY/s1XnVyoglOO8pYRCUN0o80pKuWFsaDyy/uL -LhINff1oMNCa7vmMdu8Ccz0o/wKBgQDLOqdTQhSFs4f1yhlDDH3pqT6eKvtFNeRJ -usxYDnAyRXHRqwhQ86z1nBZIgwXqq7PfO9V5Y/l6/2HmmA2ufjS8aBTNpCUMuvJk -y98Z4hTjKRdnVlMUjHq9ahCixJVQ8pcCnWRFdeAwSKhHQiJEFLYeYOIrUeCIYJI4 -FiCshSPI3wKBgGU0ErWZ7p18FprRIs8itYlNhIwUxo+POPCPwloIDO5GblSa0Pwy -yvhdIIMzOaDXtahMXN3pYtmEKX+4msBrnvuC+K7E2cxkZtfNCWy+7RCQkaCG45QR -hOMdv3pWVIRDgHEevz0U8uySQs6VaYgySe6A5/1sEiriX1DpBcEJEbsfAoGAKUCb -rGvSbJ1XsM24OQL1IBQJsON6o77fuxOe3RT5M0sjYnL8OipsZmKrp0ZpUgxOc7ba -i0x+3LewMLWWuV/G5qOd7WwvVRkxkMJNZByfLskthf1g2d/2HjLEc7XBtW+4tYAr -VWoq+sIU3noPKJCnsxzpa++vyx8HLzlWoo5YCDMCgYBJvGH2zMgInlQNO/2XY5nl -E53EZMex+RDq8Wzr4tRM3IrCGc2t8WKEQ/9teKNH0tg9xib0vhqqmiGl1xNfqJVo -ePJyfgFabeUx9goG3mgTdV9woSRlBJso62dM0DAC/jsJoHnVzgokysR4/BfW9Da+ -AYTxRZSNbfmsTHawXqG8Fw== ------END PRIVATE KEY----- diff --git a/package-lock.json b/package-lock.json index 2236e9a..7f962c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,452 +1,540 @@ { - "name": "newgruecht-vue", - "version": "1.1.0", + "name": "flaschengeist-frontend", + "version": "0.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { "@babel/code-frame": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", - "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", "dev": true, "requires": { - "@babel/highlight": "^7.0.0" + "@babel/highlight": "7.10.4" } }, "@babel/compat-data": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz", - "integrity": "sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz", + "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==", "dev": true, "requires": { - "browserslist": "^4.11.1", - "invariant": "^2.2.4", - "semver": "^5.5.0" + "browserslist": "4.14.5", + "invariant": "2.2.4", + "semver": "5.7.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } } }, "@babel/core": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz", - "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==", + "version": "7.11.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz", + "integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==", "dev": true, "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helpers": "^7.9.6", - "@babel/parser": "^7.9.6", - "@babel/template": "^7.8.6", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.13", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" + "@babel/code-frame": "7.10.4", + "@babel/generator": "7.11.6", + "@babel/helper-module-transforms": "7.11.0", + "@babel/helpers": "7.10.4", + "@babel/parser": "7.11.5", + "@babel/template": "7.10.4", + "@babel/traverse": "7.11.5", + "@babel/types": "7.11.5", + "convert-source-map": "1.7.0", + "debug": "4.2.0", + "gensync": "1.0.0-beta.1", + "json5": "2.1.3", + "lodash": "4.17.20", + "resolve": "1.17.0", + "semver": "5.7.1", + "source-map": "0.5.7" }, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "@babel/highlight": "^7.8.3" + "ms": "2.1.2" } }, - "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.9.0", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true } } }, "@babel/generator": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz", - "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==", + "version": "7.11.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz", + "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==", "dev": true, "requires": { - "@babel/types": "^7.9.6", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0" + "@babel/types": "7.11.5", + "jsesc": "2.5.2", + "source-map": "0.5.7" } }, "@babel/helper-annotate-as-pure": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz", - "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz", + "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "7.11.5" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz", - "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz", + "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==", "dev": true, "requires": { - "@babel/helper-explode-assignable-expression": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/helper-explode-assignable-expression": "7.11.4", + "@babel/types": "7.11.5" } }, "@babel/helper-compilation-targets": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz", - "integrity": "sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz", + "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==", "dev": true, "requires": { - "@babel/compat-data": "^7.9.6", - "browserslist": "^4.11.1", - "invariant": "^2.2.4", - "levenary": "^1.1.1", - "semver": "^5.5.0" + "@babel/compat-data": "7.11.0", + "browserslist": "4.14.5", + "invariant": "2.2.4", + "levenary": "1.1.1", + "semver": "5.7.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } } }, "@babel/helper-create-class-features-plugin": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz", - "integrity": "sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz", + "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-member-expression-to-functions": "^7.8.3", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.9.6", - "@babel/helper-split-export-declaration": "^7.8.3" + "@babel/helper-function-name": "7.10.4", + "@babel/helper-member-expression-to-functions": "7.11.0", + "@babel/helper-optimise-call-expression": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-replace-supers": "7.10.4", + "@babel/helper-split-export-declaration": "7.11.0" } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz", - "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz", + "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-regex": "^7.8.3", - "regexpu-core": "^4.7.0" + "@babel/helper-annotate-as-pure": "7.10.4", + "@babel/helper-regex": "7.10.5", + "regexpu-core": "4.7.1" } }, "@babel/helper-define-map": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz", - "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz", + "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.8.3", - "@babel/types": "^7.8.3", - "lodash": "^4.17.13" + "@babel/helper-function-name": "7.10.4", + "@babel/types": "7.11.5", + "lodash": "4.17.20" } }, "@babel/helper-explode-assignable-expression": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz", - "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==", + "version": "7.11.4", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz", + "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==", "dev": true, "requires": { - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/types": "7.11.5" } }, "@babel/helper-function-name": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz", - "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", + "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/types": "^7.9.5" + "@babel/helper-get-function-arity": "7.10.4", + "@babel/template": "7.10.4", + "@babel/types": "7.11.5" } }, "@babel/helper-get-function-arity": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", - "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", + "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "7.11.5" } }, "@babel/helper-hoist-variables": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz", - "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz", + "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "7.11.5" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz", - "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz", + "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "7.11.5" } }, "@babel/helper-module-imports": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz", - "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz", + "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "7.11.5" } }, "@babel/helper-module-transforms": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz", - "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz", + "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", - "@babel/helper-simple-access": "^7.8.3", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/template": "^7.8.6", - "@babel/types": "^7.9.0", - "lodash": "^4.17.13" + "@babel/helper-module-imports": "7.10.4", + "@babel/helper-replace-supers": "7.10.4", + "@babel/helper-simple-access": "7.10.4", + "@babel/helper-split-export-declaration": "7.11.0", + "@babel/template": "7.10.4", + "@babel/types": "7.11.5", + "lodash": "4.17.20" } }, "@babel/helper-optimise-call-expression": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz", - "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz", + "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "7.11.5" } }, "@babel/helper-plugin-utils": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz", - "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==", "dev": true }, "@babel/helper-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz", - "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz", + "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==", "dev": true, "requires": { - "lodash": "^4.17.13" + "lodash": "4.17.20" } }, "@babel/helper-remap-async-to-generator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz", - "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==", + "version": "7.11.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz", + "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-wrap-function": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/helper-annotate-as-pure": "7.10.4", + "@babel/helper-wrap-function": "7.10.4", + "@babel/template": "7.10.4", + "@babel/types": "7.11.5" } }, "@babel/helper-replace-supers": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz", - "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz", + "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.8.3", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6" + "@babel/helper-member-expression-to-functions": "7.11.0", + "@babel/helper-optimise-call-expression": "7.10.4", + "@babel/traverse": "7.11.5", + "@babel/types": "7.11.5" } }, "@babel/helper-simple-access": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz", - "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz", + "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==", "dev": true, "requires": { - "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/template": "7.10.4", + "@babel/types": "7.11.5" + } + }, + "@babel/helper-skip-transparent-expression-wrappers": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz", + "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==", + "dev": true, + "requires": { + "@babel/types": "7.11.5" } }, "@babel/helper-split-export-declaration": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", - "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", + "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", "dev": true, "requires": { - "@babel/types": "^7.8.3" + "@babel/types": "7.11.5" } }, "@babel/helper-validator-identifier": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", - "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", + "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", "dev": true }, "@babel/helper-wrap-function": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz", - "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz", + "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.8.3", - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/helper-function-name": "7.10.4", + "@babel/template": "7.10.4", + "@babel/traverse": "7.11.5", + "@babel/types": "7.11.5" } }, "@babel/helpers": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz", - "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz", + "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==", "dev": true, "requires": { - "@babel/template": "^7.8.3", - "@babel/traverse": "^7.9.6", - "@babel/types": "^7.9.6" + "@babel/template": "7.10.4", + "@babel/traverse": "7.11.5", + "@babel/types": "7.11.5" } }, "@babel/highlight": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", - "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", "dev": true, "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" + "@babel/helper-validator-identifier": "7.10.4", + "chalk": "2.4.2", + "js-tokens": "4.0.0" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + } } }, "@babel/parser": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz", - "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz", + "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==", "dev": true }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz", - "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz", + "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-remap-async-to-generator": "^7.8.3", - "@babel/plugin-syntax-async-generators": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-remap-async-to-generator": "7.11.4", + "@babel/plugin-syntax-async-generators": "7.8.4" } }, "@babel/plugin-proposal-class-properties": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz", - "integrity": "sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz", + "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-create-class-features-plugin": "7.10.5", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-proposal-decorators": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz", - "integrity": "sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.5.tgz", + "integrity": "sha512-Sc5TAQSZuLzgY0664mMDn24Vw2P8g/VhyLyGPaWiHahhgLqeZvcGeyBZOrJW0oSKIK2mvQ22a1ENXBIQLhrEiQ==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-decorators": "^7.8.3" + "@babel/helper-create-class-features-plugin": "7.10.5", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-decorators": "7.10.4" } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz", - "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz", + "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-dynamic-import": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-dynamic-import": "7.8.3" + } + }, + "@babel/plugin-proposal-export-namespace-from": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz", + "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-export-namespace-from": "7.8.3" + } + }, + "@babel/plugin-proposal-function-sent": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.10.4.tgz", + "integrity": "sha512-aBtve/DhQsVPAGnSDcgt33gF36rO0TK+KtHp9Hwtj3KwH+o1Cii9vfVVYeB9c6Jo1SXOgTRwRD7ljpTS0qbN8w==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-wrap-function": "7.10.4", + "@babel/plugin-syntax-function-sent": "7.10.4" } }, "@babel/plugin-proposal-json-strings": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz", - "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz", + "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-json-strings": "7.8.3" + } + }, + "@babel/plugin-proposal-logical-assignment-operators": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz", + "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-logical-assignment-operators": "7.10.4" } }, "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz", - "integrity": "sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz", + "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "7.8.3" } }, "@babel/plugin-proposal-numeric-separator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz", - "integrity": "sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz", + "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-numeric-separator": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-numeric-separator": "7.10.4" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz", - "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz", + "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-transform-parameters": "^7.9.5" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-object-rest-spread": "7.8.3", + "@babel/plugin-transform-parameters": "7.10.5" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz", - "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz", + "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-optional-catch-binding": "7.8.3" } }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz", - "integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz", + "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-skip-transparent-expression-wrappers": "7.11.0", + "@babel/plugin-syntax-optional-chaining": "7.8.3" + } + }, + "@babel/plugin-proposal-private-methods": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz", + "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==", + "dev": true, + "requires": { + "@babel/helper-create-class-features-plugin": "7.10.5", + "@babel/helper-plugin-utils": "7.10.4" + } + }, + "@babel/plugin-proposal-throw-expressions": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.10.4.tgz", + "integrity": "sha512-m7K9duXeH/rko36i9G9seLOg2AVdeVTn65k8nnTxgozex0hkDSUr6cktJxTO7jElGEpmMz410pTs0Jn8+empxw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-throw-expressions": "7.10.4" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.8.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz", - "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz", + "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.8", - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-create-regexp-features-plugin": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-async-generators": { @@ -455,16 +543,25 @@ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" + } + }, + "@babel/plugin-syntax-class-properties": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz", + "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-decorators": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz", - "integrity": "sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz", + "integrity": "sha512-2NaoC6fAk2VMdhY1eerkfHV+lVYC1u8b+jmRJISqANCJlTxYy19HGdIkkQtix2UtkcPuPu+IlDgrVseZnU03bw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-dynamic-import": { @@ -473,7 +570,34 @@ "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" + } + }, + "@babel/plugin-syntax-export-namespace-from": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", + "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4" + } + }, + "@babel/plugin-syntax-function-sent": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.10.4.tgz", + "integrity": "sha512-dwElaRoDQhlVevbgKOlEUTe08QNJo4ZjWw3rqnMbEvH8NRJM+iPN2tTQtzyfNloXD8f3Jdiyf5Pn400B1U3SVA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4" + } + }, + "@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-json-strings": { @@ -482,16 +606,16 @@ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" } }, - "@babel/plugin-syntax-jsx": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz", - "integrity": "sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==", + "@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-nullish-coalescing-operator": { @@ -500,16 +624,16 @@ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-numeric-separator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz", - "integrity": "sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-object-rest-spread": { @@ -518,7 +642,7 @@ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-optional-catch-binding": { @@ -527,7 +651,7 @@ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-optional-chaining": { @@ -536,667 +660,899 @@ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" + } + }, + "@babel/plugin-syntax-throw-expressions": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.10.4.tgz", + "integrity": "sha512-Yac/4W71+JdAiOV3aLbnUUe2R0NZzNvdy5EqdauFnBQTxIXT58M89lOplIFVELTSus6PxFMjmbi2vXaJDiV/PQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-top-level-await": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz", - "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz", + "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz", - "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz", + "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz", - "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz", + "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-remap-async-to-generator": "^7.8.3" + "@babel/helper-module-imports": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-remap-async-to-generator": "7.11.4" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz", - "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz", + "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz", - "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==", + "version": "7.11.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz", + "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "lodash": "^4.17.13" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-classes": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz", - "integrity": "sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz", + "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-define-map": "^7.8.3", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-optimise-call-expression": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.6", - "@babel/helper-split-export-declaration": "^7.8.3", - "globals": "^11.1.0" + "@babel/helper-annotate-as-pure": "7.10.4", + "@babel/helper-define-map": "7.10.5", + "@babel/helper-function-name": "7.10.4", + "@babel/helper-optimise-call-expression": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-replace-supers": "7.10.4", + "@babel/helper-split-export-declaration": "7.11.0", + "globals": "11.12.0" } }, "@babel/plugin-transform-computed-properties": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz", - "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz", + "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-destructuring": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz", - "integrity": "sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz", + "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz", - "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz", + "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-create-regexp-features-plugin": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz", - "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz", + "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz", - "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz", + "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-builder-binary-assignment-operator-visitor": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-for-of": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz", - "integrity": "sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz", + "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz", - "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz", + "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-function-name": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-literals": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz", - "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz", + "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz", - "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz", + "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz", - "integrity": "sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz", + "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.3" + "@babel/helper-module-transforms": "7.11.0", + "@babel/helper-plugin-utils": "7.10.4", + "babel-plugin-dynamic-import-node": "2.3.3" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz", - "integrity": "sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz", + "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-simple-access": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.3" + "@babel/helper-module-transforms": "7.11.0", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-simple-access": "7.10.4", + "babel-plugin-dynamic-import-node": "2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz", - "integrity": "sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz", + "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.8.3", - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helper-plugin-utils": "^7.8.3", - "babel-plugin-dynamic-import-node": "^2.3.3" + "@babel/helper-hoist-variables": "7.10.4", + "@babel/helper-module-transforms": "7.11.0", + "@babel/helper-plugin-utils": "7.10.4", + "babel-plugin-dynamic-import-node": "2.3.3" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz", - "integrity": "sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz", + "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.9.0", - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-module-transforms": "7.11.0", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz", - "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz", + "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.3" + "@babel/helper-create-regexp-features-plugin": "7.10.4" } }, "@babel/plugin-transform-new-target": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz", - "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz", + "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-object-super": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz", - "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz", + "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-replace-supers": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-replace-supers": "7.10.4" } }, "@babel/plugin-transform-parameters": { - "version": "7.9.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz", - "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==", + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz", + "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-get-function-arity": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-property-literals": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz", - "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz", + "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-regenerator": { - "version": "7.8.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz", - "integrity": "sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz", + "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==", "dev": true, "requires": { - "regenerator-transform": "^0.14.2" + "regenerator-transform": "0.14.5" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz", - "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz", + "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz", - "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz", + "integrity": "sha512-9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "resolve": "^1.8.1", - "semver": "^5.5.1" - } - }, - "@babel/plugin-transform-shorthand-properties": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz", - "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-spread": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz", - "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-sticky-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz", - "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/helper-regex": "^7.8.3" - } - }, - "@babel/plugin-transform-template-literals": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz", - "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==", - "dev": true, - "requires": { - "@babel/helper-annotate-as-pure": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-typeof-symbol": { - "version": "7.8.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz", - "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/plugin-transform-unicode-regex": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz", - "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==", - "dev": true, - "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3" - } - }, - "@babel/preset-env": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz", - "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==", - "dev": true, - "requires": { - "@babel/compat-data": "^7.9.6", - "@babel/helper-compilation-targets": "^7.9.6", - "@babel/helper-module-imports": "^7.8.3", - "@babel/helper-plugin-utils": "^7.8.3", - "@babel/plugin-proposal-async-generator-functions": "^7.8.3", - "@babel/plugin-proposal-dynamic-import": "^7.8.3", - "@babel/plugin-proposal-json-strings": "^7.8.3", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3", - "@babel/plugin-proposal-numeric-separator": "^7.8.3", - "@babel/plugin-proposal-object-rest-spread": "^7.9.6", - "@babel/plugin-proposal-optional-catch-binding": "^7.8.3", - "@babel/plugin-proposal-optional-chaining": "^7.9.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.8.3", - "@babel/plugin-syntax-async-generators": "^7.8.0", - "@babel/plugin-syntax-dynamic-import": "^7.8.0", - "@babel/plugin-syntax-json-strings": "^7.8.0", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", - "@babel/plugin-syntax-numeric-separator": "^7.8.0", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.0", - "@babel/plugin-syntax-top-level-await": "^7.8.3", - "@babel/plugin-transform-arrow-functions": "^7.8.3", - "@babel/plugin-transform-async-to-generator": "^7.8.3", - "@babel/plugin-transform-block-scoped-functions": "^7.8.3", - "@babel/plugin-transform-block-scoping": "^7.8.3", - "@babel/plugin-transform-classes": "^7.9.5", - "@babel/plugin-transform-computed-properties": "^7.8.3", - "@babel/plugin-transform-destructuring": "^7.9.5", - "@babel/plugin-transform-dotall-regex": "^7.8.3", - "@babel/plugin-transform-duplicate-keys": "^7.8.3", - "@babel/plugin-transform-exponentiation-operator": "^7.8.3", - "@babel/plugin-transform-for-of": "^7.9.0", - "@babel/plugin-transform-function-name": "^7.8.3", - "@babel/plugin-transform-literals": "^7.8.3", - "@babel/plugin-transform-member-expression-literals": "^7.8.3", - "@babel/plugin-transform-modules-amd": "^7.9.6", - "@babel/plugin-transform-modules-commonjs": "^7.9.6", - "@babel/plugin-transform-modules-systemjs": "^7.9.6", - "@babel/plugin-transform-modules-umd": "^7.9.0", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3", - "@babel/plugin-transform-new-target": "^7.8.3", - "@babel/plugin-transform-object-super": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.9.5", - "@babel/plugin-transform-property-literals": "^7.8.3", - "@babel/plugin-transform-regenerator": "^7.8.7", - "@babel/plugin-transform-reserved-words": "^7.8.3", - "@babel/plugin-transform-shorthand-properties": "^7.8.3", - "@babel/plugin-transform-spread": "^7.8.3", - "@babel/plugin-transform-sticky-regex": "^7.8.3", - "@babel/plugin-transform-template-literals": "^7.8.3", - "@babel/plugin-transform-typeof-symbol": "^7.8.4", - "@babel/plugin-transform-unicode-regex": "^7.8.3", - "@babel/preset-modules": "^0.1.3", - "@babel/types": "^7.9.6", - "browserslist": "^4.11.1", - "core-js-compat": "^3.6.2", - "invariant": "^2.2.2", - "levenary": "^1.1.1", - "semver": "^5.5.0" - } - }, - "@babel/preset-modules": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz", - "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==", - "dev": true, - "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", - "@babel/plugin-transform-dotall-regex": "^7.4.4", - "@babel/types": "^7.4.4", - "esutils": "^2.0.2" - } - }, - "@babel/runtime": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz", - "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==", - "dev": true, - "requires": { - "regenerator-runtime": "^0.13.4" - } - }, - "@babel/template": { - "version": "7.8.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz", - "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/parser": "^7.8.6", - "@babel/types": "^7.8.6" + "@babel/helper-module-imports": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4", + "resolve": "1.17.0", + "semver": "5.7.1" }, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", - "dev": true, - "requires": { - "@babel/highlight": "^7.8.3" - } - }, - "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.9.0", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true } } }, - "@babel/traverse": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz", - "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==", + "@babel/plugin-transform-shorthand-properties": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz", + "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==", "dev": true, "requires": { - "@babel/code-frame": "^7.8.3", - "@babel/generator": "^7.9.6", - "@babel/helper-function-name": "^7.9.5", - "@babel/helper-split-export-declaration": "^7.8.3", - "@babel/parser": "^7.9.6", - "@babel/types": "^7.9.6", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" + "@babel/helper-plugin-utils": "7.10.4" + } + }, + "@babel/plugin-transform-spread": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz", + "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-skip-transparent-expression-wrappers": "7.11.0" + } + }, + "@babel/plugin-transform-sticky-regex": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz", + "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-regex": "7.10.5" + } + }, + "@babel/plugin-transform-template-literals": { + "version": "7.10.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz", + "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==", + "dev": true, + "requires": { + "@babel/helper-annotate-as-pure": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" + } + }, + "@babel/plugin-transform-typeof-symbol": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz", + "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4" + } + }, + "@babel/plugin-transform-unicode-escapes": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz", + "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4" + } + }, + "@babel/plugin-transform-unicode-regex": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz", + "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==", + "dev": true, + "requires": { + "@babel/helper-create-regexp-features-plugin": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" + } + }, + "@babel/preset-env": { + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz", + "integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==", + "dev": true, + "requires": { + "@babel/compat-data": "7.11.0", + "@babel/helper-compilation-targets": "7.10.4", + "@babel/helper-module-imports": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-proposal-async-generator-functions": "7.10.5", + "@babel/plugin-proposal-class-properties": "7.10.4", + "@babel/plugin-proposal-dynamic-import": "7.10.4", + "@babel/plugin-proposal-export-namespace-from": "7.10.4", + "@babel/plugin-proposal-json-strings": "7.10.4", + "@babel/plugin-proposal-logical-assignment-operators": "7.11.0", + "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.4", + "@babel/plugin-proposal-numeric-separator": "7.10.4", + "@babel/plugin-proposal-object-rest-spread": "7.11.0", + "@babel/plugin-proposal-optional-catch-binding": "7.10.4", + "@babel/plugin-proposal-optional-chaining": "7.11.0", + "@babel/plugin-proposal-private-methods": "7.10.4", + "@babel/plugin-proposal-unicode-property-regex": "7.10.4", + "@babel/plugin-syntax-async-generators": "7.8.4", + "@babel/plugin-syntax-class-properties": "7.10.4", + "@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", + "@babel/plugin-syntax-logical-assignment-operators": "7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "7.8.3", + "@babel/plugin-syntax-numeric-separator": "7.10.4", + "@babel/plugin-syntax-object-rest-spread": "7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "7.8.3", + "@babel/plugin-syntax-optional-chaining": "7.8.3", + "@babel/plugin-syntax-top-level-await": "7.10.4", + "@babel/plugin-transform-arrow-functions": "7.10.4", + "@babel/plugin-transform-async-to-generator": "7.10.4", + "@babel/plugin-transform-block-scoped-functions": "7.10.4", + "@babel/plugin-transform-block-scoping": "7.11.1", + "@babel/plugin-transform-classes": "7.10.4", + "@babel/plugin-transform-computed-properties": "7.10.4", + "@babel/plugin-transform-destructuring": "7.10.4", + "@babel/plugin-transform-dotall-regex": "7.10.4", + "@babel/plugin-transform-duplicate-keys": "7.10.4", + "@babel/plugin-transform-exponentiation-operator": "7.10.4", + "@babel/plugin-transform-for-of": "7.10.4", + "@babel/plugin-transform-function-name": "7.10.4", + "@babel/plugin-transform-literals": "7.10.4", + "@babel/plugin-transform-member-expression-literals": "7.10.4", + "@babel/plugin-transform-modules-amd": "7.10.5", + "@babel/plugin-transform-modules-commonjs": "7.10.4", + "@babel/plugin-transform-modules-systemjs": "7.10.5", + "@babel/plugin-transform-modules-umd": "7.10.4", + "@babel/plugin-transform-named-capturing-groups-regex": "7.10.4", + "@babel/plugin-transform-new-target": "7.10.4", + "@babel/plugin-transform-object-super": "7.10.4", + "@babel/plugin-transform-parameters": "7.10.5", + "@babel/plugin-transform-property-literals": "7.10.4", + "@babel/plugin-transform-regenerator": "7.10.4", + "@babel/plugin-transform-reserved-words": "7.10.4", + "@babel/plugin-transform-shorthand-properties": "7.10.4", + "@babel/plugin-transform-spread": "7.11.0", + "@babel/plugin-transform-sticky-regex": "7.10.4", + "@babel/plugin-transform-template-literals": "7.10.5", + "@babel/plugin-transform-typeof-symbol": "7.10.4", + "@babel/plugin-transform-unicode-escapes": "7.10.4", + "@babel/plugin-transform-unicode-regex": "7.10.4", + "@babel/preset-modules": "0.1.4", + "@babel/types": "7.11.5", + "browserslist": "4.14.5", + "core-js-compat": "3.6.5", + "invariant": "2.2.4", + "levenary": "1.1.1", + "semver": "5.7.1" }, "dependencies": { - "@babel/code-frame": { - "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", - "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "@babel/preset-modules": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz", + "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-proposal-unicode-property-regex": "7.10.4", + "@babel/plugin-transform-dotall-regex": "7.10.4", + "@babel/types": "7.11.5", + "esutils": "2.0.3" + } + }, + "@babel/runtime": { + "version": "7.11.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz", + "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==", + "dev": true, + "requires": { + "regenerator-runtime": "0.13.7" + } + }, + "@babel/template": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", + "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", + "dev": true, + "requires": { + "@babel/code-frame": "7.10.4", + "@babel/parser": "7.11.5", + "@babel/types": "7.11.5" + } + }, + "@babel/traverse": { + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz", + "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==", + "dev": true, + "requires": { + "@babel/code-frame": "7.10.4", + "@babel/generator": "7.11.6", + "@babel/helper-function-name": "7.10.4", + "@babel/helper-split-export-declaration": "7.11.0", + "@babel/parser": "7.11.5", + "@babel/types": "7.11.5", + "debug": "4.2.0", + "globals": "11.12.0", + "lodash": "4.17.20" + }, + "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "@babel/highlight": "^7.8.3" + "ms": "2.1.2" } }, - "@babel/highlight": { - "version": "7.9.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", - "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.9.0", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - } + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true } } }, "@babel/types": { - "version": "7.9.6", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz", - "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==", + "version": "7.11.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz", + "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.9.5", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" + "@babel/helper-validator-identifier": "7.10.4", + "lodash": "4.17.20", + "to-fast-properties": "2.0.0" } }, - "@hapi/address": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz", - "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==", - "dev": true - }, - "@hapi/bourne": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz", - "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==", - "dev": true - }, - "@hapi/hoek": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz", - "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==", - "dev": true - }, - "@hapi/joi": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz", - "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==", + "@electron/get": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.12.2.tgz", + "integrity": "sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==", "dev": true, "requires": { - "@hapi/address": "2.x.x", - "@hapi/bourne": "1.x.x", - "@hapi/hoek": "8.x.x", - "@hapi/topo": "3.x.x" - } - }, - "@hapi/topo": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz", - "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==", - "dev": true, - "requires": { - "@hapi/hoek": "^8.3.0" - } - }, - "@intervolga/optimize-cssnano-plugin": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@intervolga/optimize-cssnano-plugin/-/optimize-cssnano-plugin-1.0.6.tgz", - "integrity": "sha512-zN69TnSr0viRSU6cEDIcuPcP67QcpQ6uHACg58FiN9PDrU6SLyGW3MR4tiISbYxy1kDWAVPwD+XwQTWE5cigAA==", - "dev": true, - "requires": { - "cssnano": "^4.0.0", - "cssnano-preset-default": "^4.0.0", - "postcss": "^7.0.0" - } - }, - "@mdi/font": { - "version": "4.9.95", - "resolved": "https://registry.npmjs.org/@mdi/font/-/font-4.9.95.tgz", - "integrity": "sha512-m2sbAs+SMwRnWpkMriBxEulwuhmqRyh6X+hdOZlqSxYZUM2C2TaDnQ4gcilzdoAgru2XYnWViZ/xPuSDGgRXVw==" - }, - "@mdi/js": { - "version": "4.9.95", - "resolved": "https://registry.npmjs.org/@mdi/js/-/js-4.9.95.tgz", - "integrity": "sha512-6zKTCqZUCuDWJThdRcjdFTqp2BXfYwXI1UlYa68A1/kmCcy1ijpbpRbrJcUdZ+9WojencCh1DOGFqhj/x8I/eQ==" - }, - "@mrmlnc/readdir-enhanced": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", - "integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==", - "dev": true, - "requires": { - "call-me-maybe": "^1.0.1", - "glob-to-regexp": "^0.3.0" - } - }, - "@nodelib/fs.stat": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz", - "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==", - "dev": true - }, - "@soda/friendly-errors-webpack-plugin": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.1.tgz", - "integrity": "sha512-cWKrGaFX+rfbMrAxVv56DzhPNqOJPZuNIS2HGMELtgGzb+vsMzyig9mml5gZ/hr2BGtSLV+dP2LUEuAL8aG2mQ==", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "error-stack-parser": "^2.0.0", - "string-width": "^2.0.0" + "debug": "4.2.0", + "env-paths": "2.2.0", + "fs-extra": "8.1.0", + "global-agent": "2.1.12", + "global-tunnel-ng": "2.7.1", + "got": "9.6.0", + "progress": "2.0.3", + "sanitize-filename": "1.6.3", + "sumchecker": "3.0.1" }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ms": "2.1.2" } }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "graceful-fs": "4.2.4", + "jsonfile": "4.0.0", + "universalify": "0.1.2" } }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } } }, - "@soda/get-current-script": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.0.tgz", - "integrity": "sha512-9GvTek+7cVw7r+L7TNGOG1astZJWXz2h5q4BqMXl28KN+24iSCm1xo+RhZOZvwdT3bzNe9hD7riJc/lBoO7mgg==", + "@nodelib/fs.scandir": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", + "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "2.0.3", + "run-parallel": "1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", "dev": true }, + "@nodelib/fs.walk": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", + "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", + "dev": true, + "requires": { + "@nodelib/fs.scandir": "2.1.3", + "fastq": "1.8.0" + } + }, + "@npmcli/move-file": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz", + "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==", + "dev": true, + "requires": { + "mkdirp": "1.0.4" + }, + "dependencies": { + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + } + } + }, + "@positron/stack-trace": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@positron/stack-trace/-/stack-trace-1.0.0.tgz", + "integrity": "sha1-FPzHEqUwA475vhzmlSMVqDn0Zqg=", + "dev": true + }, + "@quasar/app": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@quasar/app/-/app-2.1.0.tgz", + "integrity": "sha512-f9ij7MU9DgckY+2IoDFQwZNpqGqD2dv+FZAy4kb/aqBKomsnVzSboGiw6eGwYWSMA5ODYFrJwMWSA9546hjU7Q==", + "dev": true, + "requires": { + "@quasar/babel-preset-app": "2.0.1", + "@quasar/fastclick": "1.1.4", + "@types/cordova": "0.0.34", + "@types/electron-packager": "14.0.0", + "@types/express": "4.17.6", + "@types/lru-cache": "5.1.0", + "@types/terser-webpack-plugin": "3.0.0", + "@types/webpack": "4.41.17", + "@types/webpack-bundle-analyzer": "3.8.0", + "@types/webpack-dev-server": "3.11.0", + "archiver": "5.0.0", + "autoprefixer": "9.8.6", + "browserslist": "4.14.5", + "chalk": "4.1.0", + "chokidar": "3.4.2", + "ci-info": "2.0.0", + "compression-webpack-plugin": "5.0.1", + "copy-webpack-plugin": "6.0.3", + "cross-spawn": "7.0.3", + "css-loader": "3.6.0", + "cssnano": "4.1.10", + "dot-prop": "5.2.0", + "elementtree": "0.1.7", + "express": "4.17.1", + "fast-glob": "3.2.4", + "file-loader": "6.0.0", + "fork-ts-checker-webpack-plugin": "4.1.6", + "friendly-errors-webpack-plugin": "1.7.0", + "fs-extra": "9.0.1", + "html-minifier": "4.0.0", + "html-webpack-plugin": "4.3.0", + "inquirer": "7.3.3", + "isbinaryfile": "4.0.6", + "launch-editor-middleware": "2.2.1", + "lodash.debounce": "4.0.8", + "lodash.template": "4.5.0", + "lodash.throttle": "4.1.1", + "log-update": "4.0.0", + "lru-cache": "6.0.0", + "memory-fs": "0.5.0", + "mini-css-extract-plugin": "0.10.0", + "minimist": "1.2.5", + "node-loader": "1.0.1", + "node-sass": "4.14.1", + "open": "7.1.0", + "optimize-css-assets-webpack-plugin": "5.0.3", + "ouch": "2.0.0", + "postcss-loader": "3.0.0", + "postcss-rtl": "1.7.3", + "postcss-safe-parser": "4.0.2", + "register-service-worker": "1.7.1", + "sass-loader": "8.0.2", + "semver": "7.3.2", + "strip-ansi": "6.0.0", + "stylus": "0.54.8", + "stylus-loader": "3.0.2", + "table": "5.4.6", + "terser-webpack-plugin": "4.1.0", + "ts-loader": "7.0.5", + "typescript": "3.9.5", + "url-loader": "4.1.0", + "vue": "2.6.12", + "vue-loader": "15.9.3", + "vue-router": "3.2.0", + "vue-server-renderer": "2.6.12", + "vue-style-loader": "4.1.2", + "vue-template-compiler": "2.6.12", + "vuex": "3.5.1", + "webpack": "4.44.1", + "webpack-bundle-analyzer": "3.8.0", + "webpack-chain": "6.5.1", + "webpack-dev-server": "3.11.0", + "webpack-merge": "4.2.2", + "webpack-node-externals": "2.5.1", + "write-file-webpack-plugin": "4.5.1", + "yargs": "15.4.1", + "zlib": "1.0.5" + } + }, + "@quasar/babel-preset-app": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@quasar/babel-preset-app/-/babel-preset-app-2.0.1.tgz", + "integrity": "sha512-Eiu8B2rFl3nEvA+PYaybcXknkXcgVy//OqM7+f5fu3UEVw050/JyHBsrnBOMc+muon16Og1RKxOVmQuAWDS1hA==", + "dev": true, + "requires": { + "@babel/core": "7.11.6", + "@babel/helper-compilation-targets": "7.10.4", + "@babel/helper-module-imports": "7.10.4", + "@babel/plugin-proposal-class-properties": "7.10.4", + "@babel/plugin-proposal-decorators": "7.10.5", + "@babel/plugin-proposal-export-namespace-from": "7.10.4", + "@babel/plugin-proposal-function-sent": "7.10.4", + "@babel/plugin-proposal-json-strings": "7.10.4", + "@babel/plugin-proposal-numeric-separator": "7.10.4", + "@babel/plugin-proposal-throw-expressions": "7.10.4", + "@babel/plugin-syntax-dynamic-import": "7.8.3", + "@babel/plugin-syntax-import-meta": "7.10.4", + "@babel/plugin-transform-runtime": "7.11.5", + "@babel/preset-env": "7.11.5", + "@babel/runtime": "7.11.2", + "babel-loader": "8.1.0", + "babel-plugin-dynamic-import-node": "2.3.3", + "babel-plugin-module-resolver": "4.0.0", + "core-js": "3.6.5", + "core-js-compat": "3.6.5" + } + }, + "@quasar/extras": { + "version": "1.9.7", + "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.9.7.tgz", + "integrity": "sha512-LvcY8ILYrW6SV49xH+XeXKPnxFjDRQIX1Uaa10XDarW9y99pL+lUNFUI7wFzO6SwoMP18BlpEnC3BEqnSZ7OAA==" + }, + "@quasar/fastclick": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@quasar/fastclick/-/fastclick-1.1.4.tgz", + "integrity": "sha512-i9wbyV4iT+v4KhtHJynUFhH5LiEPvAEgSnwMqPN4hf/8uRe82nDl5qP5agrp2el1h0HzyBpbvHaW7NB0BPrtvA==", + "dev": true + }, + "@sindresorhus/is": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", + "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", + "dev": true + }, + "@szmarczak/http-timer": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", + "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", + "dev": true, + "requires": { + "defer-to-connect": "1.1.3" + } + }, + "@types/anymatch": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz", + "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==", + "dev": true + }, + "@types/body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==", + "dev": true, + "requires": { + "@types/connect": "3.4.33", + "@types/node": "10.17.35" + } + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", "dev": true }, - "@types/events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", - "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", - "dev": true - }, - "@types/glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", - "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "@types/connect": { + "version": "3.4.33", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.33.tgz", + "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", "dev": true, "requires": { - "@types/events": "*", - "@types/minimatch": "*", - "@types/node": "*" + "@types/node": "10.17.35" } }, + "@types/connect-history-api-fallback": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.3.tgz", + "integrity": "sha512-7SxFCd+FLlxCfwVwbyPxbR4khL9aNikJhrorw8nUIOqeuooc9gifBuDQOJw5kzN7i6i3vLn9G8Wde/4QDihpYw==", + "dev": true, + "requires": { + "@types/express-serve-static-core": "4.17.13", + "@types/node": "10.17.35" + } + }, + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=", + "dev": true + }, + "@types/electron-packager": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/@types/electron-packager/-/electron-packager-14.0.0.tgz", + "integrity": "sha512-n47/AbT4DEYPyXtES2myPyKCxVE3hICAB3MnpoVg+Ba8CLBGOpUUsNJ5fyLhfKt5N06sT9nTk4eAc+rtYVpvTQ==", + "dev": true, + "requires": { + "@electron/get": "1.12.2", + "@types/node": "10.17.35", + "electron-notarize": "0.1.1", + "electron-osx-sign": "0.4.17" + } + }, + "@types/eslint-visitor-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", + "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==", + "dev": true + }, + "@types/express": { + "version": "4.17.6", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.6.tgz", + "integrity": "sha512-n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==", + "dev": true, + "requires": { + "@types/body-parser": "1.19.0", + "@types/express-serve-static-core": "4.17.13", + "@types/qs": "6.9.5", + "@types/serve-static": "1.13.5" + } + }, + "@types/express-serve-static-core": { + "version": "4.17.13", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.13.tgz", + "integrity": "sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA==", + "dev": true, + "requires": { + "@types/node": "10.17.35", + "@types/qs": "6.9.5", + "@types/range-parser": "1.2.3" + } + }, + "@types/glob": { + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", + "dev": true, + "requires": { + "@types/minimatch": "3.0.3", + "@types/node": "10.17.35" + } + }, + "@types/html-minifier-terser": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz", + "integrity": "sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA==", + "dev": true + }, + "@types/http-proxy": { + "version": "1.17.4", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz", + "integrity": "sha512-IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==", + "dev": true, + "requires": { + "@types/node": "10.17.35" + } + }, + "@types/http-proxy-middleware": { + "version": "0.19.3", + "resolved": "https://registry.npmjs.org/@types/http-proxy-middleware/-/http-proxy-middleware-0.19.3.tgz", + "integrity": "sha512-lnBTx6HCOUeIJMLbI/LaL5EmdKLhczJY5oeXZpX/cXE4rRqb3RmV7VcMpiEfYkmTjipv3h7IAyIINe4plEv7cA==", + "dev": true, + "requires": { + "@types/connect": "3.4.33", + "@types/http-proxy": "1.17.4", + "@types/node": "10.17.35" + } + }, + "@types/json-schema": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz", + "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==", + "dev": true + }, + "@types/lru-cache": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.0.tgz", + "integrity": "sha512-RaE0B+14ToE4l6UqdarKPnXwVDuigfFv+5j9Dze/Nqr23yyuqdNvzcZi3xB+3Agvi5R4EOgAksfv3lXX4vBt9w==", + "dev": true + }, + "@types/mime": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz", + "integrity": "sha512-Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q==", + "dev": true + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -1204,15 +1560,9 @@ "dev": true }, "@types/node": { - "version": "14.0.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.5.tgz", - "integrity": "sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==", - "dev": true - }, - "@types/normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==", + "version": "10.17.35", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.35.tgz", + "integrity": "sha512-gXx7jAWpMddu0f7a+L+txMplp3FnHl53OhQIF9puXKq3hDGY/GjH+MF04oWnV/adPSCrbtHumDCFwzq2VhltWA==", "dev": true }, "@types/q": { @@ -1221,595 +1571,272 @@ "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==", "dev": true }, - "@vue/babel-helper-vue-jsx-merge-props": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz", - "integrity": "sha512-6tyf5Cqm4m6v7buITuwS+jHzPlIPxbFzEhXR5JGZpbrvOcp1hiQKckd305/3C7C36wFekNTQSxAtgeM0j0yoUw==", + "@types/qs": { + "version": "6.9.5", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz", + "integrity": "sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==", "dev": true }, - "@vue/babel-plugin-transform-vue-jsx": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.1.2.tgz", - "integrity": "sha512-YfdaoSMvD1nj7+DsrwfTvTnhDXI7bsuh+Y5qWwvQXlD24uLgnsoww3qbiZvWf/EoviZMrvqkqN4CBw0W3BWUTQ==", - "dev": true, - "requires": { - "@babel/helper-module-imports": "^7.0.0", - "@babel/plugin-syntax-jsx": "^7.2.0", - "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0", - "html-tags": "^2.0.0", - "lodash.kebabcase": "^4.1.1", - "svg-tags": "^1.0.0" - } - }, - "@vue/babel-preset-app": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.3.1.tgz", - "integrity": "sha512-iNkySkbRWXGUA+Cvzj+/gEP0Y0uVAwwzfn21S7hkggSeIg9LJyZ+QzdxgKO0wgi01yTdb2mYWgeLQAfHZ65aew==", - "dev": true, - "requires": { - "@babel/core": "^7.9.0", - "@babel/helper-compilation-targets": "^7.8.7", - "@babel/helper-module-imports": "^7.8.3", - "@babel/plugin-proposal-class-properties": "^7.8.3", - "@babel/plugin-proposal-decorators": "^7.8.3", - "@babel/plugin-syntax-dynamic-import": "^7.8.3", - "@babel/plugin-syntax-jsx": "^7.8.3", - "@babel/plugin-transform-runtime": "^7.9.0", - "@babel/preset-env": "^7.9.0", - "@babel/runtime": "^7.9.2", - "@vue/babel-preset-jsx": "^1.1.2", - "babel-plugin-dynamic-import-node": "^2.3.0", - "core-js": "^3.6.4", - "core-js-compat": "^3.6.4" - } - }, - "@vue/babel-preset-jsx": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.1.2.tgz", - "integrity": "sha512-zDpVnFpeC9YXmvGIDSsKNdL7qCG2rA3gjywLYHPCKDT10erjxF4U+6ay9X6TW5fl4GsDlJp9bVfAVQAAVzxxvQ==", - "dev": true, - "requires": { - "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0", - "@vue/babel-plugin-transform-vue-jsx": "^1.1.2", - "@vue/babel-sugar-functional-vue": "^1.1.2", - "@vue/babel-sugar-inject-h": "^1.1.2", - "@vue/babel-sugar-v-model": "^1.1.2", - "@vue/babel-sugar-v-on": "^1.1.2" - } - }, - "@vue/babel-sugar-functional-vue": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.1.2.tgz", - "integrity": "sha512-YhmdJQSVEFF5ETJXzrMpj0nkCXEa39TvVxJTuVjzvP2rgKhdMmQzlJuMv/HpadhZaRVMCCF3AEjjJcK5q/cYzQ==", - "dev": true, - "requires": { - "@babel/plugin-syntax-jsx": "^7.2.0" - } - }, - "@vue/babel-sugar-inject-h": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.1.2.tgz", - "integrity": "sha512-VRSENdTvD5htpnVp7i7DNuChR5rVMcORdXjvv5HVvpdKHzDZAYiLSD+GhnhxLm3/dMuk8pSzV+k28ECkiN5m8w==", - "dev": true, - "requires": { - "@babel/plugin-syntax-jsx": "^7.2.0" - } - }, - "@vue/babel-sugar-v-model": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.1.2.tgz", - "integrity": "sha512-vLXPvNq8vDtt0u9LqFdpGM9W9IWDmCmCyJXuozlq4F4UYVleXJ2Fa+3JsnTZNJcG+pLjjfnEGHci2339Kj5sGg==", - "dev": true, - "requires": { - "@babel/plugin-syntax-jsx": "^7.2.0", - "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0", - "@vue/babel-plugin-transform-vue-jsx": "^1.1.2", - "camelcase": "^5.0.0", - "html-tags": "^2.0.0", - "svg-tags": "^1.0.0" - } - }, - "@vue/babel-sugar-v-on": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.1.2.tgz", - "integrity": "sha512-T8ZCwC8Jp2uRtcZ88YwZtZXe7eQrJcfRq0uTFy6ShbwYJyz5qWskRFoVsdTi9o0WEhmQXxhQUewodOSCUPVmsQ==", - "dev": true, - "requires": { - "@babel/plugin-syntax-jsx": "^7.2.0", - "@vue/babel-plugin-transform-vue-jsx": "^1.1.2", - "camelcase": "^5.0.0" - } - }, - "@vue/cli-overlay": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.3.1.tgz", - "integrity": "sha512-UA399aWHhre2VHrQFQSJhFLrFMqOYQ8ly+Ni6T+cpCjOwssjiaqaqrG5YiZBAqDwQvjrtYori4lU66qrY5DVhA==", + "@types/range-parser": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz", + "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==", "dev": true }, - "@vue/cli-plugin-babel": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-4.3.1.tgz", - "integrity": "sha512-tBqu0v1l4LfWX8xuJmofpp+8xQzKddFNxdLmeVDOX/omDBQX0qaVDeMUtRxxSTazI06SKr605SnUQoa35qwbvw==", + "@types/serve-static": { + "version": "1.13.5", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz", + "integrity": "sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==", "dev": true, "requires": { - "@babel/core": "^7.9.0", - "@vue/babel-preset-app": "^4.3.1", - "@vue/cli-shared-utils": "^4.3.1", - "babel-loader": "^8.1.0", - "cache-loader": "^4.1.0", - "thread-loader": "^2.1.3", - "webpack": "^4.0.0" + "@types/express-serve-static-core": "4.17.13", + "@types/mime": "2.0.3" } }, - "@vue/cli-plugin-eslint": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.3.1.tgz", - "integrity": "sha512-5UEP93b8C/JQs9Rnuldsu8jMz0XO4wNXG0lL/GdChYBEheKCyXJXzan7qzEbIuvUwG3I+qlUkGsiyNokIgXejg==", + "@types/source-list-map": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", + "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==", + "dev": true + }, + "@types/tapable": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz", + "integrity": "sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==", + "dev": true + }, + "@types/terser-webpack-plugin": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/terser-webpack-plugin/-/terser-webpack-plugin-3.0.0.tgz", + "integrity": "sha512-K5C7izOT8rR4qiE2vfXcQNEJN4lT9cq/2qJgpMUWR2HsjDW/KVrHx2CaHuaXvaqDNsRmdELPLaxeJHiI4GjVrA==", "dev": true, "requires": { - "@vue/cli-shared-utils": "^4.3.1", - "eslint-loader": "^2.2.1", - "globby": "^9.2.0", - "inquirer": "^7.1.0", - "webpack": "^4.0.0", - "yorkie": "^2.0.0" + "@types/webpack": "4.41.17", + "terser": "4.8.0" + } + }, + "@types/uglify-js": { + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.0.tgz", + "integrity": "sha512-I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q==", + "dev": true, + "requires": { + "source-map": "0.6.1" }, "dependencies": { - "ansi-escapes": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", - "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", - "dev": true, - "requires": { - "type-fest": "^0.11.0" - } - }, - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "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 - }, - "inquirer": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz", - "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^3.0.0", - "cli-cursor": "^3.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.15", - "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.5.3", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" - } - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true - }, - "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", - "dev": true - }, - "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" - } - }, - "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "type-fest": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", - "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", - "dev": true - } - } - }, - "@vue/cli-plugin-router": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.3.1.tgz", - "integrity": "sha512-m0ntr5R6q62oNMODgoyHAVAd/sDtsH15GdBrScZsPNeyHxmzmNBDlsNM38yYGGY064zDRRWif15d1yaTREybrA==", - "dev": true, - "requires": { - "@vue/cli-shared-utils": "^4.3.1" - } - }, - "@vue/cli-plugin-vuex": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.3.1.tgz", - "integrity": "sha512-mukwOlhZGBJhkqO2b3wHFFHjK5aP00b1WUHdrOfLR7M18euhaTyb4kA5nwZwEOmU3EzZx6kHzSFCRy/XaMkLug==", - "dev": true - }, - "@vue/cli-service": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.3.1.tgz", - "integrity": "sha512-CsNGfHe+9oKZdRwJmweQ0KsMYM27ssg1eNQqRKL/t+IgDLO3Tu86uaOOCLn4ZAaU5oxxpq4aSFvz+A0YxQRSWw==", - "dev": true, - "requires": { - "@intervolga/optimize-cssnano-plugin": "^1.0.5", - "@soda/friendly-errors-webpack-plugin": "^1.7.1", - "@soda/get-current-script": "^1.0.0", - "@vue/cli-overlay": "^4.3.1", - "@vue/cli-plugin-router": "^4.3.1", - "@vue/cli-plugin-vuex": "^4.3.1", - "@vue/cli-shared-utils": "^4.3.1", - "@vue/component-compiler-utils": "^3.0.2", - "@vue/preload-webpack-plugin": "^1.1.0", - "@vue/web-component-wrapper": "^1.2.0", - "acorn": "^7.1.0", - "acorn-walk": "^7.1.1", - "address": "^1.1.2", - "autoprefixer": "^9.7.5", - "browserslist": "^4.11.1", - "cache-loader": "^4.1.0", - "case-sensitive-paths-webpack-plugin": "^2.3.0", - "cli-highlight": "^2.1.4", - "clipboardy": "^2.3.0", - "cliui": "^6.0.0", - "copy-webpack-plugin": "^5.1.1", - "css-loader": "^3.4.2", - "cssnano": "^4.1.10", - "debug": "^4.1.1", - "default-gateway": "^5.0.5", - "dotenv": "^8.2.0", - "dotenv-expand": "^5.1.0", - "file-loader": "^4.2.0", - "fs-extra": "^7.0.1", - "globby": "^9.2.0", - "hash-sum": "^2.0.0", - "html-webpack-plugin": "^3.2.0", - "launch-editor-middleware": "^2.2.1", - "lodash.defaultsdeep": "^4.6.1", - "lodash.mapvalues": "^4.6.0", - "lodash.transform": "^4.6.0", - "mini-css-extract-plugin": "^0.9.0", - "minimist": "^1.2.5", - "pnp-webpack-plugin": "^1.6.4", - "portfinder": "^1.0.25", - "postcss-loader": "^3.0.0", - "ssri": "^7.1.0", - "terser-webpack-plugin": "^2.3.5", - "thread-loader": "^2.1.3", - "url-loader": "^2.2.0", - "vue-loader": "^15.9.1", - "vue-style-loader": "^4.1.2", - "webpack": "^4.0.0", - "webpack-bundle-analyzer": "^3.6.1", - "webpack-chain": "^6.4.0", - "webpack-dev-server": "^3.10.3", - "webpack-merge": "^4.2.2" - }, - "dependencies": { - "acorn": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz", - "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==", - "dev": true - }, - "cacache": { - "version": "13.0.1", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz", - "integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==", - "dev": true, - "requires": { - "chownr": "^1.1.2", - "figgy-pudding": "^3.5.1", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "graceful-fs": "^4.2.2", - "infer-owner": "^1.0.4", - "lru-cache": "^5.1.1", - "minipass": "^3.0.0", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "p-map": "^3.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^2.7.1", - "ssri": "^7.0.0", - "unique-filename": "^1.1.1" - } - }, - "find-cache-dir": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", - "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", - "dev": true, - "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "requires": { - "semver": "^6.0.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "serialize-javascript": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz", - "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", - "dev": true, - "requires": { - "randombytes": "^2.1.0" - } - }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "ssri": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz", - "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==", + } + } + }, + "@types/webpack": { + "version": "4.41.17", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.17.tgz", + "integrity": "sha512-6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw==", + "dev": true, + "requires": { + "@types/anymatch": "1.3.1", + "@types/node": "10.17.35", + "@types/tapable": "1.0.6", + "@types/uglify-js": "3.11.0", + "@types/webpack-sources": "2.0.0", + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "@types/webpack-bundle-analyzer": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/@types/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz", + "integrity": "sha512-Ah6FbkXLAVUNI/ExXHsTS90iRS/Efplh333NySjhGx09oeH9qXf57NMUfl4RADTL5a89hQaq/nbT4eb0LwsQJw==", + "dev": true, + "requires": { + "@types/webpack": "4.41.17" + } + }, + "@types/webpack-dev-server": { + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz", + "integrity": "sha512-3+86AgSzl18n5P1iUP9/lz3G3GMztCp+wxdDvVuNhx1sr1jE79GpYfKHL8k+Vht3N74K2n98CuAEw4YPJCYtDA==", + "dev": true, + "requires": { + "@types/connect-history-api-fallback": "1.3.3", + "@types/express": "4.17.6", + "@types/http-proxy-middleware": "0.19.3", + "@types/serve-static": "1.13.5", + "@types/webpack": "4.41.17" + } + }, + "@types/webpack-sources": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.0.0.tgz", + "integrity": "sha512-a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==", + "dev": true, + "requires": { + "@types/node": "10.17.35", + "@types/source-list-map": "0.1.2", + "source-map": "0.7.3" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + } + } + }, + "@typescript-eslint/eslint-plugin": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz", + "integrity": "sha512-PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "3.10.1", + "debug": "4.2.0", + "functional-red-black-tree": "1.0.1", + "regexpp": "3.1.0", + "semver": "7.3.2", + "tsutils": "3.17.1" + }, + "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "figgy-pudding": "^3.5.1", - "minipass": "^3.1.1" + "ms": "2.1.2" } }, - "terser-webpack-plugin": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.6.tgz", - "integrity": "sha512-I8IDsQwZrqjdmOicNeE8L/MhwatAap3mUrtcAKJuilsemUNcX+Hier/eAzwStVqhlCxq0aG3ni9bK/0BESXkTg==", + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "@typescript-eslint/experimental-utils": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz", + "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==", + "dev": true, + "requires": { + "@types/json-schema": "7.0.6", + "@typescript-eslint/types": "3.10.1", + "@typescript-eslint/typescript-estree": "3.10.1", + "eslint-scope": "5.1.1", + "eslint-utils": "2.1.0" + }, + "dependencies": { + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "cacache": "^13.0.1", - "find-cache-dir": "^3.3.1", - "jest-worker": "^25.4.0", - "p-limit": "^2.3.0", - "schema-utils": "^2.6.6", - "serialize-javascript": "^3.0.0", - "source-map": "^0.6.1", - "terser": "^4.6.12", - "webpack-sources": "^1.4.3" + "esrecurse": "4.3.0", + "estraverse": "4.3.0" } } } }, - "@vue/cli-shared-utils": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.3.1.tgz", - "integrity": "sha512-lcfRalou7Z9jZgIh9PeTIpwDK7RIjr9OxfLGwbdR8czUZYUeUa67zVEMJD0OPYh/CCoREtzNbVfLPb/IYYxWEA==", + "@typescript-eslint/parser": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.1.tgz", + "integrity": "sha512-Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==", "dev": true, "requires": { - "@hapi/joi": "^15.0.1", - "chalk": "^2.4.2", - "execa": "^1.0.0", - "launch-editor": "^2.2.1", - "lru-cache": "^5.1.1", - "node-ipc": "^9.1.1", - "open": "^6.3.0", - "ora": "^3.4.0", - "read-pkg": "^5.1.1", - "request": "^2.88.2", - "request-promise-native": "^1.0.8", - "semver": "^6.1.0", - "strip-ansi": "^6.0.0" + "@types/eslint-visitor-keys": "1.0.0", + "@typescript-eslint/experimental-utils": "3.10.1", + "@typescript-eslint/types": "3.10.1", + "@typescript-eslint/typescript-estree": "3.10.1", + "eslint-visitor-keys": "1.3.0" + } + }, + "@typescript-eslint/types": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz", + "integrity": "sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz", + "integrity": "sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==", + "dev": true, + "requires": { + "@typescript-eslint/types": "3.10.1", + "@typescript-eslint/visitor-keys": "3.10.1", + "debug": "4.2.0", + "glob": "7.1.6", + "is-glob": "4.0.1", + "lodash": "4.17.20", + "semver": "7.3.2", + "tsutils": "3.17.1" }, "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } } }, + "@typescript-eslint/visitor-keys": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz", + "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==", + "dev": true, + "requires": { + "eslint-visitor-keys": "1.3.0" + } + }, "@vue/component-compiler-utils": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.1.2.tgz", - "integrity": "sha512-QLq9z8m79mCinpaEeSURhnNCN6djxpHw0lpP/bodMlt5kALfONpryMthvnrQOlTcIKoF+VoPi+lPHUYeDFPXug==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.2.0.tgz", + "integrity": "sha512-lejBLa7xAMsfiZfNp7Kv51zOzifnb29FwdnMLa96z26kXErPFioSf9BMcePVIQ6/Gc6/mC0UrPpxAWIHyae0vw==", "dev": true, "requires": { - "consolidate": "^0.15.1", - "hash-sum": "^1.0.2", - "lru-cache": "^4.1.2", - "merge-source-map": "^1.1.0", - "postcss": "^7.0.14", - "postcss-selector-parser": "^6.0.2", - "prettier": "^1.18.2", - "source-map": "~0.6.1", - "vue-template-es2015-compiler": "^1.9.0" + "consolidate": "0.15.1", + "hash-sum": "1.0.2", + "lru-cache": "4.1.5", + "merge-source-map": "1.1.0", + "postcss": "7.0.35", + "postcss-selector-parser": "6.0.4", + "prettier": "1.19.1", + "source-map": "0.6.1", + "vue-template-es2015-compiler": "1.9.1" }, "dependencies": { - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=", - "dev": true - }, "lru-cache": { "version": "4.1.5", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, "source-map": { @@ -1826,27 +1853,14 @@ } } }, - "@vue/eslint-config-prettier": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz", - "integrity": "sha512-wFQmv45c3ige5EA+ngijq40YpVcIkAy0Lihupnsnd1Dao5CBbPyfCzqtejFLZX1EwH/kCJdpz3t6s+5wd3+KxQ==", - "dev": true, + "@vue/composition-api": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-0.6.7.tgz", + "integrity": "sha512-WAWEQK4urEsMNe3OyOp7VnMmegRZT2yRB3fDGLRXPMdfuo4+nM+uMEhUgDiUg9LFSXfLWhjwuFOJ2hnS2X7AUw==", "requires": { - "eslint-config-prettier": "^6.0.0" + "tslib": "2.0.1" } }, - "@vue/preload-webpack-plugin": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.1.tgz", - "integrity": "sha512-8VCoJeeH8tCkzhkpfOkt+abALQkS11OIHhte5MBzYaKMTqK0A3ZAKEUVAffsOklhEv7t0yrQt696Opnu9oAx+w==", - "dev": true - }, - "@vue/web-component-wrapper": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.2.0.tgz", - "integrity": "sha512-Xn/+vdm9CjuC9p3Ae+lTClNutrVhsXpzxvoTXXtoys6kVRX9FkueSUAqSWAyZntmVLlR4DosBV4pH8y5Z/HbUw==", - "dev": true - }, "@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", @@ -1924,7 +1938,7 @@ "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==", "dev": true, "requires": { - "@xtuc/ieee754": "^1.2.0" + "@xtuc/ieee754": "1.2.0" } }, "@webassemblyjs/leb128": { @@ -2034,13 +2048,19 @@ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "dev": true + }, "accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", "dev": true, "requires": { - "mime-types": "~2.1.24", + "mime-types": "2.1.27", "negotiator": "0.6.2" } }, @@ -2051,43 +2071,37 @@ "dev": true }, "acorn-jsx": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz", - "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", + "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", "dev": true }, "acorn-walk": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz", - "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==", - "dev": true - }, - "address": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz", - "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", "dev": true }, "aggregate-error": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", - "integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" + "clean-stack": "2.2.0", + "indent-string": "4.0.0" } }, "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "version": "6.12.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", + "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "fast-deep-equal": "3.1.3", + "fast-json-stable-stringify": "2.1.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.4.0" } }, "ajv-errors": { @@ -2097,9 +2111,9 @@ "dev": true }, "ajv-keywords": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz", - "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==", + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", "dev": true }, "alphanum-sort": { @@ -2108,6 +2122,12 @@ "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", "dev": true }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true + }, "ansi-colors": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", @@ -2115,10 +2135,21 @@ "dev": true }, "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "dev": true, + "requires": { + "type-fest": "0.11.0" + }, + "dependencies": { + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==", + "dev": true + } + } }, "ansi-html": { "version": "0.0.7", @@ -2127,9 +2158,9 @@ "dev": true }, "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, "ansi-styles": { @@ -2138,23 +2169,17 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.3" } }, - "any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=", - "dev": true - }, "anymatch": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", "dev": true, "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" + "normalize-path": "3.0.0", + "picomatch": "2.2.2" } }, "aproba": { @@ -2163,11 +2188,82 @@ "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true }, - "arch": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.2.tgz", - "integrity": "sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ==", - "dev": true + "archiver": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.0.0.tgz", + "integrity": "sha512-AEWhJz6Yi6hWtN1Sqy/H4sZo/lLMJ/NftXxGaDy/TnOMmmjsRaZc/Ts+U4BsPoBQkuunTN6t8hk7iU9A+HBxLw==", + "dev": true, + "requires": { + "archiver-utils": "2.1.0", + "async": "3.2.0", + "buffer-crc32": "0.2.13", + "readable-stream": "3.6.0", + "readdir-glob": "1.1.0", + "tar-stream": "2.1.4", + "zip-stream": "4.0.2" + } + }, + "archiver-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz", + "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", + "dev": true, + "requires": { + "glob": "7.1.6", + "graceful-fs": "4.2.4", + "lazystream": "1.0.0", + "lodash.defaults": "4.2.0", + "lodash.difference": "4.5.0", + "lodash.flatten": "4.4.0", + "lodash.isplainobject": "4.0.6", + "lodash.union": "4.6.0", + "normalize-path": "3.0.0", + "readable-stream": "2.3.7" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } + } + }, + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "dev": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.7" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } + } }, "argparse": { "version": "1.0.10", @@ -2175,7 +2271,15 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "~1.0.2" + "sprintf-js": "1.0.3" + }, + "dependencies": { + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + } } }, "arr-diff": { @@ -2196,6 +2300,12 @@ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", "dev": true }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", + "dev": true + }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -2203,13 +2313,10 @@ "dev": true }, "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true }, "array-uniq": { "version": "1.0.3", @@ -2229,7 +2336,7 @@ "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "dev": true, "requires": { - "safer-buffer": "~2.1.0" + "safer-buffer": "2.1.2" } }, "asn1.js": { @@ -2238,10 +2345,10 @@ "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", "dev": true, "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" + "bn.js": "4.11.9", + "inherits": "2.0.4", + "minimalistic-assert": "1.0.1", + "safer-buffer": "2.1.2" }, "dependencies": { "bn.js": { @@ -2258,7 +2365,7 @@ "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", "dev": true, "requires": { - "object-assign": "^4.1.1", + "object-assign": "4.1.1", "util": "0.10.3" }, "dependencies": { @@ -2292,19 +2399,16 @@ "dev": true }, "astral-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", - "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true }, "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "dev": true, - "requires": { - "lodash": "^4.17.14" - } + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", + "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==", + "dev": true }, "async-each": { "version": "1.0.3", @@ -2312,6 +2416,12 @@ "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", "dev": true }, + "async-foreach": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", + "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=", + "dev": true + }, "async-limiter": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", @@ -2324,6 +2434,12 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", "dev": true }, + "at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true + }, "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", @@ -2331,18 +2447,18 @@ "dev": true }, "autoprefixer": { - "version": "9.8.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz", - "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==", + "version": "9.8.6", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz", + "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==", "dev": true, "requires": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001061", - "chalk": "^2.4.2", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.30", - "postcss-value-parser": "^4.1.0" + "browserslist": "4.14.5", + "caniuse-lite": "1.0.30001142", + "colorette": "1.2.1", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "7.0.35", + "postcss-value-parser": "4.1.0" } }, "aws-sign2": { @@ -2352,44 +2468,18 @@ "dev": true }, "aws4": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz", - "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", + "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", "dev": true }, "axios": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", - "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", - "dev": true, + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz", + "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==", "requires": { - "follow-redirects": "1.5.10" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "dev": true, - "requires": { - "debug": "=3.1.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } + "follow-redirects": "1.5.10", + "is-buffer": "2.0.4" } }, "babel-eslint": { @@ -2398,12 +2488,12 @@ "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0", - "eslint-visitor-keys": "^1.0.0", - "resolve": "^1.12.0" + "@babel/code-frame": "7.10.4", + "@babel/parser": "7.11.5", + "@babel/traverse": "7.11.5", + "@babel/types": "7.11.5", + "eslint-visitor-keys": "1.3.0", + "resolve": "1.17.0" } }, "babel-loader": { @@ -2412,22 +2502,11 @@ "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==", "dev": true, "requires": { - "find-cache-dir": "^2.1.0", - "loader-utils": "^1.4.0", - "mkdirp": "^0.5.3", - "pify": "^4.0.1", - "schema-utils": "^2.6.5" - }, - "dependencies": { - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - } + "find-cache-dir": "2.1.0", + "loader-utils": "1.4.0", + "mkdirp": "0.5.5", + "pify": "4.0.1", + "schema-utils": "2.7.1" } }, "babel-plugin-dynamic-import-node": { @@ -2436,7 +2515,20 @@ "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", "dev": true, "requires": { - "object.assign": "^4.1.0" + "object.assign": "4.1.1" + } + }, + "babel-plugin-module-resolver": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.0.0.tgz", + "integrity": "sha512-3pdEq3PXALilSJ6dnC4wMWr0AZixHRM4utpdpBR9g5QG7B7JwWyukQv7a9hVxkbGFl+nQbrHDqqQOIBtTXTP/Q==", + "dev": true, + "requires": { + "find-babel-config": "1.2.0", + "glob": "7.1.6", + "pkg-up": "3.1.0", + "reselect": "4.0.0", + "resolve": "1.17.0" } }, "balanced-match": { @@ -2451,13 +2543,13 @@ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.3.0", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.2", + "pascalcase": "0.1.1" }, "dependencies": { "define-property": { @@ -2466,7 +2558,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -2475,7 +2567,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-data-descriptor": { @@ -2484,7 +2576,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-descriptor": { @@ -2493,9 +2585,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.3" } } } @@ -2518,7 +2610,7 @@ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, "requires": { - "tweetnacl": "^0.14.3" + "tweetnacl": "0.14.5" } }, "bfj": { @@ -2527,10 +2619,10 @@ "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==", "dev": true, "requires": { - "bluebird": "^3.5.5", - "check-types": "^8.0.3", - "hoopy": "^0.1.4", - "tryer": "^1.0.1" + "bluebird": "3.7.2", + "check-types": "8.0.3", + "hoopy": "0.1.4", + "tryer": "1.0.1" } }, "big.js": { @@ -2540,19 +2632,29 @@ "dev": true }, "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", + "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==", "dev": true }, - "bindings": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "bl": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz", + "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==", "dev": true, - "optional": true, "requires": { - "file-uri-to-path": "1.0.0" + "buffer": "5.6.0", + "inherits": "2.0.4", + "readable-stream": "3.6.0" + } + }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "dev": true, + "requires": { + "inherits": "2.0.4" } }, "bluebird": { @@ -2574,15 +2676,15 @@ "dev": true, "requires": { "bytes": "3.1.0", - "content-type": "~1.0.4", + "content-type": "1.0.4", "debug": "2.6.9", - "depd": "~1.1.2", + "depd": "1.1.2", "http-errors": "1.7.2", "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", + "on-finished": "2.3.0", "qs": "6.7.0", "raw-body": "2.4.0", - "type-is": "~1.6.17" + "type-is": "1.6.18" }, "dependencies": { "debug": { @@ -2593,18 +2695,6 @@ "requires": { "ms": "2.0.0" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "dev": true } } }, @@ -2614,12 +2704,12 @@ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { - "array-flatten": "^2.1.0", - "deep-equal": "^1.0.1", - "dns-equal": "^1.0.0", - "dns-txt": "^2.0.2", - "multicast-dns": "^6.0.1", - "multicast-dns-service-types": "^1.1.0" + "array-flatten": "2.1.2", + "deep-equal": "1.1.1", + "dns-equal": "1.0.0", + "dns-txt": "2.0.2", + "multicast-dns": "6.2.3", + "multicast-dns-service-types": "1.1.0" }, "dependencies": { "array-flatten": { @@ -2636,43 +2726,29 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", "dev": true }, + "boolean": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", + "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==", + "dev": true + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } + "fill-range": "7.0.1" } }, "brorand": { @@ -2687,12 +2763,12 @@ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "buffer-xor": "1.0.3", + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "inherits": "2.0.4", + "safe-buffer": "5.1.2" } }, "browserify-cipher": { @@ -2701,9 +2777,9 @@ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", "dev": true, "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" + "browserify-aes": "1.2.0", + "browserify-des": "1.0.2", + "evp_bytestokey": "1.0.3" } }, "browserify-des": { @@ -2712,10 +2788,10 @@ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", "dev": true, "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" + "cipher-base": "1.0.4", + "des.js": "1.0.1", + "inherits": "2.0.4", + "safe-buffer": "5.1.2" } }, "browserify-rsa": { @@ -2724,8 +2800,8 @@ "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" + "bn.js": "4.11.9", + "randombytes": "2.1.0" }, "dependencies": { "bn.js": { @@ -2742,28 +2818,17 @@ "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "dev": true, "requires": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", - "create-hash": "^1.2.0", - "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", - "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "bn.js": "5.1.3", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "elliptic": "6.5.3", + "inherits": "2.0.4", + "parse-asn1": "5.1.6", + "readable-stream": "3.6.0", + "safe-buffer": "5.2.1" }, "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -2778,32 +2843,59 @@ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, "requires": { - "pako": "~1.0.5" + "pako": "1.0.11" } }, "browserslist": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz", - "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==", + "version": "4.14.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz", + "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001043", - "electron-to-chromium": "^1.3.413", - "node-releases": "^1.1.53", - "pkg-up": "^2.0.0" + "caniuse-lite": "1.0.30001142", + "electron-to-chromium": "1.3.576", + "escalade": "3.1.0", + "node-releases": "1.1.61" } }, "buffer": { - "version": "4.9.2", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", - "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", + "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", "dev": true, "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" + "base64-js": "1.3.1", + "ieee754": "1.1.13" } }, + "buffer-alloc": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", + "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", + "dev": true, + "requires": { + "buffer-alloc-unsafe": "1.1.0", + "buffer-fill": "1.0.0" + } + }, + "buffer-alloc-unsafe": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", + "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", + "dev": true + }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", + "dev": true + }, + "buffer-fill": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", + "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", + "dev": true + }, "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", @@ -2816,12 +2908,6 @@ "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", "dev": true }, - "buffer-json": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/buffer-json/-/buffer-json-2.0.0.tgz", - "integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==", - "dev": true - }, "buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", @@ -2841,26 +2927,36 @@ "dev": true }, "cacache": { - "version": "12.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", - "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", + "version": "15.0.5", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz", + "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==", "dev": true, "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" + "@npmcli/move-file": "1.0.1", + "chownr": "2.0.0", + "fs-minipass": "2.1.0", + "glob": "7.1.6", + "infer-owner": "1.0.4", + "lru-cache": "6.0.0", + "minipass": "3.1.3", + "minipass-collect": "1.0.2", + "minipass-flush": "1.0.5", + "minipass-pipeline": "1.2.4", + "mkdirp": "1.0.4", + "p-map": "4.0.0", + "promise-inflight": "1.0.1", + "rimraf": "3.0.2", + "ssri": "8.0.0", + "tar": "6.0.5", + "unique-filename": "1.1.1" + }, + "dependencies": { + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + } } }, "cache-base": { @@ -2869,130 +2965,56 @@ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" + "collection-visit": "1.0.0", + "component-emitter": "1.3.0", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.1", + "to-object-path": "0.3.0", + "union-value": "1.0.1", + "unset-value": "1.0.0" } }, - "cache-loader": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cache-loader/-/cache-loader-4.1.0.tgz", - "integrity": "sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw==", + "cacheable-request": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", + "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", "dev": true, "requires": { - "buffer-json": "^2.0.0", - "find-cache-dir": "^3.0.0", - "loader-utils": "^1.2.3", - "mkdirp": "^0.5.1", - "neo-async": "^2.6.1", - "schema-utils": "^2.0.0" + "clone-response": "1.0.2", + "get-stream": "5.2.0", + "http-cache-semantics": "4.1.0", + "keyv": "3.1.0", + "lowercase-keys": "2.0.0", + "normalize-url": "4.5.0", + "responselike": "1.0.2" }, "dependencies": { - "find-cache-dir": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", - "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" + "pump": "3.0.0" } }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, - "requires": { - "semver": "^6.0.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "requires": { - "find-up": "^4.0.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", "dev": true } } }, - "call-me-maybe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz", - "integrity": "sha1-JtII6onje1y95gJQoV8DHBak1ms=", - "dev": true - }, "caller-callsite": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", "dev": true, "requires": { - "callsites": "^2.0.0" + "callsites": "2.0.0" } }, "caller-path": { @@ -3001,7 +3023,7 @@ "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", "dev": true, "requires": { - "caller-callsite": "^2.0.0" + "caller-callsite": "2.0.0" } }, "callsites": { @@ -3016,8 +3038,8 @@ "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", "dev": true, "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" + "no-case": "2.3.2", + "upper-case": "1.1.3" } }, "camelcase": { @@ -3026,28 +3048,40 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "dev": true, + "requires": { + "camelcase": "2.1.1", + "map-obj": "1.0.1" + }, + "dependencies": { + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", + "dev": true + } + } + }, "caniuse-api": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", "dev": true, "requires": { - "browserslist": "^4.0.0", - "caniuse-lite": "^1.0.0", - "lodash.memoize": "^4.1.2", - "lodash.uniq": "^4.5.0" + "browserslist": "4.14.5", + "caniuse-lite": "1.0.30001142", + "lodash.memoize": "4.1.2", + "lodash.uniq": "4.5.0" } }, "caniuse-lite": { - "version": "1.0.30001066", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz", - "integrity": "sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw==", - "dev": true - }, - "case-sensitive-paths-webpack-plugin": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz", - "integrity": "sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ==", + "version": "1.0.30001142", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001142.tgz", + "integrity": "sha512-pDPpn9ankEpBFZXyCv2I4lh1v/ju+bqb78QfKf+w9XgDAFWBwSYPswXqprRdrgQWK0wQnpIbfwRjNHO1HWqvoQ==", "dev": true }, "caseless": { @@ -3057,14 +3091,55 @@ "dev": true }, "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "4.2.1", + "supports-color": "7.2.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "1.1.1", + "color-convert": "2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "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" + } + } } }, "chardet": { @@ -3080,60 +3155,25 @@ "dev": true }, "chokidar": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", - "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", + "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", "dev": true, "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" - }, - "dependencies": { - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - } + "anymatch": "3.1.1", + "braces": "3.0.2", + "fsevents": "2.1.3", + "glob-parent": "5.1.1", + "is-binary-path": "2.1.0", + "is-glob": "4.0.1", + "normalize-path": "3.0.0", + "readdirp": "3.4.0" } }, "chownr": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", - "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", "dev": true }, "chrome-trace-event": { @@ -3142,13 +3182,21 @@ "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.13.0" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + } } }, "ci-info": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", - "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", "dev": true }, "cipher-base": { @@ -3157,8 +3205,8 @@ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.4", + "safe-buffer": "5.1.2" } }, "class-utils": { @@ -3167,10 +3215,10 @@ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" }, "dependencies": { "define-property": { @@ -3179,7 +3227,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -3190,7 +3238,7 @@ "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", "dev": true, "requires": { - "source-map": "~0.6.0" + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -3208,159 +3256,94 @@ "dev": true }, "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, "requires": { - "restore-cursor": "^2.0.0" + "restore-cursor": "3.1.0" } }, - "cli-highlight": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.4.tgz", - "integrity": "sha512-s7Zofobm20qriqDoU9sXptQx0t2R9PEgac92mENNm7xaEe1hn71IIMsXMK+6encA6WRCWWxIGQbipr3q998tlQ==", - "dev": true, - "requires": { - "chalk": "^3.0.0", - "highlight.js": "^9.6.0", - "mz": "^2.4.0", - "parse5": "^5.1.1", - "parse5-htmlparser2-tree-adapter": "^5.1.1", - "yargs": "^15.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", - "dev": true, - "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "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.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "cli-spinners": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz", - "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==", - "dev": true - }, "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", "dev": true }, - "clipboardy": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz", - "integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==", - "dev": true, - "requires": { - "arch": "^2.1.1", - "execa": "^1.0.0", - "is-wsl": "^2.1.1" - }, - "dependencies": { - "is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "requires": { - "is-docker": "^2.0.0" - } - } - } - }, "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "dev": true, "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" + "string-width": "3.1.0", + "strip-ansi": "5.2.0", + "wrap-ansi": "5.1.0" }, "dependencies": { - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true }, "string-width": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", - "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "emoji-regex": "7.0.3", + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "5.2.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "4.1.0" + } + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "string-width": "3.1.0", + "strip-ansi": "5.2.0" } } } }, - "clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "dev": true - }, "clone-deep": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, "requires": { - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.2", - "shallow-clone": "^3.0.0" + "is-plain-object": "2.0.4", + "kind-of": "6.0.3", + "shallow-clone": "3.0.1" + } + }, + "clone-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", + "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", + "dev": true, + "requires": { + "mimic-response": "1.0.1" } }, "coa": { @@ -3369,19 +3352,38 @@ "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==", "dev": true, "requires": { - "@types/q": "^1.5.1", - "chalk": "^2.4.1", - "q": "^1.1.2" + "@types/q": "1.5.4", + "chalk": "2.4.2", + "q": "1.5.1" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + } } }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true + }, "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" + "map-visit": "1.0.0", + "object-visit": "1.0.1" } }, "color": { @@ -3390,8 +3392,8 @@ "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==", "dev": true, "requires": { - "color-convert": "^1.9.1", - "color-string": "^1.5.2" + "color-convert": "1.9.3", + "color-string": "1.5.3" } }, "color-convert": { @@ -3415,17 +3417,29 @@ "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", "dev": true, "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" + "color-name": "1.1.3", + "simple-swizzle": "0.2.2" } }, + "colorette": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz", + "integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==", + "dev": true + }, + "colors": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", + "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=", + "dev": true + }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, "requires": { - "delayed-stream": "~1.0.0" + "delayed-stream": "1.0.0" } }, "commander": { @@ -3440,19 +3454,37 @@ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, + "compare-version": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", + "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=", + "dev": true + }, "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", "dev": true }, + "compress-commons": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.0.1.tgz", + "integrity": "sha512-xZm9o6iikekkI0GnXCmAl3LQGZj5TBDj0zLowsqi7tJtEa3FMGSEcHcqrSJIrOAk1UG/NBbDn/F1q+MG/p/EsA==", + "dev": true, + "requires": { + "buffer-crc32": "0.2.13", + "crc32-stream": "4.0.0", + "normalize-path": "3.0.0", + "readable-stream": "3.6.0" + } + }, "compressible": { "version": "2.0.18", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, "requires": { - "mime-db": ">= 1.43.0 < 2" + "mime-db": "1.44.0" } }, "compression": { @@ -3461,13 +3493,13 @@ "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, "requires": { - "accepts": "~1.3.5", + "accepts": "1.3.7", "bytes": "3.0.0", - "compressible": "~2.0.16", + "compressible": "2.0.18", "debug": "2.6.9", - "on-headers": "~1.0.2", + "on-headers": "1.0.2", "safe-buffer": "5.1.2", - "vary": "~1.1.2" + "vary": "1.1.2" }, "dependencies": { "bytes": { @@ -3484,11 +3516,89 @@ "requires": { "ms": "2.0.0" } + } + } + }, + "compression-webpack-plugin": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-5.0.1.tgz", + "integrity": "sha512-Wcb99O4UkdDZiM+blEw6h+cUfJYCn2kgK0l3fjLOm72Stso9DVMieQpBD4PVpyI7DLL6+zNh0iJV3p4HDwTinQ==", + "dev": true, + "requires": { + "cacache": "15.0.5", + "find-cache-dir": "3.3.1", + "schema-utils": "2.7.1", + "serialize-javascript": "4.0.0", + "webpack-sources": "1.4.3" + }, + "dependencies": { + "find-cache-dir": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "dev": true, + "requires": { + "commondir": "1.0.1", + "make-dir": "3.1.0", + "pkg-dir": "4.2.0" + } }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "5.0.0", + "path-exists": "4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "4.1.0" + } + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "6.3.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "2.3.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "4.1.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true } } @@ -3505,10 +3615,38 @@ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" + "buffer-from": "1.1.1", + "inherits": "2.0.4", + "readable-stream": "2.3.7", + "typedarray": "0.0.6" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } + } + }, + "config-chain": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz", + "integrity": "sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==", + "dev": true, + "optional": true, + "requires": { + "ini": "1.3.5", + "proto-list": "1.2.4" } }, "connect-history-api-fallback": { @@ -3523,13 +3661,19 @@ "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", "dev": true }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "dev": true + }, "consolidate": { "version": "0.15.1", "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz", "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==", "dev": true, "requires": { - "bluebird": "^3.1.1" + "bluebird": "3.7.2" } }, "constants-browserify": { @@ -3559,7 +3703,7 @@ "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", "dev": true, "requires": { - "safe-buffer": "~5.1.1" + "safe-buffer": "5.1.2" } }, "cookie": { @@ -3580,12 +3724,23 @@ "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", "dev": true, "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" + "aproba": "1.2.0", + "fs-write-stream-atomic": "1.0.10", + "iferr": "0.1.5", + "mkdirp": "0.5.5", + "rimraf": "2.7.1", + "run-queue": "1.0.3" + }, + "dependencies": { + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "7.1.6" + } + } } }, "copy-descriptor": { @@ -3595,102 +3750,122 @@ "dev": true }, "copy-webpack-plugin": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz", - "integrity": "sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz", + "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==", "dev": true, "requires": { - "cacache": "^12.0.3", - "find-cache-dir": "^2.1.0", - "glob-parent": "^3.1.0", - "globby": "^7.1.1", - "is-glob": "^4.0.1", - "loader-utils": "^1.2.3", - "minimatch": "^3.0.4", - "normalize-path": "^3.0.0", - "p-limit": "^2.2.1", - "schema-utils": "^1.0.0", - "serialize-javascript": "^2.1.2", - "webpack-log": "^2.0.0" + "cacache": "15.0.5", + "fast-glob": "3.2.4", + "find-cache-dir": "3.3.1", + "glob-parent": "5.1.1", + "globby": "11.0.1", + "loader-utils": "2.0.0", + "normalize-path": "3.0.0", + "p-limit": "3.0.2", + "schema-utils": "2.7.1", + "serialize-javascript": "4.0.0", + "webpack-sources": "1.4.3" }, "dependencies": { - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "find-cache-dir": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "dev": true, "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" + "commondir": "1.0.1", + "make-dir": "3.1.0", + "pkg-dir": "4.2.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "5.0.0", + "path-exists": "4.0.0" + } + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "5.2.2", + "emojis-list": "3.0.0", + "json5": "2.1.3" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "4.1.0" + } + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "6.3.0" + } + }, + "p-limit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz", + "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==", + "dev": true, + "requires": { + "p-try": "2.2.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "2.3.0" }, "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "is-extglob": "^2.1.0" + "p-try": "2.2.0" } } } }, - "globby": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", - "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "dir-glob": "^2.0.0", - "glob": "^7.1.2", - "ignore": "^3.3.5", - "pify": "^3.0.0", - "slash": "^1.0.0" - } - }, - "ignore": { - "version": "3.3.10", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", - "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "p-try": "^2.0.0" + "find-up": "4.1.0" } }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" - } - }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true } } @@ -3706,7 +3881,7 @@ "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==", "dev": true, "requires": { - "browserslist": "^4.8.5", + "browserslist": "4.14.5", "semver": "7.0.0" }, "dependencies": { @@ -3730,22 +3905,29 @@ "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", "dev": true, "requires": { - "import-fresh": "^2.0.0", - "is-directory": "^0.3.1", - "js-yaml": "^3.13.1", - "parse-json": "^4.0.0" - }, - "dependencies": { - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", - "dev": true, - "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" - } - } + "import-fresh": "2.0.0", + "is-directory": "0.3.1", + "js-yaml": "3.14.0", + "parse-json": "4.0.0" + } + }, + "crc": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", + "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", + "dev": true, + "requires": { + "buffer": "5.6.0" + } + }, + "crc32-stream": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.0.tgz", + "integrity": "sha512-tyMw2IeUX6t9jhgXI6um0eKfWq4EIDpfv5m7GX4Jzp7eVelQ360xd8EPXJhp2mHwLQIkqlnMLjzqSZI3a+0wRw==", + "dev": true, + "requires": { + "crc": "3.8.0", + "readable-stream": "3.6.0" } }, "create-ecdh": { @@ -3754,8 +3936,8 @@ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.5.3" + "bn.js": "4.11.9", + "elliptic": "6.5.3" }, "dependencies": { "bn.js": { @@ -3772,11 +3954,11 @@ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" + "cipher-base": "1.0.4", + "inherits": "2.0.4", + "md5.js": "1.3.5", + "ripemd160": "2.0.2", + "sha.js": "2.4.11" } }, "create-hmac": { @@ -3785,25 +3967,23 @@ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "inherits": "2.0.4", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" } }, "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "path-key": "3.1.1", + "shebang-command": "2.0.0", + "which": "2.0.2" } }, "crypto-browserify": { @@ -3812,17 +3992,37 @@ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "dev": true, "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" + "browserify-cipher": "1.0.1", + "browserify-sign": "4.2.1", + "create-ecdh": "4.0.4", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "diffie-hellman": "5.0.3", + "inherits": "2.0.4", + "pbkdf2": "3.1.1", + "public-encrypt": "4.0.3", + "randombytes": "2.1.0", + "randomfill": "1.0.4" + } + }, + "css": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz", + "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", + "dev": true, + "requires": { + "inherits": "2.0.4", + "source-map": "0.6.1", + "source-map-resolve": "0.5.3", + "urix": "0.1.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "css-color-names": { @@ -3837,29 +4037,29 @@ "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==", "dev": true, "requires": { - "postcss": "^7.0.1", - "timsort": "^0.3.0" + "postcss": "7.0.35", + "timsort": "0.3.0" } }, "css-loader": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz", - "integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.6.0.tgz", + "integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==", "dev": true, "requires": { - "camelcase": "^5.3.1", - "cssesc": "^3.0.0", - "icss-utils": "^4.1.1", - "loader-utils": "^1.2.3", - "normalize-path": "^3.0.0", - "postcss": "^7.0.27", - "postcss-modules-extract-imports": "^2.0.0", - "postcss-modules-local-by-default": "^3.0.2", - "postcss-modules-scope": "^2.2.0", - "postcss-modules-values": "^3.0.0", - "postcss-value-parser": "^4.0.3", - "schema-utils": "^2.6.6", - "semver": "^6.3.0" + "camelcase": "5.3.1", + "cssesc": "3.0.0", + "icss-utils": "4.1.1", + "loader-utils": "1.4.0", + "normalize-path": "3.0.0", + "postcss": "7.0.35", + "postcss-modules-extract-imports": "2.0.0", + "postcss-modules-local-by-default": "3.0.3", + "postcss-modules-scope": "2.2.0", + "postcss-modules-values": "3.0.0", + "postcss-value-parser": "4.1.0", + "schema-utils": "2.7.1", + "semver": "6.3.0" }, "dependencies": { "semver": { @@ -3870,16 +4070,25 @@ } } }, + "css-parse": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz", + "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=", + "dev": true, + "requires": { + "css": "2.2.4" + } + }, "css-select": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", "dev": true, "requires": { - "boolbase": "^1.0.0", - "css-what": "^3.2.1", - "domutils": "^1.7.0", - "nth-check": "^1.0.2" + "boolbase": "1.0.0", + "css-what": "3.4.1", + "domutils": "1.7.0", + "nth-check": "1.0.2" } }, "css-select-base-adapter": { @@ -3895,7 +4104,7 @@ "dev": true, "requires": { "mdn-data": "2.0.4", - "source-map": "^0.6.1" + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -3907,9 +4116,9 @@ } }, "css-what": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz", - "integrity": "sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz", + "integrity": "sha512-wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g==", "dev": true }, "cssesc": { @@ -3924,10 +4133,10 @@ "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==", "dev": true, "requires": { - "cosmiconfig": "^5.0.0", - "cssnano-preset-default": "^4.0.7", - "is-resolvable": "^1.0.0", - "postcss": "^7.0.0" + "cosmiconfig": "5.2.1", + "cssnano-preset-default": "4.0.7", + "is-resolvable": "1.1.0", + "postcss": "7.0.35" } }, "cssnano-preset-default": { @@ -3936,36 +4145,36 @@ "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==", "dev": true, "requires": { - "css-declaration-sorter": "^4.0.1", - "cssnano-util-raw-cache": "^4.0.1", - "postcss": "^7.0.0", - "postcss-calc": "^7.0.1", - "postcss-colormin": "^4.0.3", - "postcss-convert-values": "^4.0.1", - "postcss-discard-comments": "^4.0.2", - "postcss-discard-duplicates": "^4.0.2", - "postcss-discard-empty": "^4.0.1", - "postcss-discard-overridden": "^4.0.1", - "postcss-merge-longhand": "^4.0.11", - "postcss-merge-rules": "^4.0.3", - "postcss-minify-font-values": "^4.0.2", - "postcss-minify-gradients": "^4.0.2", - "postcss-minify-params": "^4.0.2", - "postcss-minify-selectors": "^4.0.2", - "postcss-normalize-charset": "^4.0.1", - "postcss-normalize-display-values": "^4.0.2", - "postcss-normalize-positions": "^4.0.2", - "postcss-normalize-repeat-style": "^4.0.2", - "postcss-normalize-string": "^4.0.2", - "postcss-normalize-timing-functions": "^4.0.2", - "postcss-normalize-unicode": "^4.0.1", - "postcss-normalize-url": "^4.0.1", - "postcss-normalize-whitespace": "^4.0.2", - "postcss-ordered-values": "^4.1.2", - "postcss-reduce-initial": "^4.0.3", - "postcss-reduce-transforms": "^4.0.2", - "postcss-svgo": "^4.0.2", - "postcss-unique-selectors": "^4.0.1" + "css-declaration-sorter": "4.0.1", + "cssnano-util-raw-cache": "4.0.1", + "postcss": "7.0.35", + "postcss-calc": "7.0.4", + "postcss-colormin": "4.0.3", + "postcss-convert-values": "4.0.1", + "postcss-discard-comments": "4.0.2", + "postcss-discard-duplicates": "4.0.2", + "postcss-discard-empty": "4.0.1", + "postcss-discard-overridden": "4.0.1", + "postcss-merge-longhand": "4.0.11", + "postcss-merge-rules": "4.0.3", + "postcss-minify-font-values": "4.0.2", + "postcss-minify-gradients": "4.0.2", + "postcss-minify-params": "4.0.2", + "postcss-minify-selectors": "4.0.2", + "postcss-normalize-charset": "4.0.1", + "postcss-normalize-display-values": "4.0.2", + "postcss-normalize-positions": "4.0.2", + "postcss-normalize-repeat-style": "4.0.2", + "postcss-normalize-string": "4.0.2", + "postcss-normalize-timing-functions": "4.0.2", + "postcss-normalize-unicode": "4.0.1", + "postcss-normalize-url": "4.0.1", + "postcss-normalize-whitespace": "4.0.2", + "postcss-ordered-values": "4.1.2", + "postcss-reduce-initial": "4.0.3", + "postcss-reduce-transforms": "4.0.2", + "postcss-svgo": "4.0.2", + "postcss-unique-selectors": "4.0.1" } }, "cssnano-util-get-arguments": { @@ -3986,7 +4195,7 @@ "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==", "dev": true, "requires": { - "postcss": "^7.0.0" + "postcss": "7.0.35" } }, "cssnano-util-same-parent": { @@ -4011,7 +4220,7 @@ "dev": true, "requires": { "mdn-data": "2.0.6", - "source-map": "^0.6.1" + "source-map": "0.6.1" } }, "mdn-data": { @@ -4028,6 +4237,15 @@ } } }, + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "dev": true, + "requires": { + "array-find-index": "1.0.2" + } + }, "cyclist": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", @@ -4040,7 +4258,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "de-indent": { @@ -4050,12 +4268,11 @@ "dev": true }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "requires": { - "ms": "^2.1.1" + "ms": "2.0.0" } }, "decamelize": { @@ -4070,18 +4287,27 @@ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, + "decompress-response": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "dev": true, + "requires": { + "mimic-response": "1.0.1" + } + }, "deep-equal": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", "dev": true, "requires": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", - "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" + "is-arguments": "1.0.4", + "is-date-object": "1.0.2", + "is-regex": "1.1.1", + "object-is": "1.1.3", + "object-keys": "1.1.1", + "regexp.prototype.flags": "1.3.0" } }, "deep-is": { @@ -4097,128 +4323,20 @@ "dev": true }, "default-gateway": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.5.tgz", - "integrity": "sha512-z2RnruVmj8hVMmAnEJMTIJNijhKCDiGjbLP+BHJFOT7ld3Bo5qcIBpVYDniqhbMIIf+jZDlkP2MkPXiQy/DBLA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", + "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", "dev": true, "requires": { - "execa": "^3.3.0" - }, - "dependencies": { - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "execa": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz", - "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.0", - "onetime": "^5.1.0", - "p-finally": "^2.0.0", - "signal-exit": "^3.0.2", - "strip-final-newline": "^2.0.0" - } - }, - "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", - "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", - "dev": true - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "onetime": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", - "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "p-finally": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", - "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } + "execa": "1.0.0", + "ip-regex": "2.1.0" } }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "dev": true, - "requires": { - "clone": "^1.0.2" - } + "defer-to-connect": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", + "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", + "dev": true }, "define-properties": { "version": "1.1.3", @@ -4226,7 +4344,7 @@ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "dev": true, "requires": { - "object-keys": "^1.0.12" + "object-keys": "1.1.1" } }, "define-property": { @@ -4235,8 +4353,8 @@ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" + "is-descriptor": "1.0.2", + "isobject": "3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -4245,7 +4363,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-data-descriptor": { @@ -4254,7 +4372,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-descriptor": { @@ -4263,9 +4381,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.3" } } } @@ -4276,26 +4394,35 @@ "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", "dev": true, "requires": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "pify": "^4.0.1", - "rimraf": "^2.6.3" + "@types/glob": "7.1.3", + "globby": "6.1.0", + "is-path-cwd": "2.2.0", + "is-path-in-cwd": "2.1.0", + "p-map": "2.1.0", + "pify": "4.0.1", + "rimraf": "2.7.1" }, "dependencies": { + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { + "array-uniq": "1.0.3" + } + }, "globby": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "1.0.2", + "glob": "7.1.6", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" }, "dependencies": { "pify": { @@ -4311,6 +4438,15 @@ "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", "dev": true + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "7.1.6" + } } } }, @@ -4320,6 +4456,12 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "dev": true + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -4332,8 +4474,8 @@ "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", "dev": true, "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "inherits": "2.0.4", + "minimalistic-assert": "1.0.1" } }, "destroy": { @@ -4354,9 +4496,9 @@ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" + "bn.js": "4.11.9", + "miller-rabin": "4.0.1", + "randombytes": "2.1.0" }, "dependencies": { "bn.js": { @@ -4368,12 +4510,12 @@ } }, "dir-glob": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", - "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, "requires": { - "path-type": "^3.0.0" + "path-type": "4.0.0" } }, "dns-equal": { @@ -4388,8 +4530,8 @@ "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", "dev": true, "requires": { - "ip": "^1.1.0", - "safe-buffer": "^5.0.1" + "ip": "1.1.5", + "safe-buffer": "5.1.2" } }, "dns-txt": { @@ -4398,7 +4540,7 @@ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { - "buffer-indexof": "^1.0.0" + "buffer-indexof": "1.1.1" } }, "doctrine": { @@ -4407,7 +4549,7 @@ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, "requires": { - "esutils": "^2.0.2" + "esutils": "2.0.3" } }, "dom-converter": { @@ -4416,7 +4558,7 @@ "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", "dev": true, "requires": { - "utila": "~0.4" + "utila": "0.4.0" } }, "dom-serializer": { @@ -4425,14 +4567,14 @@ "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", "dev": true, "requires": { - "domelementtype": "^2.0.1", - "entities": "^2.0.0" + "domelementtype": "2.0.2", + "entities": "2.0.3" }, "dependencies": { "domelementtype": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz", - "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz", + "integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==", "dev": true } } @@ -4455,7 +4597,7 @@ "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, "requires": { - "domelementtype": "1" + "domelementtype": "1.3.1" } }, "domutils": { @@ -4464,8 +4606,45 @@ "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", "dev": true, "requires": { - "dom-serializer": "0", - "domelementtype": "1" + "dom-serializer": "0.2.2", + "domelementtype": "1.3.1" + } + }, + "dot-case": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz", + "integrity": "sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==", + "dev": true, + "requires": { + "no-case": "3.0.3", + "tslib": "1.13.0" + }, + "dependencies": { + "lower-case": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz", + "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==", + "dev": true, + "requires": { + "tslib": "1.13.0" + } + }, + "no-case": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz", + "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==", + "dev": true, + "requires": { + "lower-case": "2.0.1", + "tslib": "1.13.0" + } + }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + } } }, "dot-prop": { @@ -4474,25 +4653,19 @@ "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", "dev": true, "requires": { - "is-obj": "^2.0.0" + "is-obj": "2.0.0" } }, - "dotenv": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz", - "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==", - "dev": true - }, - "dotenv-expand": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz", - "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", - "dev": true - }, "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", + "dev": true + }, + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", "dev": true }, "duplexify": { @@ -4501,26 +4674,37 @@ "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", "dev": true, "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" + "end-of-stream": "1.4.4", + "inherits": "2.0.4", + "readable-stream": "2.3.7", + "stream-shift": "1.0.1" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } } }, - "easy-stack": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.0.tgz", - "integrity": "sha1-EskbMIWjfwuqM26UhurEv5Tj54g=", - "dev": true - }, "ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "dev": true, "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" + "jsbn": "0.1.1", + "safer-buffer": "2.1.2" } }, "ee-first": { @@ -4535,25 +4719,114 @@ "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==", "dev": true }, + "electron-notarize": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-0.1.1.tgz", + "integrity": "sha512-TpKfJcz4LXl5jiGvZTs5fbEx+wUFXV5u8voeG5WCHWfY/cdgdD8lDZIZRqLVOtR3VO+drgJ9aiSHIO9TYn/fKg==", + "dev": true, + "requires": { + "debug": "4.2.0", + "fs-extra": "8.1.0" + }, + "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "requires": { + "graceful-fs": "4.2.4", + "jsonfile": "4.0.0", + "universalify": "0.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "electron-osx-sign": { + "version": "0.4.17", + "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.17.tgz", + "integrity": "sha512-wUJPmZJQCs1zgdlQgeIpRcvrf7M5/COQaOV68Va1J/SgmWx5KL2otgg+fAae7luw6qz9R8Gvu/Qpe9tAOu/3xQ==", + "dev": true, + "requires": { + "bluebird": "3.7.2", + "compare-version": "0.1.2", + "debug": "2.6.9", + "isbinaryfile": "3.0.3", + "minimist": "1.2.5", + "plist": "3.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "isbinaryfile": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", + "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", + "dev": true, + "requires": { + "buffer-alloc": "1.2.0" + } + } + } + }, "electron-to-chromium": { - "version": "1.3.452", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.452.tgz", - "integrity": "sha512-IdbjgCEqDvcU/1kUQa6C49I2NZOY3SBmU9Eus7mdFdJJBqn0Lg1Epfi/T4nqVcxTNBEGhcjwMhY1EysMBsXZrw==", + "version": "1.3.576", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz", + "integrity": "sha512-uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew==", "dev": true }, + "elementtree": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz", + "integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=", + "dev": true, + "requires": { + "sax": "1.1.4" + }, + "dependencies": { + "sax": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz", + "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk=", + "dev": true + } + } + }, "elliptic": { "version": "6.5.3", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", "dev": true, "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "bn.js": "4.11.9", + "brorand": "1.1.0", + "hash.js": "1.1.7", + "hmac-drbg": "1.0.1", + "inherits": "2.0.4", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" }, "dependencies": { "bn.js": { @@ -4588,7 +4861,7 @@ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "dev": true, "requires": { - "once": "^1.4.0" + "once": "1.4.0" } }, "enhanced-resolve": { @@ -4597,27 +4870,21 @@ "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.5.0", - "tapable": "^1.0.0" - }, - "dependencies": { - "memory-fs": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", - "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", - "dev": true, - "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" - } - } + "graceful-fs": "4.2.4", + "memory-fs": "0.5.0", + "tapable": "1.1.3" } }, "entities": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz", - "integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz", + "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==", + "dev": true + }, + "env-paths": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz", + "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==", "dev": true }, "errno": { @@ -4626,7 +4893,7 @@ "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", "dev": true, "requires": { - "prr": "~1.0.1" + "prr": "1.0.1" } }, "error-ex": { @@ -4635,7 +4902,7 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "is-arrayish": "0.2.1" } }, "error-stack-parser": { @@ -4644,26 +4911,27 @@ "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==", "dev": true, "requires": { - "stackframe": "^1.1.1" + "stackframe": "1.2.0" } }, "es-abstract": { - "version": "1.17.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", - "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", "dev": true, "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.1.5", - "is-regex": "^1.0.5", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimleft": "^2.1.1", - "string.prototype.trimright": "^2.1.1" + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-negative-zero": "2.0.0", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" } }, "es-to-primitive": { @@ -4672,11 +4940,24 @@ "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "is-callable": "1.2.2", + "is-date-object": "1.0.2", + "is-symbol": "1.0.3" } }, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "dev": true, + "optional": true + }, + "escalade": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz", + "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==", + "dev": true + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -4690,53 +4971,129 @@ "dev": true }, "eslint": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz", - "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==", + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz", + "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "ajv": "^6.9.1", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "eslint-scope": "^4.0.3", - "eslint-utils": "^1.3.1", - "eslint-visitor-keys": "^1.0.0", - "espree": "^5.0.1", - "esquery": "^1.0.1", - "esutils": "^2.0.2", - "file-entry-cache": "^5.0.1", - "functional-red-black-tree": "^1.0.1", - "glob": "^7.1.2", - "globals": "^11.7.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "inquirer": "^6.2.2", - "js-yaml": "^3.13.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.11", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.2", - "path-is-inside": "^1.0.2", - "progress": "^2.0.0", - "regexpp": "^2.0.1", - "semver": "^5.5.1", - "strip-ansi": "^4.0.0", - "strip-json-comments": "^2.0.1", - "table": "^5.2.3", - "text-table": "^0.2.0" + "@babel/code-frame": "7.10.4", + "ajv": "6.12.5", + "chalk": "2.4.2", + "cross-spawn": "6.0.5", + "debug": "4.2.0", + "doctrine": "3.0.0", + "eslint-scope": "5.1.1", + "eslint-utils": "1.4.3", + "eslint-visitor-keys": "1.3.0", + "espree": "6.2.1", + "esquery": "1.3.1", + "esutils": "2.0.3", + "file-entry-cache": "5.0.1", + "functional-red-black-tree": "1.0.1", + "glob-parent": "5.1.1", + "globals": "12.4.0", + "ignore": "4.0.6", + "import-fresh": "3.2.1", + "imurmurhash": "0.1.4", + "inquirer": "7.3.3", + "is-glob": "4.0.1", + "js-yaml": "3.14.0", + "json-stable-stringify-without-jsonify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.20", + "minimatch": "3.0.4", + "mkdirp": "0.5.5", + "natural-compare": "1.4.0", + "optionator": "0.8.3", + "progress": "2.0.3", + "regexpp": "2.0.1", + "semver": "6.3.0", + "strip-ansi": "5.2.0", + "strip-json-comments": "3.1.1", + "table": "5.4.6", + "text-table": "0.2.0", + "v8-compile-cache": "2.1.1" }, "dependencies": { "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "1.0.5", + "path-key": "2.0.1", + "semver": "5.7.1", + "shebang-command": "1.2.0", + "which": "1.3.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "requires": { + "esrecurse": "4.3.0", + "estraverse": "4.3.0" + } + }, + "eslint-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "dev": true, + "requires": { + "eslint-visitor-keys": "1.3.0" + } + }, + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "0.8.1" + } + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, "import-fresh": { @@ -4745,65 +5102,147 @@ "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", "dev": true, "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" + "parent-module": "1.0.1", + "resolve-from": "4.0.0" } }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "regexpp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "dev": true + }, "resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "4.1.0" + } + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, + "type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "2.0.0" } } } }, "eslint-config-prettier": { - "version": "6.9.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.9.0.tgz", - "integrity": "sha512-k4E14HBtcLv0uqThaI6I/n1LEqROp8XaPu6SO9Z32u5NlGRC07Enu1Bh2KEFw4FNHbekH8yzbIU9kUGxbiGmCA==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz", + "integrity": "sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw==", "dev": true, "requires": { - "get-stdin": "^6.0.0" + "get-stdin": "6.0.0" + }, + "dependencies": { + "get-stdin": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", + "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==", + "dev": true + } } }, "eslint-loader": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-2.2.1.tgz", - "integrity": "sha512-RLgV9hoCVsMLvOxCuNjdqOrUqIj9oJg8hF44vzJaYqsAHuY9G2YAeN3joQ9nxP0p5Th9iFSIpKo+SD8KISxXRg==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-3.0.4.tgz", + "integrity": "sha512-I496aBd+Hi23Y0Cx+sKvw+VwlJre4ScIRlkrvTO6Scq68X/UXbN6F3lAhN8b0Zv8atAyprkyrA42K5QBJtCyaw==", "dev": true, "requires": { - "loader-fs-cache": "^1.0.0", - "loader-utils": "^1.0.2", - "object-assign": "^4.0.1", - "object-hash": "^1.1.4", - "rimraf": "^2.6.1" - } - }, - "eslint-plugin-prettier": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.3.tgz", - "integrity": "sha512-+HG5jmu/dN3ZV3T6eCD7a4BlAySdN7mLIbJYo0z1cFQuI+r2DiTJEFeF68ots93PsnrMxbzIZ2S/ieX+mkrBeQ==", - "dev": true, - "requires": { - "prettier-linter-helpers": "^1.0.0" + "fs-extra": "8.1.0", + "loader-fs-cache": "1.0.3", + "loader-utils": "1.4.0", + "object-hash": "2.0.3", + "schema-utils": "2.7.1" + }, + "dependencies": { + "fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dev": true, + "requires": { + "graceful-fs": "4.2.4", + "jsonfile": "4.0.0", + "universalify": "0.1.2" + } + } } }, "eslint-plugin-vue": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-5.2.3.tgz", - "integrity": "sha512-mGwMqbbJf0+VvpGR5Lllq0PMxvTdrZ/ZPjmhkacrCHbubJeJOt+T6E3HUzAifa2Mxi7RSdJfC9HFpOeSYVMMIw==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz", + "integrity": "sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==", "dev": true, "requires": { - "vue-eslint-parser": "^5.0.0" + "natural-compare": "1.4.0", + "semver": "5.7.1", + "vue-eslint-parser": "7.1.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } } }, "eslint-scope": { @@ -4812,34 +5251,42 @@ "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", "dev": true, "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "esrecurse": "4.3.0", + "estraverse": "4.3.0" } }, "eslint-utils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", - "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" + "eslint-visitor-keys": "1.3.0" } }, "eslint-visitor-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz", - "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", "dev": true }, "espree": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", - "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", + "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", "dev": true, "requires": { - "acorn": "^6.0.7", - "acorn-jsx": "^5.0.0", - "eslint-visitor-keys": "^1.0.0" + "acorn": "7.4.0", + "acorn-jsx": "5.3.1", + "eslint-visitor-keys": "1.3.0" + }, + "dependencies": { + "acorn": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", + "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", + "dev": true + } } }, "esprima": { @@ -4849,21 +5296,37 @@ "dev": true }, "esquery": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz", - "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", + "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", "dev": true, "requires": { - "estraverse": "^4.0.0" + "estraverse": "5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } } }, "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, "requires": { - "estraverse": "^4.1.0" + "estraverse": "5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } } }, "estraverse": { @@ -4884,16 +5347,10 @@ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", "dev": true }, - "event-pubsub": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz", - "integrity": "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==", - "dev": true - }, "eventemitter3": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz", - "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", "dev": true }, "events": { @@ -4908,7 +5365,7 @@ "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", "dev": true, "requires": { - "original": "^1.0.0" + "original": "1.0.2" } }, "evp_bytestokey": { @@ -4917,8 +5374,8 @@ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", "dev": true, "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" + "md5.js": "1.3.5", + "safe-buffer": "5.1.2" } }, "execa": { @@ -4927,13 +5384,64 @@ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "6.0.5", + "get-stream": "4.1.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.3", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "1.0.5", + "path-key": "2.0.1", + "semver": "5.7.1", + "shebang-command": "1.2.0", + "which": "1.3.1" + } + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "2.0.0" + } + } } }, "expand-brackets": { @@ -4942,13 +5450,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "debug": { @@ -4966,7 +5474,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -4975,14 +5483,8 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true } } }, @@ -4992,36 +5494,36 @@ "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", "dev": true, "requires": { - "accepts": "~1.3.7", + "accepts": "1.3.7", "array-flatten": "1.1.1", "body-parser": "1.19.0", "content-disposition": "0.5.3", - "content-type": "~1.0.4", + "content-type": "1.0.4", "cookie": "0.4.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", + "depd": "1.1.2", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", + "finalhandler": "1.1.2", "fresh": "0.5.2", "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", + "methods": "1.1.2", + "on-finished": "2.3.0", + "parseurl": "1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", + "proxy-addr": "2.0.6", "qs": "6.7.0", - "range-parser": "~1.2.1", + "range-parser": "1.2.1", "safe-buffer": "5.1.2", "send": "0.17.1", "serve-static": "1.14.1", "setprototypeof": "1.1.1", - "statuses": "~1.5.0", - "type-is": "~1.6.18", + "statuses": "1.5.0", + "type-is": "1.6.18", "utils-merge": "1.0.1", - "vary": "~1.1.2" + "vary": "1.1.2" }, "dependencies": { "debug": { @@ -5032,18 +5534,6 @@ "requires": { "ms": "2.0.0" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "dev": true } } }, @@ -5059,8 +5549,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -5069,7 +5559,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -5080,9 +5570,9 @@ "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" + "chardet": "0.7.0", + "iconv-lite": "0.4.24", + "tmp": "0.0.33" } }, "extglob": { @@ -5091,14 +5581,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -5107,7 +5597,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "extend-shallow": { @@ -5116,7 +5606,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "is-accessor-descriptor": { @@ -5125,7 +5615,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-data-descriptor": { @@ -5134,7 +5624,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-descriptor": { @@ -5143,9 +5633,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.3" } } } @@ -5157,52 +5647,23 @@ "dev": true }, "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "fast-diff": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", - "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, "fast-glob": { - "version": "2.2.7", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", - "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", + "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", "dev": true, "requires": { - "@mrmlnc/readdir-enhanced": "^2.2.1", - "@nodelib/fs.stat": "^1.1.2", - "glob-parent": "^3.1.0", - "is-glob": "^4.0.0", - "merge2": "^1.2.3", - "micromatch": "^3.1.10" - }, - "dependencies": { - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } - } - } - } + "@nodelib/fs.stat": "2.0.3", + "@nodelib/fs.walk": "1.2.4", + "glob-parent": "5.1.1", + "merge2": "1.4.1", + "micromatch": "4.0.2", + "picomatch": "2.2.2" } }, "fast-json-stable-stringify": { @@ -5217,13 +5678,22 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, + "fastq": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", + "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", + "dev": true, + "requires": { + "reusify": "1.0.4" + } + }, "faye-websocket": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { - "websocket-driver": ">=0.5.1" + "websocket-driver": "0.6.5" } }, "figgy-pudding": { @@ -5233,12 +5703,12 @@ "dev": true }, "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, "requires": { - "escape-string-regexp": "^1.0.5" + "escape-string-regexp": "1.0.5" } }, "file-entry-cache": { @@ -5247,26 +5717,32 @@ "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", "dev": true, "requires": { - "flat-cache": "^2.0.1" + "flat-cache": "2.0.1" } }, "file-loader": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.3.0.tgz", - "integrity": "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz", + "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==", "dev": true, "requires": { - "loader-utils": "^1.2.3", - "schema-utils": "^2.5.0" + "loader-utils": "2.0.0", + "schema-utils": "2.7.1" + }, + "dependencies": { + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "5.2.2", + "emojis-list": "3.0.0", + "json5": "2.1.3" + } + } } }, - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "dev": true, - "optional": true - }, "filesize": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz", @@ -5274,26 +5750,12 @@ "dev": true }, "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } + "to-regex-range": "5.0.1" } }, "finalhandler": { @@ -5303,12 +5765,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.3", + "statuses": "1.5.0", + "unpipe": "1.0.0" }, "dependencies": { "debug": { @@ -5319,11 +5781,23 @@ "requires": { "ms": "2.0.0" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + } + } + }, + "find-babel-config": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.0.tgz", + "integrity": "sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==", + "dev": true, + "requires": { + "json5": "0.5.1", + "path-exists": "3.0.0" + }, + "dependencies": { + "json5": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", "dev": true } } @@ -5334,18 +5808,36 @@ "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" + "commondir": "1.0.1", + "make-dir": "2.1.0", + "pkg-dir": "3.0.0" } }, "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "^2.0.0" + "locate-path": "3.0.0" + } + }, + "findup": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/findup/-/findup-0.1.5.tgz", + "integrity": "sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs=", + "dev": true, + "requires": { + "colors": "0.6.2", + "commander": "2.1.0" + }, + "dependencies": { + "commander": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", + "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=", + "dev": true + } } }, "flat-cache": { @@ -5354,7 +5846,7 @@ "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", "dev": true, "requires": { - "flatted": "^2.0.0", + "flatted": "2.0.2", "rimraf": "2.6.3", "write": "1.0.3" }, @@ -5365,15 +5857,15 @@ "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.6" } } } }, "flatted": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", - "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", + "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", "dev": true }, "flush-write-stream": { @@ -5382,28 +5874,33 @@ "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "dev": true, "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" + "inherits": "2.0.4", + "readable-stream": "2.3.7" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } } }, "follow-redirects": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz", - "integrity": "sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==", - "dev": true, + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", "requires": { - "debug": "^3.0.0" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } + "debug": "3.1.0" } }, "for-in": { @@ -5418,15 +5915,158 @@ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", "dev": true }, + "fork-ts-checker-webpack-plugin": { + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz", + "integrity": "sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==", + "dev": true, + "requires": { + "@babel/code-frame": "7.10.4", + "chalk": "2.4.2", + "micromatch": "3.1.10", + "minimatch": "3.0.4", + "semver": "5.7.1", + "tapable": "1.1.3", + "worker-rpc": "0.1.1" + }, + "dependencies": { + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.3", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "3.0.0", + "repeat-string": "1.6.1" + } + } + } + }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "dev": true, "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" + "asynckit": "0.4.0", + "combined-stream": "1.0.8", + "mime-types": "2.1.27" } }, "forwarded": { @@ -5441,7 +6081,7 @@ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { - "map-cache": "^0.2.2" + "map-cache": "0.2.2" } }, "fresh": { @@ -5450,25 +6090,114 @@ "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", "dev": true }, + "friendly-errors-webpack-plugin": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0.tgz", + "integrity": "sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw==", + "dev": true, + "requires": { + "chalk": "1.1.3", + "error-stack-parser": "2.0.6", + "string-width": "2.1.1" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + } + } + }, "from2": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" + "inherits": "2.0.4", + "readable-stream": "2.3.7" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } } }, + "fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true + }, "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", + "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "at-least-node": "1.0.0", + "graceful-fs": "4.2.4", + "jsonfile": "6.0.1", + "universalify": "1.0.0" + }, + "dependencies": { + "jsonfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", + "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", + "dev": true, + "requires": { + "graceful-fs": "4.2.4", + "universalify": "1.0.0" + } + }, + "universalify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==", + "dev": true + } } }, "fs-minipass": { @@ -5477,7 +6206,7 @@ "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dev": true, "requires": { - "minipass": "^3.0.0" + "minipass": "3.1.3" } }, "fs-write-stream-atomic": { @@ -5486,10 +6215,27 @@ "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" + "graceful-fs": "4.2.4", + "iferr": "0.1.5", + "imurmurhash": "0.1.4", + "readable-stream": "2.3.7" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } } }, "fs.realpath": { @@ -5505,6 +6251,29 @@ "dev": true, "optional": true }, + "fstream": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", + "dev": true, + "requires": { + "graceful-fs": "4.2.4", + "inherits": "2.0.4", + "mkdirp": "0.5.5", + "rimraf": "2.7.1" + }, + "dependencies": { + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "7.1.6" + } + } + } + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -5517,6 +6286,62 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "dev": true, + "requires": { + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.3", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" + }, + "dependencies": { + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + } + } + }, + "gaze": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", + "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", + "dev": true, + "requires": { + "globule": "1.3.2" + } + }, "gensync": { "version": "1.0.0-beta.1", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", @@ -5530,9 +6355,9 @@ "dev": true }, "get-stdin": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", - "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", "dev": true }, "get-stream": { @@ -5541,7 +6366,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "^3.0.0" + "pump": "3.0.0" } }, "get-value": { @@ -5556,7 +6381,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "glob": { @@ -5565,12 +6390,12 @@ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.4", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "glob-parent": { @@ -5579,14 +6404,37 @@ "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "dev": true, "requires": { - "is-glob": "^4.0.1" + "is-glob": "4.0.1" } }, - "glob-to-regexp": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz", - "integrity": "sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=", - "dev": true + "global-agent": { + "version": "2.1.12", + "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-2.1.12.tgz", + "integrity": "sha512-caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg==", + "dev": true, + "optional": true, + "requires": { + "boolean": "3.0.1", + "core-js": "3.6.5", + "es6-error": "4.1.1", + "matcher": "3.0.0", + "roarr": "2.15.4", + "semver": "7.3.2", + "serialize-error": "7.0.1" + } + }, + "global-tunnel-ng": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", + "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", + "dev": true, + "optional": true, + "requires": { + "encodeurl": "1.0.2", + "lodash": "4.17.20", + "npm-conf": "1.1.3", + "tunnel": "0.0.6" + } }, "globals": { "version": "11.12.0", @@ -5594,20 +6442,58 @@ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true }, + "globalthis": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.1.tgz", + "integrity": "sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==", + "dev": true, + "optional": true, + "requires": { + "define-properties": "1.1.3" + } + }, "globby": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-9.2.0.tgz", - "integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==", + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz", + "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==", "dev": true, "requires": { - "@types/glob": "^7.1.1", - "array-union": "^1.0.2", - "dir-glob": "^2.2.2", - "fast-glob": "^2.2.6", - "glob": "^7.1.3", - "ignore": "^4.0.3", - "pify": "^4.0.1", - "slash": "^2.0.0" + "array-union": "2.1.0", + "dir-glob": "3.0.1", + "fast-glob": "3.2.4", + "ignore": "5.1.8", + "merge2": "1.4.1", + "slash": "3.0.0" + } + }, + "globule": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz", + "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==", + "dev": true, + "requires": { + "glob": "7.1.6", + "lodash": "4.17.20", + "minimatch": "3.0.4" + } + }, + "got": { + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", + "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", + "dev": true, + "requires": { + "@sindresorhus/is": "0.14.0", + "@szmarczak/http-timer": "1.1.2", + "cacheable-request": "6.1.0", + "decompress-response": "3.3.0", + "duplexer3": "0.1.4", + "get-stream": "4.1.0", + "lowercase-keys": "1.0.1", + "mimic-response": "1.0.1", + "p-cancelable": "1.1.0", + "to-readable-stream": "1.0.0", + "url-parse-lax": "3.0.0" } }, "graceful-fs": { @@ -5622,8 +6508,8 @@ "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==", "dev": true, "requires": { - "duplexer": "^0.1.1", - "pify": "^4.0.1" + "duplexer": "0.1.2", + "pify": "4.0.1" } }, "handle-thing": { @@ -5639,13 +6525,13 @@ "dev": true }, "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "dev": true, "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" + "ajv": "6.12.5", + "har-schema": "2.0.0" } }, "has": { @@ -5654,7 +6540,7 @@ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dev": true, "requires": { - "function-bind": "^1.1.1" + "function-bind": "1.1.1" } }, "has-ansi": { @@ -5663,15 +6549,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - } + "ansi-regex": "2.1.1" } }, "has-flag": { @@ -5686,15 +6564,21 @@ "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "dev": true + }, "has-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" } }, "has-values": { @@ -5703,17 +6587,43 @@ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" }, "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, "kind-of": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -5724,22 +6634,11 @@ "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", "dev": true, "requires": { - "inherits": "^2.0.4", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "inherits": "2.0.4", + "readable-stream": "3.6.0", + "safe-buffer": "5.2.1" }, "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -5749,9 +6648,9 @@ } }, "hash-sum": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", - "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", + "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=", "dev": true }, "hash.js": { @@ -5760,8 +6659,8 @@ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", "dev": true, "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" + "inherits": "2.0.4", + "minimalistic-assert": "1.0.1" } }, "he": { @@ -5776,21 +6675,15 @@ "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==", "dev": true }, - "highlight.js": { - "version": "9.18.1", - "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz", - "integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==", - "dev": true - }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" + "hash.js": "1.1.7", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" } }, "hoopy": { @@ -5811,10 +6704,27 @@ "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, "requires": { - "inherits": "^2.0.1", - "obuf": "^1.0.0", - "readable-stream": "^2.0.1", - "wbuf": "^1.1.0" + "inherits": "2.0.4", + "obuf": "1.1.2", + "readable-stream": "2.3.7", + "wbuf": "1.7.3" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } } }, "hsl-regex": { @@ -5842,87 +6752,94 @@ "dev": true }, "html-minifier": { - "version": "3.5.21", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz", - "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz", + "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", "dev": true, "requires": { - "camel-case": "3.0.x", - "clean-css": "4.2.x", - "commander": "2.17.x", - "he": "1.2.x", - "param-case": "2.1.x", - "relateurl": "0.2.x", - "uglify-js": "3.4.x" + "camel-case": "3.0.0", + "clean-css": "4.2.3", + "commander": "2.20.3", + "he": "1.2.0", + "param-case": "2.1.1", + "relateurl": "0.2.7", + "uglify-js": "3.11.0" + } + }, + "html-minifier-terser": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz", + "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==", + "dev": true, + "requires": { + "camel-case": "4.1.1", + "clean-css": "4.2.3", + "commander": "4.1.1", + "he": "1.2.0", + "param-case": "3.0.3", + "relateurl": "0.2.7", + "terser": "4.8.0" }, "dependencies": { + "camel-case": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz", + "integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==", + "dev": true, + "requires": { + "pascal-case": "3.1.1", + "tslib": "1.13.0" + } + }, "commander": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz", - "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "dev": true + }, + "param-case": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz", + "integrity": "sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==", + "dev": true, + "requires": { + "dot-case": "3.0.3", + "tslib": "1.13.0" + } + }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", "dev": true } } }, - "html-tags": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz", - "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=", - "dev": true - }, "html-webpack-plugin": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", - "integrity": "sha1-sBq71yOsqqeze2r0SS69oD2d03s=", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz", + "integrity": "sha512-C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w==", "dev": true, "requires": { - "html-minifier": "^3.2.3", - "loader-utils": "^0.2.16", - "lodash": "^4.17.3", - "pretty-error": "^2.0.2", - "tapable": "^1.0.0", - "toposort": "^1.0.0", + "@types/html-minifier-terser": "5.1.1", + "@types/tapable": "1.0.6", + "@types/webpack": "4.41.17", + "html-minifier-terser": "5.1.1", + "loader-utils": "1.4.0", + "lodash": "4.17.20", + "pretty-error": "2.1.1", + "tapable": "1.1.3", "util.promisify": "1.0.0" }, "dependencies": { - "big.js": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", - "dev": true - }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true - }, - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "^3.1.3", - "emojis-list": "^2.0.0", - "json5": "^0.5.0", - "object-assign": "^4.0.1" - } - }, "util.promisify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", "dev": true, "requires": { - "define-properties": "^1.1.2", - "object.getownpropertydescriptors": "^2.0.3" + "define-properties": "1.1.3", + "object.getownpropertydescriptors": "2.1.0" } } } @@ -5933,12 +6850,12 @@ "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", "dev": true, "requires": { - "domelementtype": "^1.3.1", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" + "domelementtype": "1.3.1", + "domhandler": "2.4.2", + "domutils": "1.7.0", + "entities": "1.1.2", + "inherits": "2.0.4", + "readable-stream": "3.6.0" }, "dependencies": { "entities": { @@ -5946,20 +6863,15 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", "dev": true - }, - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } } } }, + "http-cache-semantics": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", + "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", + "dev": true + }, "http-deceiver": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", @@ -5972,10 +6884,10 @@ "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", "dev": true, "requires": { - "depd": "~1.1.2", + "depd": "1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", + "statuses": "1.5.0", "toidentifier": "1.0.0" }, "dependencies": { @@ -5993,9 +6905,9 @@ "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { - "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" + "eventemitter3": "4.0.7", + "follow-redirects": "1.5.10", + "requires-port": "1.0.0" } }, "http-proxy-middleware": { @@ -6004,10 +6916,121 @@ "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", "dev": true, "requires": { - "http-proxy": "^1.17.0", - "is-glob": "^4.0.0", - "lodash": "^4.17.11", - "micromatch": "^3.1.10" + "http-proxy": "1.18.1", + "is-glob": "4.0.1", + "lodash": "4.17.20", + "micromatch": "3.1.10" + }, + "dependencies": { + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.3", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "3.0.0", + "repeat-string": "1.6.1" + } + } } }, "http-signature": { @@ -6016,9 +7039,9 @@ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.16.1" } }, "https-browserify": { @@ -6027,19 +7050,13 @@ "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, - "human-signals": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", - "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", - "dev": true - }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "icss-utils": { @@ -6048,7 +7065,7 @@ "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==", "dev": true, "requires": { - "postcss": "^7.0.14" + "postcss": "7.0.35" } }, "ieee754": { @@ -6064,9 +7081,9 @@ "dev": true }, "ignore": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", - "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", "dev": true }, "import-cwd": { @@ -6075,7 +7092,7 @@ "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", "dev": true, "requires": { - "import-from": "^2.1.0" + "import-from": "2.1.0" } }, "import-fresh": { @@ -6084,8 +7101,8 @@ "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", "dev": true, "requires": { - "caller-path": "^2.0.0", - "resolve-from": "^3.0.0" + "caller-path": "2.0.0", + "resolve-from": "3.0.0" } }, "import-from": { @@ -6094,7 +7111,7 @@ "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", "dev": true, "requires": { - "resolve-from": "^3.0.0" + "resolve-from": "3.0.0" } }, "import-local": { @@ -6103,8 +7120,8 @@ "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", "dev": true, "requires": { - "pkg-dir": "^3.0.0", - "resolve-cwd": "^2.0.0" + "pkg-dir": "3.0.0", + "resolve-cwd": "2.0.0" } }, "imurmurhash": { @@ -6113,6 +7130,12 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, + "in-publish": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", + "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==", + "dev": true + }, "indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -6137,8 +7160,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -6147,34 +7170,49 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true, + "optional": true + }, "inquirer": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", - "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", + "version": "7.3.3", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", + "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", "dev": true, "requires": { - "ansi-escapes": "^3.2.0", - "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", - "cli-width": "^2.0.0", - "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", - "run-async": "^2.2.0", - "rxjs": "^6.4.0", - "string-width": "^2.1.0", - "strip-ansi": "^5.1.0", - "through": "^2.3.6" + "ansi-escapes": "4.3.1", + "chalk": "4.1.0", + "cli-cursor": "3.1.0", + "cli-width": "3.0.0", + "external-editor": "3.1.0", + "figures": "3.2.0", + "lodash": "4.17.20", + "mute-stream": "0.0.8", + "run-async": "2.4.1", + "rxjs": "6.6.3", + "string-width": "4.2.0", + "strip-ansi": "6.0.0", + "through": "2.3.8" }, "dependencies": { - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "emoji-regex": "8.0.0", + "is-fullwidth-code-point": "3.0.0", + "strip-ansi": "6.0.0" } } } @@ -6185,35 +7223,17 @@ "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==", "dev": true, "requires": { - "default-gateway": "^4.2.0", - "ipaddr.js": "^1.9.0" - }, - "dependencies": { - "default-gateway": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", - "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "ip-regex": "^2.1.0" - } - } + "default-gateway": "4.2.0", + "ipaddr.js": "1.9.1" } }, - "interpret": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", - "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", - "dev": true - }, "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { - "loose-envify": "^1.0.0" + "loose-envify": "1.4.0" } }, "ip": { @@ -6246,16 +7266,22 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6278,42 +7304,32 @@ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, "requires": { - "binary-extensions": "^2.0.0" + "binary-extensions": "2.1.0" } }, "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==" }, "is-callable": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", - "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", "dev": true }, - "is-ci": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz", - "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==", - "dev": true, - "requires": { - "ci-info": "^1.5.0" - } - }, "is-color-stop": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz", "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=", "dev": true, "requires": { - "css-color-names": "^0.0.4", - "hex-color-regex": "^1.1.0", - "hsl-regex": "^1.0.0", - "hsla-regex": "^1.0.0", - "rgb-regex": "^1.0.1", - "rgba-regex": "^1.0.0" + "css-color-names": "0.0.4", + "hex-color-regex": "1.1.0", + "hsl-regex": "1.0.0", + "hsla-regex": "1.0.0", + "rgb-regex": "1.0.1", + "rgba-regex": "1.0.0" } }, "is-data-descriptor": { @@ -6322,16 +7338,22 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6348,9 +7370,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { @@ -6368,9 +7390,9 @@ "dev": true }, "is-docker": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz", - "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz", + "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==", "dev": true }, "is-extendable": { @@ -6385,6 +7407,12 @@ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, + "is-finite": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", + "dev": true + }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", @@ -6397,28 +7425,20 @@ "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "dev": true, "requires": { - "is-extglob": "^2.1.1" + "is-extglob": "2.1.1" } }, + "is-negative-zero": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", + "dev": true + }, "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true }, "is-obj": { "version": "2.0.0", @@ -6438,7 +7458,7 @@ "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", "dev": true, "requires": { - "is-path-inside": "^2.1.0" + "is-path-inside": "2.1.0" } }, "is-path-inside": { @@ -6447,7 +7467,7 @@ "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", "dev": true, "requires": { - "path-is-inside": "^1.0.2" + "path-is-inside": "1.0.2" } }, "is-plain-obj": { @@ -6462,22 +7482,16 @@ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, - "is-promise": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", - "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", - "dev": true - }, "is-regex": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", - "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", "dev": true, "requires": { - "has": "^1.0.3" + "has-symbols": "1.0.1" } }, "is-resolvable": { @@ -6498,7 +7512,7 @@ "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==", "dev": true, "requires": { - "html-comment-regex": "^1.1.0" + "html-comment-regex": "1.1.2" } }, "is-symbol": { @@ -6507,7 +7521,7 @@ "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", "dev": true, "requires": { - "has-symbols": "^1.0.1" + "has-symbols": "1.0.1" } }, "is-typedarray": { @@ -6516,6 +7530,12 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -6523,10 +7543,13 @@ "dev": true }, "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", - "dev": true + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dev": true, + "requires": { + "is-docker": "2.1.1" + } }, "isarray": { "version": "1.0.0", @@ -6534,6 +7557,12 @@ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true }, + "isbinaryfile": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz", + "integrity": "sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==", + "dev": true + }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -6559,13 +7588,14 @@ "dev": true }, "jest-worker": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz", - "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==", + "version": "26.3.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz", + "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==", "dev": true, "requires": { - "merge-stream": "^2.0.0", - "supports-color": "^7.0.0" + "@types/node": "10.17.35", + "merge-stream": "2.0.0", + "supports-color": "7.2.0" }, "dependencies": { "has-flag": { @@ -6575,31 +7605,22 @@ "dev": true }, "supports-color": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz", - "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==", + "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" + "has-flag": "4.0.0" } } } }, - "js-message": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.5.tgz", - "integrity": "sha1-IwDSSxrwjondCVvBpMnJz8uJLRU=", + "js-base64": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", "dev": true }, - "js-queue": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/js-queue/-/js-queue-2.0.0.tgz", - "integrity": "sha1-NiITz4YPRo8BJfxslqvBdCUx+Ug=", - "dev": true, - "requires": { - "easy-stack": "^1.0.0" - } - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -6607,13 +7628,13 @@ "dev": true }, "js-yaml": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz", - "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==", + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", + "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "1.0.10", + "esprima": "4.0.1" } }, "jsbn": { @@ -6628,6 +7649,12 @@ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true }, + "json-buffer": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", + "dev": true + }, "json-parse-better-errors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", @@ -6670,7 +7697,7 @@ "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "dev": true, "requires": { - "minimist": "^1.2.5" + "minimist": "1.2.5" } }, "jsonfile": { @@ -6679,7 +7706,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "4.2.4" } }, "jsprim": { @@ -6694,6 +7721,15 @@ "verror": "1.10.0" } }, + "keyv": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", + "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", + "dev": true, + "requires": { + "json-buffer": "3.0.0" + } + }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -6706,14 +7742,37 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, + "last-call-webpack-plugin": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz", + "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==", + "dev": true, + "requires": { + "lodash": "4.17.20", + "webpack-sources": "1.4.3" + } + }, "launch-editor": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.2.1.tgz", "integrity": "sha512-On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw==", "dev": true, "requires": { - "chalk": "^2.3.0", - "shell-quote": "^1.6.1" + "chalk": "2.4.2", + "shell-quote": "1.7.2" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + } } }, "launch-editor-middleware": { @@ -6722,7 +7781,33 @@ "integrity": "sha512-s0UO2/gEGiCgei3/2UN3SMuUj1phjQN8lcpnvgLSz26fAzNWPQ6Nf/kF5IFClnfU2ehp6LrmKdMU/beveO+2jg==", "dev": true, "requires": { - "launch-editor": "^2.2.1" + "launch-editor": "2.2.1" + } + }, + "lazystream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", + "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "dev": true, + "requires": { + "readable-stream": "2.3.7" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } } }, "leven": { @@ -6737,7 +7822,7 @@ "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==", "dev": true, "requires": { - "leven": "^3.1.0" + "leven": "3.1.0" } }, "levn": { @@ -6746,15 +7831,39 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" + "prelude-ls": "1.1.2", + "type-check": "0.3.2" } }, - "lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", - "dev": true + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "4.2.4", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + }, + "dependencies": { + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "1.3.2" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } + } }, "loader-fs-cache": { "version": "1.0.3", @@ -6762,8 +7871,8 @@ "integrity": "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==", "dev": true, "requires": { - "find-cache-dir": "^0.1.1", - "mkdirp": "^0.5.1" + "find-cache-dir": "0.1.1", + "mkdirp": "0.5.5" }, "dependencies": { "find-cache-dir": { @@ -6772,9 +7881,9 @@ "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", "dev": true, "requires": { - "commondir": "^1.0.1", - "mkdirp": "^0.5.1", - "pkg-dir": "^1.0.0" + "commondir": "1.0.1", + "mkdirp": "0.5.5", + "pkg-dir": "1.0.0" } }, "find-up": { @@ -6783,8 +7892,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } }, "path-exists": { @@ -6793,7 +7902,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } }, "pkg-dir": { @@ -6802,7 +7911,7 @@ "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { - "find-up": "^1.0.0" + "find-up": "1.1.2" } } } @@ -6819,9 +7928,9 @@ "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", "dev": true, "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "big.js": "5.2.2", + "emojis-list": "3.0.0", + "json5": "1.0.1" }, "dependencies": { "json5": { @@ -6830,19 +7939,19 @@ "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "requires": { - "minimist": "^1.2.0" + "minimist": "1.2.5" } } } }, "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "^2.0.0", - "path-exists": "^3.0.0" + "p-locate": "3.0.0", + "path-exists": "3.0.0" } }, "lodash": { @@ -6851,22 +7960,46 @@ "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, - "lodash.defaultsdeep": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz", - "integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==", + "lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", "dev": true }, - "lodash.kebabcase": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", - "integrity": "sha1-hImxyw0p/4gZXM7KRI/21swpXDY=", + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", "dev": true }, - "lodash.mapvalues": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz", - "integrity": "sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=", + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", + "dev": true + }, + "lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=", + "dev": true + }, + "lodash.difference": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", + "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=", + "dev": true + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", + "dev": true + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=", "dev": true }, "lodash.memoize": { @@ -6875,10 +8008,35 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "dev": true }, - "lodash.transform": { + "lodash.template": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", + "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", + "dev": true, + "requires": { + "lodash._reinterpolate": "3.0.0", + "lodash.templatesettings": "4.2.0" + } + }, + "lodash.templatesettings": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz", + "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", + "dev": true, + "requires": { + "lodash._reinterpolate": "3.0.0" + } + }, + "lodash.throttle": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", + "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=", + "dev": true + }, + "lodash.union": { "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.transform/-/lodash.transform-4.6.0.tgz", - "integrity": "sha1-EjBkIvYzJK7YSD0/ODMrX2cFR6A=", + "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", + "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=", "dev": true }, "lodash.uniq": { @@ -6887,19 +8045,22 @@ "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", "dev": true }, - "log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", + "log-update": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", + "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", "dev": true, "requires": { - "chalk": "^2.0.1" + "ansi-escapes": "4.3.1", + "cli-cursor": "3.1.0", + "slice-ansi": "4.0.0", + "wrap-ansi": "6.2.0" } }, "loglevel": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz", - "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz", + "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==", "dev": true }, "loose-envify": { @@ -6908,7 +8069,17 @@ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "dev": true, "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" + "js-tokens": "4.0.0" + } + }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "dev": true, + "requires": { + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.3" } }, "lower-case": { @@ -6917,13 +8088,19 @@ "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", "dev": true }, + "lowercase-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "dev": true + }, "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { - "yallist": "^3.0.2" + "yallist": "4.0.0" } }, "make-dir": { @@ -6932,8 +8109,16 @@ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" + "pify": "4.0.1", + "semver": "5.7.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } } }, "map-cache": { @@ -6942,20 +8127,39 @@ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "dev": true }, + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "dev": true + }, "map-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { - "object-visit": "^1.0.0" + "object-visit": "1.0.1" } }, - "material-design-icons-iconfont": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/material-design-icons-iconfont/-/material-design-icons-iconfont-5.0.1.tgz", - "integrity": "sha512-Xg6rIdGrfySTqiTZ6d+nQbcFepS6R4uKbJP0oAqyeZXJY/bX6mZDnOmmUJusqLXfhIwirs0c++a6JpqVa8RFvA==", - "dev": true + "matcher": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", + "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", + "dev": true, + "optional": true, + "requires": { + "escape-string-regexp": "4.0.0" + }, + "dependencies": { + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "optional": true + } + } }, "md5.js": { "version": "1.3.5", @@ -6963,9 +8167,9 @@ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", "dev": true, "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" + "hash-base": "3.1.0", + "inherits": "2.0.4", + "safe-buffer": "5.1.2" } }, "mdn-data": { @@ -6981,13 +8185,48 @@ "dev": true }, "memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", + "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", "dev": true, "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" + "errno": "0.1.7", + "readable-stream": "2.3.7" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } + } + }, + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "dev": true, + "requires": { + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.5", + "normalize-package-data": "2.5.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" } }, "merge-descriptors": { @@ -7002,7 +8241,7 @@ "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", "dev": true, "requires": { - "source-map": "^0.6.1" + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -7020,9 +8259,9 @@ "dev": true }, "merge2": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz", - "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true }, "methods": { @@ -7031,25 +8270,20 @@ "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", "dev": true }, + "microevent.ts": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/microevent.ts/-/microevent.ts-0.1.1.tgz", + "integrity": "sha512-jo1OfR4TaEwd5HOrt5+tAZ9mqT4jmpNAusXtyfNzqVm9uiSYFZlKM1wYL4oU7azZW/PxQW53wM0S6OR1JHNa2g==", + "dev": true + }, "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "braces": "3.0.2", + "picomatch": "2.2.2" } }, "miller-rabin": { @@ -7058,8 +8292,8 @@ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", "dev": true, "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" + "bn.js": "4.11.9", + "brorand": "1.1.0" }, "dependencies": { "bn.js": { @@ -7071,9 +8305,9 @@ } }, "mime": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz", - "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true }, "mime-db": { @@ -7092,21 +8326,27 @@ } }, "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "mimic-response": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", + "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", "dev": true }, "mini-css-extract-plugin": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz", - "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.10.0.tgz", + "integrity": "sha512-QgKgJBjaJhxVPwrLNqqwNS0AGkuQQ31Hp4xGXEK/P7wehEg6qmNtReHKai3zRXqY60wGVWLYcOMJK2b98aGc3A==", "dev": true, "requires": { - "loader-utils": "^1.1.0", + "loader-utils": "1.4.0", "normalize-url": "1.9.1", - "schema-utils": "^1.0.0", - "webpack-sources": "^1.1.0" + "schema-utils": "1.0.0", + "webpack-sources": "1.4.3" }, "dependencies": { "normalize-url": { @@ -7115,21 +8355,27 @@ "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", "dev": true, "requires": { - "object-assign": "^4.0.1", - "prepend-http": "^1.0.0", - "query-string": "^4.1.0", - "sort-keys": "^1.0.0" + "object-assign": "4.1.1", + "prepend-http": "1.0.4", + "query-string": "4.3.4", + "sort-keys": "1.1.2" } }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", + "dev": true + }, "schema-utils": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "ajv": "6.12.5", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.5.2" } } } @@ -7152,7 +8398,7 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -7167,15 +8413,7 @@ "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==", "dev": true, "requires": { - "yallist": "^4.0.0" - }, - "dependencies": { - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - } + "yallist": "4.0.0" } }, "minipass-collect": { @@ -7184,7 +8422,7 @@ "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", "dev": true, "requires": { - "minipass": "^3.0.0" + "minipass": "3.1.3" } }, "minipass-flush": { @@ -7193,16 +8431,26 @@ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", "dev": true, "requires": { - "minipass": "^3.0.0" + "minipass": "3.1.3" } }, "minipass-pipeline": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz", - "integrity": "sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", + "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", "dev": true, "requires": { - "minipass": "^3.0.0" + "minipass": "3.1.3" + } + }, + "minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dev": true, + "requires": { + "minipass": "3.1.3", + "yallist": "4.0.0" } }, "mississippi": { @@ -7211,16 +8459,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" + "concat-stream": "1.6.2", + "duplexify": "3.7.1", + "end-of-stream": "1.4.4", + "flush-write-stream": "1.1.1", + "from2": "2.3.0", + "parallel-transform": "1.2.0", + "pump": "3.0.0", + "pumpify": "1.5.1", + "stream-each": "1.2.3", + "through2": "2.0.5" } }, "mixin-deep": { @@ -7229,8 +8477,8 @@ "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" + "for-in": "1.0.2", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -7239,7 +8487,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -7250,28 +8498,44 @@ "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, "requires": { - "minimist": "^1.2.5" + "minimist": "1.2.5" } }, + "moment": { + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz", + "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==", + "dev": true + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "dev": true, "requires": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" + "aproba": "1.2.0", + "copy-concurrently": "1.0.5", + "fs-write-stream-atomic": "1.0.10", + "mkdirp": "0.5.5", + "rimraf": "2.7.1", + "run-queue": "1.0.3" + }, + "dependencies": { + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "7.1.6" + } + } } }, "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "multicast-dns": { "version": "6.2.3", @@ -7279,8 +8543,8 @@ "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", "dev": true, "requires": { - "dns-packet": "^1.3.1", - "thunky": "^1.0.2" + "dns-packet": "1.3.1", + "thunky": "1.1.0" } }, "multicast-dns-service-types": { @@ -7290,28 +8554,16 @@ "dev": true }, "mute-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", - "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", "dev": true }, - "mz": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", - "dev": true, - "requires": { - "any-promise": "^1.0.0", - "object-assign": "^4.0.1", - "thenify-all": "^1.0.0" - } - }, "nan": { "version": "2.14.1", "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", - "dev": true, - "optional": true + "dev": true }, "nanomatch": { "version": "1.2.13", @@ -7319,17 +8571,17 @@ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-windows": "1.0.2", + "kind-of": "6.0.3", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "natural-compare": { @@ -7345,9 +8597,9 @@ "dev": true }, "neo-async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true }, "nice-try": { @@ -7362,24 +8614,70 @@ "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", "dev": true, "requires": { - "lower-case": "^1.1.1" + "lower-case": "1.1.4" } }, "node-forge": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", - "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==", + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", + "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==", "dev": true }, - "node-ipc": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.1.tgz", - "integrity": "sha512-FAyICv0sIRJxVp3GW5fzgaf9jwwRQxAKDJlmNFUL5hOy+W4X/I5AypyHoq0DXXbo9o/gt79gj++4cMr4jVWE/w==", + "node-gyp": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", + "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", "dev": true, "requires": { - "event-pubsub": "4.3.0", - "js-message": "1.0.5", - "js-queue": "2.0.0" + "fstream": "1.0.12", + "glob": "7.1.6", + "graceful-fs": "4.2.4", + "mkdirp": "0.5.5", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.5", + "request": "2.88.2", + "rimraf": "2.7.1", + "semver": "5.3.0", + "tar": "2.2.2", + "which": "1.3.1" + }, + "dependencies": { + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "7.1.6" + } + }, + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", + "dev": true + }, + "tar": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", + "dev": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.12", + "inherits": "2.0.4" + } + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "2.0.0" + } + } } }, "node-libs-browser": { @@ -7388,55 +8686,217 @@ "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", "dev": true, "requires": { - "assert": "^1.1.1", - "browserify-zlib": "^0.2.0", - "buffer": "^4.3.0", - "console-browserify": "^1.1.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.11.0", - "domain-browser": "^1.1.1", - "events": "^3.0.0", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", + "assert": "1.5.0", + "browserify-zlib": "0.2.0", + "buffer": "4.9.2", + "console-browserify": "1.2.0", + "constants-browserify": "1.0.0", + "crypto-browserify": "3.12.0", + "domain-browser": "1.2.0", + "events": "3.2.0", + "https-browserify": "1.0.0", + "os-browserify": "0.3.0", "path-browserify": "0.0.1", - "process": "^0.11.10", - "punycode": "^1.2.4", - "querystring-es3": "^0.2.0", - "readable-stream": "^2.3.3", - "stream-browserify": "^2.0.1", - "stream-http": "^2.7.2", - "string_decoder": "^1.0.0", - "timers-browserify": "^2.0.4", + "process": "0.11.10", + "punycode": "1.4.1", + "querystring-es3": "0.2.1", + "readable-stream": "2.3.7", + "stream-browserify": "2.0.2", + "stream-http": "2.8.3", + "string_decoder": "1.1.1", + "timers-browserify": "2.0.11", "tty-browserify": "0.0.0", - "url": "^0.11.0", - "util": "^0.11.0", - "vm-browserify": "^1.0.1" + "url": "0.11.0", + "util": "0.11.1", + "vm-browserify": "1.1.2" }, "dependencies": { + "buffer": { + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", + "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", + "dev": true, + "requires": { + "base64-js": "1.3.1", + "ieee754": "1.1.13", + "isarray": "1.0.0" + } + }, "punycode": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", "dev": true + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } + } + }, + "node-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/node-loader/-/node-loader-1.0.1.tgz", + "integrity": "sha512-0So+BicZSQaY4sLqeutdkXWiTsmr+QrlGtm5dn4OPJBcnZRmjupFbWnZbDLec95KQTZHAwt8+vk+nEIXzPHxGw==", + "dev": true, + "requires": { + "loader-utils": "2.0.0", + "schema-utils": "2.7.1" + }, + "dependencies": { + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "5.2.2", + "emojis-list": "3.0.0", + "json5": "2.1.3" + } } } }, "node-releases": { - "version": "1.1.56", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.56.tgz", - "integrity": "sha512-EVo605FhWLygH8a64TjgpjyHYOihkxECwX1bHHr8tETJKWEiWS2YJjPbvsX2jFjnjTNEgBCmk9mLjKG1Mf11cw==", + "version": "1.1.61", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz", + "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==", "dev": true }, + "node-sass": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", + "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", + "dev": true, + "requires": { + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.3", + "get-stdin": "4.0.1", + "glob": "7.1.6", + "in-publish": "2.0.1", + "lodash": "4.17.20", + "meow": "3.7.0", + "mkdirp": "0.5.5", + "nan": "2.14.1", + "node-gyp": "3.8.0", + "npmlog": "4.1.2", + "request": "2.88.2", + "sass-graph": "2.2.5", + "stdout-stream": "1.4.1", + "true-case-path": "1.0.3" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "cross-spawn": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", + "dev": true, + "requires": { + "lru-cache": "4.1.5", + "which": "1.3.1" + } + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "2.0.0" + } + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "dev": true + } + } + }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "dev": true, + "requires": { + "abbrev": "1.1.1" + } + }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "hosted-git-info": "2.8.8", + "resolve": "1.17.0", + "semver": "5.7.1", + "validate-npm-package-license": "3.0.4" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } } }, "normalize-path": { @@ -7452,18 +8912,58 @@ "dev": true }, "normalize-url": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz", - "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", + "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==", "dev": true }, + "npm-conf": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", + "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", + "dev": true, + "optional": true, + "requires": { + "config-chain": "1.1.12", + "pify": "3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true, + "optional": true + } + } + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "^2.0.0" + "path-key": "2.0.1" + }, + "dependencies": { + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + } + } + }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "dev": true, + "requires": { + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "nth-check": { @@ -7472,7 +8972,7 @@ "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", "dev": true, "requires": { - "boolbase": "~1.0.0" + "boolbase": "1.0.0" } }, "num2fraction": { @@ -7481,6 +8981,12 @@ "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", "dev": true }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true + }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", @@ -7499,9 +9005,9 @@ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" }, "dependencies": { "define-property": { @@ -7510,40 +9016,46 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } }, "object-hash": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz", - "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.0.3.tgz", + "integrity": "sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==", "dev": true }, "object-inspect": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", - "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", "dev": true }, "object-is": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", - "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz", + "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" + "define-properties": "1.1.3", + "es-abstract": "1.18.0-next.1" } }, "object-keys": { @@ -7558,19 +9070,19 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { - "isobject": "^3.0.0" + "isobject": "3.0.1" } }, "object.assign": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", - "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", + "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", "dev": true, "requires": { - "define-properties": "^1.1.2", - "function-bind": "^1.1.1", - "has-symbols": "^1.0.0", - "object-keys": "^1.0.11" + "define-properties": "1.1.3", + "es-abstract": "1.18.0-next.1", + "has-symbols": "1.0.1", + "object-keys": "1.1.1" } }, "object.getownpropertydescriptors": { @@ -7579,8 +9091,29 @@ "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" + "define-properties": "1.1.3", + "es-abstract": "1.17.7" + }, + "dependencies": { + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" + } + } } }, "object.pick": { @@ -7589,7 +9122,7 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "object.values": { @@ -7598,10 +9131,31 @@ "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1", - "has": "^1.0.3" + "define-properties": "1.1.3", + "es-abstract": "1.17.7", + "function-bind": "1.1.1", + "has": "1.0.3" + }, + "dependencies": { + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" + } + } } }, "obuf": { @@ -7631,31 +9185,32 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "mimic-fn": "2.1.0" } }, "open": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz", - "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/open/-/open-7.1.0.tgz", + "integrity": "sha512-lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA==", "dev": true, "requires": { - "is-wsl": "^1.1.0" + "is-docker": "2.1.1", + "is-wsl": "2.2.0" } }, "opener": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz", - "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz", + "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", "dev": true }, "opn": { @@ -7664,7 +9219,25 @@ "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", "dev": true, "requires": { - "is-wsl": "^1.1.0" + "is-wsl": "1.1.0" + }, + "dependencies": { + "is-wsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", + "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", + "dev": true + } + } + }, + "optimize-css-assets-webpack-plugin": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz", + "integrity": "sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA==", + "dev": true, + "requires": { + "cssnano": "4.1.10", + "last-call-webpack-plugin": "3.0.0" } }, "optionator": { @@ -7673,37 +9246,12 @@ "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", "dev": true, "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" - } - }, - "ora": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz", - "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", - "cli-spinners": "^2.0.0", - "log-symbols": "^2.2.0", - "strip-ansi": "^5.2.0", - "wcwidth": "^1.0.1" - }, - "dependencies": { - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "word-wrap": "1.2.3" } }, "original": { @@ -7712,7 +9260,7 @@ "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", "dev": true, "requires": { - "url-parse": "^1.4.3" + "url-parse": "1.4.7" } }, "os-browserify": { @@ -7721,12 +9269,46 @@ "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", "dev": true }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true + }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "dev": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "ouch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ouch/-/ouch-2.0.0.tgz", + "integrity": "sha512-kaAZtzpV3iSDdGHQKz7/dRVWd7nXNO1OUNHNtZIW9ryoBvb6y8QtYfpWdcBUFgBzMbMYVA/PGPeoeJU95VHK7Q==", + "dev": true, + "requires": { + "@positron/stack-trace": "1.0.0", + "ejs": "2.7.4", + "escape-html": "1.0.3", + "lodash": "4.17.20" + } + }, + "p-cancelable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", + "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", + "dev": true + }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", @@ -7734,30 +9316,30 @@ "dev": true }, "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "p-try": "^1.0.0" + "p-try": "2.2.0" } }, "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "^1.1.0" + "p-limit": "2.3.0" } }, "p-map": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", - "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, "requires": { - "aggregate-error": "^3.0.0" + "aggregate-error": "3.1.0" } }, "p-retry": { @@ -7766,13 +9348,13 @@ "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", "dev": true, "requires": { - "retry": "^0.12.0" + "retry": "0.12.0" } }, "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, "pako": { @@ -7787,9 +9369,26 @@ "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", "dev": true, "requires": { - "cyclist": "^1.0.1", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" + "cyclist": "1.0.1", + "inherits": "2.0.4", + "readable-stream": "2.3.7" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } } }, "param-case": { @@ -7798,7 +9397,7 @@ "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", "dev": true, "requires": { - "no-case": "^2.2.0" + "no-case": "2.3.2" } }, "parent-module": { @@ -7807,7 +9406,7 @@ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, "requires": { - "callsites": "^3.0.0" + "callsites": "3.1.0" }, "dependencies": { "callsites": { @@ -7824,38 +9423,21 @@ "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", "dev": true, "requires": { - "asn1.js": "^5.2.0", - "browserify-aes": "^1.0.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" + "asn1.js": "5.4.1", + "browserify-aes": "1.2.0", + "evp_bytestokey": "1.0.3", + "pbkdf2": "3.1.1", + "safe-buffer": "5.1.2" } }, "parse-json": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", - "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1", - "lines-and-columns": "^1.1.6" - } - }, - "parse5": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", - "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", - "dev": true - }, - "parse5-htmlparser2-tree-adapter": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-5.1.1.tgz", - "integrity": "sha512-CF+TKjXqoqyDwHqBhFQ+3l5t83xYi6fVT1tQNg+Ye0JRLnTxWvIroCjEp1A0k4lneHNBGnICUf0cfYVYGEazqw==", - "dev": true, - "requires": { - "parse5": "^5.1.1" + "error-ex": "1.3.2", + "json-parse-better-errors": "1.0.2" } }, "parseurl": { @@ -7864,6 +9446,43 @@ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true }, + "pascal-case": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz", + "integrity": "sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==", + "dev": true, + "requires": { + "no-case": "3.0.3", + "tslib": "1.13.0" + }, + "dependencies": { + "lower-case": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz", + "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==", + "dev": true, + "requires": { + "tslib": "1.13.0" + } + }, + "no-case": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz", + "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==", + "dev": true, + "requires": { + "lower-case": "2.0.1", + "tslib": "1.13.0" + } + }, + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + } + } + }, "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", @@ -7901,9 +9520,9 @@ "dev": true }, "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true }, "path-parse": { @@ -7919,21 +9538,10 @@ "dev": true }, "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "^3.0.0" - }, - "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - } - } + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true }, "pbkdf2": { "version": "3.1.1", @@ -7941,11 +9549,11 @@ "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==", "dev": true, "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" } }, "performance-now": { @@ -7978,7 +9586,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "pkg-dir": { @@ -7987,91 +9595,63 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "^3.0.0" - }, - "dependencies": { - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", - "dev": true, - "requires": { - "locate-path": "^3.0.0" - } - }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - } + "find-up": "3.0.0" } }, "pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", - "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", + "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", "dev": true, "requires": { - "find-up": "^2.1.0" + "find-up": "3.0.0" } }, - "pnp-webpack-plugin": { - "version": "1.6.4", - "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz", - "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==", + "plist": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.1.tgz", + "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==", "dev": true, "requires": { - "ts-pnp": "^1.1.6" + "base64-js": "1.3.1", + "xmlbuilder": "9.0.7", + "xmldom": "0.1.31" } }, "portfinder": { - "version": "1.0.26", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz", - "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==", + "version": "1.0.28", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", + "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", "dev": true, "requires": { - "async": "^2.6.2", - "debug": "^3.1.1", - "mkdirp": "^0.5.1" + "async": "2.6.3", + "debug": "3.2.6", + "mkdirp": "0.5.5" }, "dependencies": { + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "dev": true, + "requires": { + "lodash": "4.17.20" + } + }, "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true } } }, @@ -8082,16 +9662,38 @@ "dev": true }, "postcss": { - "version": "7.0.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz", - "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==", + "version": "7.0.35", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", + "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "chalk": "2.4.2", + "source-map": "0.6.1", + "supports-color": "6.1.0" }, "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -8104,20 +9706,20 @@ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } }, "postcss-calc": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz", - "integrity": "sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.4.tgz", + "integrity": "sha512-0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw==", "dev": true, "requires": { - "postcss": "^7.0.27", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.0.2" + "postcss": "7.0.35", + "postcss-selector-parser": "6.0.4", + "postcss-value-parser": "4.1.0" } }, "postcss-colormin": { @@ -8126,11 +9728,11 @@ "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==", "dev": true, "requires": { - "browserslist": "^4.0.0", - "color": "^3.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "browserslist": "4.14.5", + "color": "3.1.2", + "has": "1.0.3", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8147,8 +9749,8 @@ "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==", "dev": true, "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8165,7 +9767,7 @@ "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==", "dev": true, "requires": { - "postcss": "^7.0.0" + "postcss": "7.0.35" } }, "postcss-discard-duplicates": { @@ -8174,7 +9776,7 @@ "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==", "dev": true, "requires": { - "postcss": "^7.0.0" + "postcss": "7.0.35" } }, "postcss-discard-empty": { @@ -8183,7 +9785,7 @@ "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==", "dev": true, "requires": { - "postcss": "^7.0.0" + "postcss": "7.0.35" } }, "postcss-discard-overridden": { @@ -8192,17 +9794,17 @@ "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==", "dev": true, "requires": { - "postcss": "^7.0.0" + "postcss": "7.0.35" } }, "postcss-load-config": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz", - "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz", + "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==", "dev": true, "requires": { - "cosmiconfig": "^5.0.0", - "import-cwd": "^2.0.0" + "cosmiconfig": "5.2.1", + "import-cwd": "2.1.0" } }, "postcss-loader": { @@ -8211,10 +9813,10 @@ "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", "dev": true, "requires": { - "loader-utils": "^1.1.0", - "postcss": "^7.0.0", - "postcss-load-config": "^2.0.0", - "schema-utils": "^1.0.0" + "loader-utils": "1.4.0", + "postcss": "7.0.35", + "postcss-load-config": "2.1.2", + "schema-utils": "1.0.0" }, "dependencies": { "schema-utils": { @@ -8223,9 +9825,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "ajv": "6.12.5", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.5.2" } } } @@ -8237,9 +9839,9 @@ "dev": true, "requires": { "css-color-names": "0.0.4", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "stylehacks": "^4.0.0" + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1", + "stylehacks": "4.0.3" }, "dependencies": { "postcss-value-parser": { @@ -8256,12 +9858,12 @@ "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==", "dev": true, "requires": { - "browserslist": "^4.0.0", - "caniuse-api": "^3.0.0", - "cssnano-util-same-parent": "^4.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0", - "vendors": "^1.0.0" + "browserslist": "4.14.5", + "caniuse-api": "3.0.0", + "cssnano-util-same-parent": "4.0.1", + "postcss": "7.0.35", + "postcss-selector-parser": "3.1.2", + "vendors": "1.0.4" }, "dependencies": { "postcss-selector-parser": { @@ -8270,9 +9872,9 @@ "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "dot-prop": "5.2.0", + "indexes-of": "1.0.1", + "uniq": "1.0.1" } } } @@ -8283,8 +9885,8 @@ "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==", "dev": true, "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8301,10 +9903,10 @@ "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==", "dev": true, "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "is-color-stop": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-arguments": "4.0.0", + "is-color-stop": "1.1.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8321,12 +9923,12 @@ "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==", "dev": true, "requires": { - "alphanum-sort": "^1.0.0", - "browserslist": "^4.0.0", - "cssnano-util-get-arguments": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "uniqs": "^2.0.0" + "alphanum-sort": "1.0.2", + "browserslist": "4.14.5", + "cssnano-util-get-arguments": "4.0.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1", + "uniqs": "2.0.0" }, "dependencies": { "postcss-value-parser": { @@ -8343,10 +9945,10 @@ "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==", "dev": true, "requires": { - "alphanum-sort": "^1.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0" + "alphanum-sort": "1.0.2", + "has": "1.0.3", + "postcss": "7.0.35", + "postcss-selector-parser": "3.1.2" }, "dependencies": { "postcss-selector-parser": { @@ -8355,9 +9957,9 @@ "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "dot-prop": "5.2.0", + "indexes-of": "1.0.1", + "uniq": "1.0.1" } } } @@ -8368,19 +9970,19 @@ "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==", "dev": true, "requires": { - "postcss": "^7.0.5" + "postcss": "7.0.35" } }, "postcss-modules-local-by-default": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz", - "integrity": "sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz", + "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==", "dev": true, "requires": { - "icss-utils": "^4.1.1", - "postcss": "^7.0.16", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.0.0" + "icss-utils": "4.1.1", + "postcss": "7.0.35", + "postcss-selector-parser": "6.0.4", + "postcss-value-parser": "4.1.0" } }, "postcss-modules-scope": { @@ -8389,8 +9991,8 @@ "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==", "dev": true, "requires": { - "postcss": "^7.0.6", - "postcss-selector-parser": "^6.0.0" + "postcss": "7.0.35", + "postcss-selector-parser": "6.0.4" } }, "postcss-modules-values": { @@ -8399,8 +10001,8 @@ "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==", "dev": true, "requires": { - "icss-utils": "^4.0.0", - "postcss": "^7.0.6" + "icss-utils": "4.1.1", + "postcss": "7.0.35" } }, "postcss-normalize-charset": { @@ -8409,7 +10011,7 @@ "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==", "dev": true, "requires": { - "postcss": "^7.0.0" + "postcss": "7.0.35" } }, "postcss-normalize-display-values": { @@ -8418,9 +10020,9 @@ "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==", "dev": true, "requires": { - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-match": "4.0.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8437,10 +10039,10 @@ "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==", "dev": true, "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-arguments": "4.0.0", + "has": "1.0.3", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8457,10 +10059,10 @@ "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==", "dev": true, "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-arguments": "4.0.0", + "cssnano-util-get-match": "4.0.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8477,9 +10079,9 @@ "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==", "dev": true, "requires": { - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "has": "1.0.3", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8496,9 +10098,9 @@ "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==", "dev": true, "requires": { - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-match": "4.0.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8515,9 +10117,9 @@ "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==", "dev": true, "requires": { - "browserslist": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "browserslist": "4.14.5", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8534,12 +10136,18 @@ "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==", "dev": true, "requires": { - "is-absolute-url": "^2.0.0", - "normalize-url": "^3.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "is-absolute-url": "2.1.0", + "normalize-url": "3.3.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { + "normalize-url": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz", + "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==", + "dev": true + }, "postcss-value-parser": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz", @@ -8554,8 +10162,8 @@ "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==", "dev": true, "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8572,9 +10180,9 @@ "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==", "dev": true, "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-arguments": "4.0.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8591,10 +10199,10 @@ "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==", "dev": true, "requires": { - "browserslist": "^4.0.0", - "caniuse-api": "^3.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0" + "browserslist": "4.14.5", + "caniuse-api": "3.0.0", + "has": "1.0.3", + "postcss": "7.0.35" } }, "postcss-reduce-transforms": { @@ -8603,10 +10211,10 @@ "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==", "dev": true, "requires": { - "cssnano-util-get-match": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-match": "4.0.0", + "has": "1.0.3", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -8617,15 +10225,34 @@ } } }, - "postcss-selector-parser": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz", - "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==", + "postcss-rtl": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/postcss-rtl/-/postcss-rtl-1.7.3.tgz", + "integrity": "sha512-PMwlrQSeZKChNJQGtWz9Xfk3rY1W7P5Jp4sFRXVufczQIH6vRhTNSc5gnEwKHaWrU8SMoZMi2VY7ihOmwVvW7g==", "dev": true, "requires": { - "cssesc": "^3.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "rtlcss": "2.5.0" + } + }, + "postcss-safe-parser": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz", + "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==", + "dev": true, + "requires": { + "postcss": "7.0.35" + } + }, + "postcss-selector-parser": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz", + "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==", + "dev": true, + "requires": { + "cssesc": "3.0.0", + "indexes-of": "1.0.1", + "uniq": "1.0.1", + "util-deprecate": "1.0.2" } }, "postcss-svgo": { @@ -8634,10 +10261,10 @@ "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==", "dev": true, "requires": { - "is-svg": "^3.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "svgo": "^1.0.0" + "is-svg": "3.0.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1", + "svgo": "1.3.2" }, "dependencies": { "postcss-value-parser": { @@ -8654,9 +10281,9 @@ "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==", "dev": true, "requires": { - "alphanum-sort": "^1.0.0", - "postcss": "^7.0.0", - "uniqs": "^2.0.0" + "alphanum-sort": "1.0.2", + "postcss": "7.0.35", + "uniqs": "2.0.0" } }, "postcss-value-parser": { @@ -8672,25 +10299,17 @@ "dev": true }, "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", + "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", "dev": true }, "prettier": { "version": "1.19.1", "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", - "dev": true - }, - "prettier-linter-helpers": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", - "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", "dev": true, - "requires": { - "fast-diff": "^1.1.2" - } + "optional": true }, "pretty-error": { "version": "2.1.1", @@ -8698,16 +10317,10 @@ "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", "dev": true, "requires": { - "renderkid": "^2.0.1", - "utila": "~0.4" + "renderkid": "2.0.3", + "utila": "0.4.0" } }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", - "dev": true - }, "process": { "version": "0.11.10", "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", @@ -8732,13 +10345,20 @@ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", "dev": true }, + "proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", + "dev": true, + "optional": true + }, "proxy-addr": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", "dev": true, "requires": { - "forwarded": "~0.1.2", + "forwarded": "0.1.2", "ipaddr.js": "1.9.1" } }, @@ -8766,12 +10386,12 @@ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" + "bn.js": "4.11.9", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "parse-asn1": "5.1.6", + "randombytes": "2.1.0", + "safe-buffer": "5.1.2" }, "dependencies": { "bn.js": { @@ -8788,8 +10408,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "end-of-stream": "1.4.4", + "once": "1.4.0" } }, "pumpify": { @@ -8798,9 +10418,9 @@ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "dev": true, "requires": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" + "duplexify": "3.7.1", + "inherits": "2.0.4", + "pump": "2.0.1" }, "dependencies": { "pump": { @@ -8809,8 +10429,8 @@ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "end-of-stream": "1.4.4", + "once": "1.4.0" } } } @@ -8828,19 +10448,24 @@ "dev": true }, "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", "dev": true }, + "quasar": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/quasar/-/quasar-1.14.0.tgz", + "integrity": "sha512-S7tREMAKP53n9slk1E6e0qwKQaNAA5N1aGUDUTr3zyVtaDj3FeIvacoppTZFUhXTrwAbbRd/mMZdMHLSuNsbBQ==" + }, "query-string": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", "dev": true, "requires": { - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" + "object-assign": "4.1.1", + "strict-uri-encode": "1.1.0" } }, "querystring": { @@ -8856,9 +10481,9 @@ "dev": true }, "querystringify": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz", - "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", "dev": true }, "randombytes": { @@ -8867,7 +10492,7 @@ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, "requires": { - "safe-buffer": "^5.1.0" + "safe-buffer": "5.1.2" } }, "randomfill": { @@ -8876,8 +10501,8 @@ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "dev": true, "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" + "randombytes": "2.1.0", + "safe-buffer": "5.1.2" } }, "range-parser": { @@ -8899,30 +10524,84 @@ } }, "read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" + "load-json-file": "1.1.0", + "normalize-package-data": "2.5.0", + "path-type": "1.1.0" + }, + "dependencies": { + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "4.2.4", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, + "requires": { + "pinkie-promise": "2.0.1" + } + } } }, "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "inherits": "2.0.4", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "readdir-glob": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.0.tgz", + "integrity": "sha512-KgT0oXPIDQRRRYFf+06AUaodICTep2Q5635BORLzTEzp7rEqcR14a47j3Vzm3ix7FeI1lp8mYyG7r8lTB06Pyg==", + "dev": true, + "requires": { + "minimatch": "3.0.4" } }, "readdirp": { @@ -8931,22 +10610,34 @@ "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", "dev": true, "requires": { - "picomatch": "^2.2.1" + "picomatch": "2.2.2" } }, - "rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "resolve": "^1.1.6" + "indent-string": "2.1.0", + "strip-indent": "1.0.1" + }, + "dependencies": { + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "dev": true, + "requires": { + "repeating": "2.0.1" + } + } } }, "regenerate": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", - "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz", + "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==", "dev": true }, "regenerate-unicode-properties": { @@ -8955,23 +10646,22 @@ "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", "dev": true, "requires": { - "regenerate": "^1.4.0" + "regenerate": "1.4.1" } }, "regenerator-runtime": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz", - "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==", + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==", "dev": true }, "regenerator-transform": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz", - "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==", + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz", + "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", "dev": true, "requires": { - "@babel/runtime": "^7.8.4", - "private": "^0.1.8" + "@babel/runtime": "7.11.2" } }, "regex-not": { @@ -8980,8 +10670,8 @@ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "dev": true, "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" } }, "regexp.prototype.flags": { @@ -8990,30 +10680,57 @@ "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" + "define-properties": "1.1.3", + "es-abstract": "1.17.7" + }, + "dependencies": { + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" + } + } } }, "regexpp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", - "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", + "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", "dev": true }, "regexpu-core": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz", - "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==", + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz", + "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==", "dev": true, "requires": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.2.0", - "regjsgen": "^0.5.1", - "regjsparser": "^0.6.4", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.2.0" + "regenerate": "1.4.1", + "regenerate-unicode-properties": "8.2.0", + "regjsgen": "0.5.2", + "regjsparser": "0.6.4", + "unicode-match-property-ecmascript": "1.0.4", + "unicode-match-property-value-ecmascript": "1.2.0" } }, + "register-service-worker": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/register-service-worker/-/register-service-worker-1.7.1.tgz", + "integrity": "sha512-IdTfUZ4u8iJL8o1w8es8l6UMGPmkwHolUdT+UmM1UypC80IB4KbpuIlvwWVj8UDS7eJwkEYRcKRgfRX+oTmJsw==", + "dev": true + }, "regjsgen": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz", @@ -9026,7 +10743,7 @@ "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", "dev": true, "requires": { - "jsesc": "~0.5.0" + "jsesc": "0.5.0" }, "dependencies": { "jsesc": { @@ -9055,29 +10772,23 @@ "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==", "dev": true, "requires": { - "css-select": "^1.1.0", - "dom-converter": "^0.2", - "htmlparser2": "^3.3.0", - "strip-ansi": "^3.0.0", - "utila": "^0.4.0" + "css-select": "1.2.0", + "dom-converter": "0.2.0", + "htmlparser2": "3.10.1", + "strip-ansi": "3.0.1", + "utila": "0.4.0" }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, "css-select": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "dev": true, "requires": { - "boolbase": "~1.0.0", - "css-what": "2.1", + "boolbase": "1.0.0", + "css-what": "2.1.3", "domutils": "1.5.1", - "nth-check": "~1.0.1" + "nth-check": "1.0.2" } }, "css-what": { @@ -9092,8 +10803,8 @@ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "dev": true, "requires": { - "dom-serializer": "0", - "domelementtype": "1" + "dom-serializer": "0.2.2", + "domelementtype": "1.3.1" } }, "strip-ansi": { @@ -9102,7 +10813,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } } } @@ -9119,52 +10830,49 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, + "requires": { + "is-finite": "1.1.0" + } + }, "request": { "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "dev": true, "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - } - }, - "request-promise-core": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", - "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==", - "dev": true, - "requires": { - "lodash": "^4.17.15" - } - }, - "request-promise-native": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz", - "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==", - "dev": true, - "requires": { - "request-promise-core": "1.1.3", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" + "aws-sign2": "0.7.0", + "aws4": "1.10.1", + "caseless": "0.12.0", + "combined-stream": "1.0.8", + "extend": "3.0.2", + "forever-agent": "0.6.1", + "form-data": "2.3.3", + "har-validator": "5.1.5", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.27", + "oauth-sign": "0.9.0", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.5.0", + "tunnel-agent": "0.6.0", + "uuid": "3.4.0" + }, + "dependencies": { + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true + } } }, "require-directory": { @@ -9185,13 +10893,19 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "reselect": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz", + "integrity": "sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA==", + "dev": true + }, "resolve": { "version": "1.17.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { - "path-parse": "^1.0.6" + "path-parse": "1.0.6" } }, "resolve-cwd": { @@ -9200,7 +10914,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "^3.0.0" + "resolve-from": "3.0.0" } }, "resolve-from": { @@ -9215,14 +10929,23 @@ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", "dev": true }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "responselike": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", + "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", "dev": true, "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" + "lowercase-keys": "1.0.1" + } + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "requires": { + "onetime": "5.1.2", + "signal-exit": "3.0.3" } }, "ret": { @@ -9237,6 +10960,12 @@ "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", "dev": true }, + "reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true + }, "rgb-regex": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz", @@ -9250,12 +10979,12 @@ "dev": true }, "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.6" } }, "ripemd160": { @@ -9264,18 +10993,79 @@ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" + "hash-base": "3.1.0", + "inherits": "2.0.4" + } + }, + "roarr": { + "version": "2.15.4", + "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", + "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", + "dev": true, + "optional": true, + "requires": { + "boolean": "3.0.1", + "detect-node": "2.0.4", + "globalthis": "1.0.1", + "json-stringify-safe": "5.0.1", + "semver-compare": "1.0.0", + "sprintf-js": "1.1.2" + } + }, + "rtlcss": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-2.5.0.tgz", + "integrity": "sha512-NCVdF45w70/3CQeqVvQ84bu2HN8agNn+CDjw+RxXaiWb7mPOmEvltdd1z4qzm9kin4Jnu9ShFBIx28yvWerZ2g==", + "dev": true, + "requires": { + "chalk": "2.4.2", + "findup": "0.1.5", + "mkdirp": "0.5.5", + "postcss": "6.0.23", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "postcss": { + "version": "6.0.23", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", + "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", + "dev": true, + "requires": { + "chalk": "2.4.2", + "source-map": "0.6.1", + "supports-color": "5.5.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", - "dev": true, - "requires": { - "is-promise": "^2.1.0" - } + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", + "dev": true + }, + "run-parallel": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", + "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", + "dev": true }, "run-queue": { "version": "1.0.3", @@ -9283,16 +11073,24 @@ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { - "aproba": "^1.1.1" + "aproba": "1.2.0" } }, "rxjs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz", - "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==", + "version": "6.6.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz", + "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.13.0" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + } } }, "safe-buffer": { @@ -9307,7 +11105,7 @@ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { - "ret": "~0.1.10" + "ret": "0.1.15" } }, "safer-buffer": { @@ -9316,13 +11114,77 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, - "sass": { - "version": "1.26.5", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz", - "integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==", + "sanitize-filename": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz", + "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==", "dev": true, "requires": { - "chokidar": ">=2.0.0 <4.0.0" + "truncate-utf8-bytes": "1.0.2" + } + }, + "sass-graph": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", + "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", + "dev": true, + "requires": { + "glob": "7.1.6", + "lodash": "4.17.20", + "scss-tokenizer": "0.2.3", + "yargs": "13.3.2" + }, + "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "7.0.3", + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "5.2.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "4.1.0" + } + }, + "yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "requires": { + "cliui": "5.0.0", + "find-up": "3.0.0", + "get-caller-file": "2.0.5", + "require-directory": "2.1.1", + "require-main-filename": "2.0.0", + "set-blocking": "2.0.0", + "string-width": "3.1.0", + "which-module": "2.0.0", + "y18n": "4.0.0", + "yargs-parser": "13.1.2" + } + } } }, "sass-loader": { @@ -9331,11 +11193,11 @@ "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "loader-utils": "^1.2.3", - "neo-async": "^2.6.1", - "schema-utils": "^2.6.1", - "semver": "^6.3.0" + "clone-deep": "4.0.1", + "loader-utils": "1.4.0", + "neo-async": "2.6.2", + "schema-utils": "2.7.1", + "semver": "6.3.0" }, "dependencies": { "semver": { @@ -9353,32 +11215,34 @@ "dev": true }, "schema-utils": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz", - "integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", "dev": true, "requires": { - "ajv": "^6.12.0", - "ajv-keywords": "^3.4.1" + "@types/json-schema": "7.0.6", + "ajv": "6.12.5", + "ajv-keywords": "3.5.2" + } + }, + "scss-tokenizer": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", + "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", + "dev": true, + "requires": { + "js-base64": "2.6.4", + "source-map": "0.4.4" }, "dependencies": { - "ajv": { - "version": "6.12.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", - "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "amdefine": "1.0.1" } - }, - "fast-deep-equal": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", - "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", - "dev": true } } }, @@ -9389,20 +11253,27 @@ "dev": true }, "selfsigned": { - "version": "1.10.7", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz", - "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==", + "version": "1.10.8", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz", + "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", "dev": true, "requires": { - "node-forge": "0.9.0" + "node-forge": "0.10.0" } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", "dev": true }, + "semver-compare": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", + "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", + "dev": true, + "optional": true + }, "send": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", @@ -9410,18 +11281,18 @@ "dev": true, "requires": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", + "depd": "1.1.2", + "destroy": "1.0.4", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", "fresh": "0.5.2", - "http-errors": "~1.7.2", + "http-errors": "1.7.2", "mime": "1.6.0", "ms": "2.1.1", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" + "on-finished": "2.3.0", + "range-parser": "1.2.1", + "statuses": "1.5.0" }, "dependencies": { "debug": { @@ -9441,12 +11312,6 @@ } } }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true - }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -9455,11 +11320,24 @@ } } }, + "serialize-error": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", + "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", + "dev": true, + "optional": true, + "requires": { + "type-fest": "0.13.1" + } + }, "serialize-javascript": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz", - "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==", - "dev": true + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "dev": true, + "requires": { + "randombytes": "2.1.0" + } }, "serve-index": { "version": "1.9.1", @@ -9467,13 +11345,13 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { - "accepts": "~1.3.4", + "accepts": "1.3.7", "batch": "0.6.1", "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" + "escape-html": "1.0.3", + "http-errors": "1.6.3", + "mime-types": "2.1.27", + "parseurl": "1.3.3" }, "dependencies": { "debug": { @@ -9491,10 +11369,10 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "~1.1.2", + "depd": "1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" + "statuses": "1.5.0" } }, "inherits": { @@ -9503,12 +11381,6 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, "setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", @@ -9523,9 +11395,9 @@ "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", "dev": true, "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "parseurl": "1.3.3", "send": "0.17.1" } }, @@ -9541,10 +11413,10 @@ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" }, "dependencies": { "extend-shallow": { @@ -9553,7 +11425,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -9576,8 +11448,8 @@ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.4", + "safe-buffer": "5.1.2" } }, "shallow-clone": { @@ -9586,22 +11458,22 @@ "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, "requires": { - "kind-of": "^6.0.2" + "kind-of": "6.0.3" } }, "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "3.0.0" } }, "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, "shell-quote": { @@ -9610,21 +11482,10 @@ "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==", "dev": true }, - "shelljs": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz", - "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==", - "dev": true, - "requires": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" - } - }, "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", "dev": true }, "simple-swizzle": { @@ -9633,7 +11494,7 @@ "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", "dev": true, "requires": { - "is-arrayish": "^0.3.1" + "is-arrayish": "0.3.2" }, "dependencies": { "is-arrayish": { @@ -9645,20 +11506,53 @@ } }, "slash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", - "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, "slice-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", - "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "astral-regex": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0" + "ansi-styles": "4.2.1", + "astral-regex": "2.0.0", + "is-fullwidth-code-point": "3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", + "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "dev": true, + "requires": { + "@types/color-name": "1.1.1", + "color-convert": "2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + } } }, "snapdragon": { @@ -9667,14 +11561,14 @@ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "dev": true, "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.3", + "use": "3.1.1" }, "dependencies": { "debug": { @@ -9692,7 +11586,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -9701,14 +11595,8 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true } } }, @@ -9718,9 +11606,9 @@ "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" }, "dependencies": { "define-property": { @@ -9729,7 +11617,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -9738,7 +11626,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-data-descriptor": { @@ -9747,7 +11635,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-descriptor": { @@ -9756,9 +11644,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.3" } } } @@ -9769,16 +11657,22 @@ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, "requires": { - "kind-of": "^3.2.0" + "kind-of": "3.2.2" }, "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -9789,8 +11683,8 @@ "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==", "dev": true, "requires": { - "faye-websocket": "^0.10.0", - "uuid": "^3.4.0", + "faye-websocket": "0.10.0", + "uuid": "3.4.0", "websocket-driver": "0.6.5" } }, @@ -9800,12 +11694,12 @@ "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", "dev": true, "requires": { - "debug": "^3.2.5", - "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" + "debug": "3.2.6", + "eventsource": "1.0.7", + "faye-websocket": "0.11.3", + "inherits": "2.0.4", + "json3": "3.3.3", + "url-parse": "1.4.7" }, "dependencies": { "debug": { @@ -9814,7 +11708,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "faye-websocket": { @@ -9823,8 +11717,14 @@ "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", "dev": true, "requires": { - "websocket-driver": ">=0.5.1" + "websocket-driver": "0.6.5" } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true } } }, @@ -9834,7 +11734,7 @@ "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", "dev": true, "requires": { - "is-plain-obj": "^1.0.0" + "is-plain-obj": "1.1.0" } }, "source-list-map": { @@ -9855,11 +11755,11 @@ "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", "dev": true, "requires": { - "atob": "^2.1.2", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" + "atob": "2.1.2", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" } }, "source-map-support": { @@ -9868,8 +11768,8 @@ "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" + "buffer-from": "1.1.1", + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -9892,8 +11792,8 @@ "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", "dev": true, "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" + "spdx-expression-parse": "3.0.1", + "spdx-license-ids": "3.0.6" } }, "spdx-exceptions": { @@ -9908,14 +11808,14 @@ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "spdx-exceptions": "2.3.0", + "spdx-license-ids": "3.0.6" } }, "spdx-license-ids": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", - "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==", + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz", + "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==", "dev": true }, "spdy": { @@ -9924,11 +11824,28 @@ "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", "dev": true, "requires": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" + "debug": "4.2.0", + "handle-thing": "2.0.1", + "http-deceiver": "1.2.7", + "select-hose": "2.0.0", + "spdy-transport": "3.0.0" + }, + "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "spdy-transport": { @@ -9937,24 +11854,28 @@ "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, "requires": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" + "debug": "4.2.0", + "detect-node": "2.0.4", + "hpack.js": "2.1.6", + "obuf": "1.1.2", + "readable-stream": "3.6.0", + "wbuf": "1.7.3" }, "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "ms": "2.1.2" } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true } } }, @@ -9964,14 +11885,15 @@ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dev": true, "requires": { - "extend-shallow": "^3.0.0" + "extend-shallow": "3.0.2" } }, "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", + "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "dev": true, + "optional": true }, "sshpk": { "version": "1.16.1", @@ -9979,24 +11901,24 @@ "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", "dev": true, "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" + "asn1": "0.2.4", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.2", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.2", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "safer-buffer": "2.1.2", + "tweetnacl": "0.14.5" } }, "ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz", + "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==", "dev": true, "requires": { - "figgy-pudding": "^3.5.1" + "minipass": "3.1.3" } }, "stable": { @@ -10006,9 +11928,9 @@ "dev": true }, "stackframe": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.1.1.tgz", - "integrity": "sha512-0PlYhdKh6AfFxRyK/v+6/k+/mMfyiEBbTM5L94D0ZytQnJ166wuwoTYLHFWGbs2dpA8Rgq763KGWmN1EQEYHRQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz", + "integrity": "sha512-GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA==", "dev": true }, "static-extend": { @@ -10017,8 +11939,8 @@ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" + "define-property": "0.2.5", + "object-copy": "0.1.0" }, "dependencies": { "define-property": { @@ -10027,7 +11949,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -10038,11 +11960,31 @@ "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", "dev": true }, - "stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", - "dev": true + "stdout-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", + "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", + "dev": true, + "requires": { + "readable-stream": "2.3.7" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } + } }, "stream-browserify": { "version": "2.0.2", @@ -10050,8 +11992,25 @@ "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "dev": true, "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" + "inherits": "2.0.4", + "readable-stream": "2.3.7" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } } }, "stream-each": { @@ -10060,8 +12019,8 @@ "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" + "end-of-stream": "1.4.4", + "stream-shift": "1.0.1" } }, "stream-http": { @@ -10070,11 +12029,28 @@ "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", "dev": true, "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" + "builtin-status-codes": "3.0.0", + "inherits": "2.0.4", + "readable-stream": "2.3.7", + "to-arraybuffer": "1.0.1", + "xtend": "4.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } } }, "stream-shift": { @@ -10095,8 +12071,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { "ansi-regex": { @@ -10111,7 +12087,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -10122,30 +12098,29 @@ "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" - } - }, - "string.prototype.trimleft": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", - "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5", - "string.prototype.trimstart": "^1.0.0" - } - }, - "string.prototype.trimright": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", - "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", - "dev": true, - "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5", - "string.prototype.trimend": "^1.0.0" + "define-properties": "1.1.3", + "es-abstract": "1.17.7" + }, + "dependencies": { + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" + } + } } }, "string.prototype.trimstart": { @@ -10154,8 +12129,29 @@ "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" + "define-properties": "1.1.3", + "es-abstract": "1.17.7" + }, + "dependencies": { + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" + } + } } }, "string_decoder": { @@ -10164,7 +12160,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "strip-ansi": { @@ -10173,7 +12169,7 @@ "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "5.0.0" }, "dependencies": { "ansi-regex": { @@ -10184,23 +12180,29 @@ } } }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, "strip-indent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz", - "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=", - "dev": true + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "dev": true, + "requires": { + "get-stdin": "4.0.1" + } }, "strip-json-comments": { "version": "2.0.1", @@ -10214,9 +12216,9 @@ "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==", "dev": true, "requires": { - "browserslist": "^4.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0" + "browserslist": "4.14.5", + "postcss": "7.0.35", + "postcss-selector-parser": "3.1.2" }, "dependencies": { "postcss-selector-parser": { @@ -10225,47 +12227,127 @@ "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "dot-prop": "5.2.0", + "indexes-of": "1.0.1", + "uniq": "1.0.1" } } } }, + "stylus": { + "version": "0.54.8", + "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz", + "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==", + "dev": true, + "requires": { + "css-parse": "2.0.0", + "debug": "3.1.0", + "glob": "7.1.6", + "mkdirp": "1.0.4", + "safer-buffer": "2.1.2", + "sax": "1.2.4", + "semver": "6.3.0", + "source-map": "0.7.3" + }, + "dependencies": { + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + } + } + }, + "stylus-loader": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", + "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", + "dev": true, + "requires": { + "loader-utils": "1.4.0", + "lodash.clonedeep": "4.5.0", + "when": "3.6.4" + } + }, + "sumchecker": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", + "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", + "dev": true, + "requires": { + "debug": "4.2.0" + }, + "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } }, - "svg-tags": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", - "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=", - "dev": true - }, "svgo": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", "dev": true, "requires": { - "chalk": "^2.4.1", - "coa": "^2.0.2", - "css-select": "^2.0.0", - "css-select-base-adapter": "^0.1.1", + "chalk": "2.4.2", + "coa": "2.0.2", + "css-select": "2.1.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" + "csso": "4.0.3", + "js-yaml": "3.14.0", + "mkdirp": "0.5.5", + "object.values": "1.1.1", + "sax": "1.2.4", + "stable": "0.1.8", + "unquote": "1.1.1", + "util.promisify": "1.0.1" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + } } }, "table": { @@ -10274,27 +12356,50 @@ "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", "dev": true, "requires": { - "ajv": "^6.10.2", - "lodash": "^4.17.14", - "slice-ansi": "^2.1.0", - "string-width": "^3.0.0" + "ajv": "6.12.5", + "lodash": "4.17.20", + "slice-ansi": "2.1.0", + "string-width": "3.1.0" }, "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true + }, "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true }, + "slice-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "astral-regex": "1.0.0", + "is-fullwidth-code-point": "2.0.0" + } + }, "string-width": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "7.0.3", + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "5.2.0" } }, "strip-ansi": { @@ -10303,7 +12408,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "4.1.0" } } } @@ -10314,15 +12419,50 @@ "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", "dev": true }, - "terser": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz", - "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==", + "tar": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz", + "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==", "dev": true, "requires": { - "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" + "chownr": "2.0.0", + "fs-minipass": "2.1.0", + "minipass": "3.1.3", + "minizlib": "2.1.2", + "mkdirp": "1.0.4", + "yallist": "4.0.0" + }, + "dependencies": { + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "dev": true + } + } + }, + "tar-stream": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz", + "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==", + "dev": true, + "requires": { + "bl": "4.0.3", + "end-of-stream": "1.4.4", + "fs-constants": "1.0.0", + "inherits": "2.0.4", + "readable-stream": "3.6.0" + } + }, + "terser": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", + "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", + "dev": true, + "requires": { + "commander": "2.20.3", + "source-map": "0.6.1", + "source-map-support": "0.5.19" }, "dependencies": { "source-map": { @@ -10334,47 +12474,135 @@ } }, "terser-webpack-plugin": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", - "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.1.0.tgz", + "integrity": "sha512-0ZWDPIP8BtEDZdChbufcXUigOYk6dOX/P/X0hWxqDDcVAQLb8Yy/0FAaemSfax3PAA67+DJR778oz8qVbmy4hA==", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "cacache": "15.0.5", + "find-cache-dir": "3.3.1", + "jest-worker": "26.3.0", + "p-limit": "3.0.2", + "schema-utils": "2.7.1", + "serialize-javascript": "4.0.0", + "source-map": "0.6.1", + "terser": "5.3.3", + "webpack-sources": "1.4.3" }, "dependencies": { - "schema-utils": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "find-cache-dir": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", + "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "commondir": "1.0.1", + "make-dir": "3.1.0", + "pkg-dir": "4.2.0" } }, - "serialize-javascript": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "randombytes": "^2.1.0" + "locate-path": "5.0.0", + "path-exists": "4.0.0" } }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "4.1.0" + } + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "6.3.0" + } + }, + "p-limit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.2.tgz", + "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==", + "dev": true, + "requires": { + "p-try": "2.2.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "2.3.0" + }, + "dependencies": { + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "2.2.0" + } + } + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "4.1.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "terser": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.3.tgz", + "integrity": "sha512-vRQDIlD+2Pg8YMwVK9kMM3yGylG95EIwzBai1Bw7Ot4OBfn3VP1TZn3EWx4ep2jERN/AmnVaTiGuelZSN7ds/A==", + "dev": true, + "requires": { + "commander": "2.20.3", + "source-map": "0.7.3", + "source-map-support": "0.5.19" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + } + } } } }, @@ -10384,35 +12612,6 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, - "thenify": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz", - "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=", - "dev": true, - "requires": { - "any-promise": "^1.0.0" - } - }, - "thenify-all": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", - "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=", - "dev": true, - "requires": { - "thenify": ">= 3.1.0 < 4" - } - }, - "thread-loader": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-2.1.3.tgz", - "integrity": "sha512-wNrVKH2Lcf8ZrWxDF/khdlLlsTMczdcwPA9VEK4c2exlEPynYWxi9op3nPTo5lAnDIkE0rQEB3VBP+4Zncc9Hg==", - "dev": true, - "requires": { - "loader-runner": "^2.3.1", - "loader-utils": "^1.1.0", - "neo-async": "^2.6.0" - } - }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -10425,8 +12624,25 @@ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" + "readable-stream": "2.3.7", + "xtend": "4.0.2" + }, + "dependencies": { + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } } }, "thunky": { @@ -10441,7 +12657,7 @@ "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", "dev": true, "requires": { - "setimmediate": "^1.0.4" + "setimmediate": "1.0.5" } }, "timsort": { @@ -10456,7 +12672,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "~1.0.2" + "os-tmpdir": "1.0.2" } }, "to-arraybuffer": { @@ -10477,40 +12693,51 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } }, + "to-readable-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", + "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", + "dev": true + }, "to-regex": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "dev": true, "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" } }, "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "7.0.0" } }, "toidentifier": { @@ -10519,20 +12746,38 @@ "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", "dev": true }, - "toposort": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz", - "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=", - "dev": true - }, "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "dev": true, "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "psl": "1.8.0", + "punycode": "2.1.1" + } + }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", + "dev": true + }, + "true-case-path": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", + "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", + "dev": true, + "requires": { + "glob": "7.1.6" + } + }, + "truncate-utf8-bytes": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", + "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=", + "dev": true, + "requires": { + "utf8-byte-length": "1.0.4" } }, "tryer": { @@ -10541,17 +12786,59 @@ "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==", "dev": true }, - "ts-pnp": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz", - "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==", - "dev": true + "ts-loader": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-7.0.5.tgz", + "integrity": "sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==", + "dev": true, + "requires": { + "chalk": "2.4.2", + "enhanced-resolve": "4.3.0", + "loader-utils": "1.4.0", + "micromatch": "4.0.2", + "semver": "6.3.0" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } + } }, "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==", - "dev": true + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", + "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" + }, + "tsutils": { + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz", + "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", + "dev": true, + "requires": { + "tslib": "1.13.0" + }, + "dependencies": { + "tslib": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", + "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "dev": true + } + } }, "tty-browserify": { "version": "0.0.0", @@ -10559,13 +12846,20 @@ "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, + "tunnel": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", + "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", + "dev": true, + "optional": true + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { - "safe-buffer": "^5.0.1" + "safe-buffer": "5.1.2" } }, "tweetnacl": { @@ -10580,14 +12874,15 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "~1.1.2" + "prelude-ls": "1.1.2" } }, "type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", + "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", + "dev": true, + "optional": true }, "type-is": { "version": "1.6.18", @@ -10596,7 +12891,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "~2.1.24" + "mime-types": "2.1.27" } }, "typedarray": { @@ -10605,29 +12900,17 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, + "typescript": { + "version": "3.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz", + "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==", + "dev": true + }, "uglify-js": { - "version": "3.4.10", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz", - "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==", - "dev": true, - "requires": { - "commander": "~2.19.0", - "source-map": "~0.6.1" - }, - "dependencies": { - "commander": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz", - "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - } - } + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.0.tgz", + "integrity": "sha512-e1KQFRCpOxnrJsJVqDUCjURq+wXvIn7cK2sRAx9XL3HYLL9aezOP4Pb1+Y3/o693EPk111Yj2Q+IUXxcpHlygQ==", + "dev": true }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", @@ -10641,8 +12924,8 @@ "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", "dev": true, "requires": { - "unicode-canonical-property-names-ecmascript": "^1.0.4", - "unicode-property-aliases-ecmascript": "^1.0.4" + "unicode-canonical-property-names-ecmascript": "1.0.4", + "unicode-property-aliases-ecmascript": "1.1.0" } }, "unicode-match-property-value-ecmascript": { @@ -10663,10 +12946,10 @@ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "2.0.1" } }, "uniq": { @@ -10687,7 +12970,7 @@ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "dev": true, "requires": { - "unique-slug": "^2.0.0" + "unique-slug": "2.0.2" } }, "unique-slug": { @@ -10696,7 +12979,7 @@ "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", "dev": true, "requires": { - "imurmurhash": "^0.1.4" + "imurmurhash": "0.1.4" } }, "universalify": { @@ -10723,8 +13006,8 @@ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" + "has-value": "0.3.1", + "isobject": "3.0.1" }, "dependencies": { "has-value": { @@ -10733,9 +13016,9 @@ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" }, "dependencies": { "isobject": { @@ -10770,12 +13053,12 @@ "dev": true }, "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz", + "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", "dev": true, "requires": { - "punycode": "^2.1.0" + "punycode": "2.1.1" } }, "urix": { @@ -10803,14 +13086,27 @@ } }, "url-loader": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-2.3.0.tgz", - "integrity": "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.0.tgz", + "integrity": "sha512-IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw==", "dev": true, "requires": { - "loader-utils": "^1.2.3", - "mime": "^2.4.4", - "schema-utils": "^2.5.0" + "loader-utils": "2.0.0", + "mime-types": "2.1.27", + "schema-utils": "2.7.1" + }, + "dependencies": { + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "requires": { + "big.js": "5.2.2", + "emojis-list": "3.0.0", + "json5": "2.1.3" + } + } } }, "url-parse": { @@ -10819,8 +13115,17 @@ "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", "dev": true, "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" + "querystringify": "2.2.0", + "requires-port": "1.0.0" + } + }, + "url-parse-lax": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", + "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", + "dev": true, + "requires": { + "prepend-http": "2.0.0" } }, "use": { @@ -10829,6 +13134,12 @@ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", "dev": true }, + "utf8-byte-length": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", + "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=", + "dev": true + }, "util": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", @@ -10858,10 +13169,31 @@ "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.2", - "has-symbols": "^1.0.1", - "object.getownpropertydescriptors": "^2.1.0" + "define-properties": "1.1.3", + "es-abstract": "1.17.7", + "has-symbols": "1.0.1", + "object.getownpropertydescriptors": "2.1.0" + }, + "dependencies": { + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" + } + } } }, "utila": { @@ -10882,14 +13214,20 @@ "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", "dev": true }, + "v8-compile-cache": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz", + "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==", + "dev": true + }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "spdx-correct": "3.1.1", + "spdx-expression-parse": "3.0.1" } }, "vary": { @@ -10910,9 +13248,9 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "^1.0.0", + "assert-plus": "1.0.0", "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" + "extsprintf": "1.3.0" } }, "vm-browserify": { @@ -10922,52 +13260,49 @@ "dev": true }, "vue": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz", - "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==" - }, - "vue-cli-plugin-vuetify": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.0.5.tgz", - "integrity": "sha512-jtxcidjLT5f1H9QLYKLFjo/ZG42ud4pI9bK3WNO5DXyhiMDMTwSZ7b3NcJVRH7tKYbv5/ty0VPdDGlf4w22AMA==", - "dev": true, - "requires": { - "semver": "^7.1.2", - "shelljs": "^0.8.3" - }, - "dependencies": { - "semver": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", - "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", - "dev": true - } - } + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz", + "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==", + "dev": true }, "vue-eslint-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz", - "integrity": "sha512-JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.1.0.tgz", + "integrity": "sha512-Kr21uPfthDc63nDl27AGQEhtt9VrZ9nkYk/NTftJ2ws9XiJwzJJCnCr3AITQ2jpRMA0XPGDECxYH8E027qMK9Q==", "dev": true, "requires": { - "debug": "^4.1.0", - "eslint-scope": "^4.0.0", - "eslint-visitor-keys": "^1.0.0", - "espree": "^4.1.0", - "esquery": "^1.0.1", - "lodash": "^4.17.11" + "debug": "4.2.0", + "eslint-scope": "5.1.1", + "eslint-visitor-keys": "1.3.0", + "espree": "6.2.1", + "esquery": "1.3.1", + "lodash": "4.17.20" }, "dependencies": { - "espree": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz", - "integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==", + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "acorn": "^6.0.2", - "acorn-jsx": "^5.0.0", - "eslint-visitor-keys": "^1.0.0" + "ms": "2.1.2" } + }, + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "requires": { + "esrecurse": "4.3.0", + "estraverse": "4.3.0" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true } } }, @@ -10978,30 +13313,90 @@ "dev": true }, "vue-loader": { - "version": "15.9.2", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.2.tgz", - "integrity": "sha512-oXBubaY//CYEISBlHX+c2YPJbmOH68xXPXjFv4MAgPqQvUsnjrBAjCJi8HXZ/r/yfn0tPL5VZj1Zcp8mJPI8VA==", + "version": "15.9.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.3.tgz", + "integrity": "sha512-Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA==", "dev": true, "requires": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" - }, - "dependencies": { - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=", - "dev": true - } + "@vue/component-compiler-utils": "3.2.0", + "hash-sum": "1.0.2", + "loader-utils": "1.4.0", + "vue-hot-reload-api": "2.3.4", + "vue-style-loader": "4.1.2" } }, "vue-router": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.2.0.tgz", - "integrity": "sha512-khkrcUIzMcI1rDcNtqkvLwfRFzB97GmJEsPAQdj7t/VvpGhmXLOkUfhc+Ah8CvpSXGXwuWuQO+x8Sy/xDhXZIA==" + "integrity": "sha512-khkrcUIzMcI1rDcNtqkvLwfRFzB97GmJEsPAQdj7t/VvpGhmXLOkUfhc+Ah8CvpSXGXwuWuQO+x8Sy/xDhXZIA==", + "dev": true + }, + "vue-server-renderer": { + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.6.12.tgz", + "integrity": "sha512-3LODaOsnQx7iMFTBLjki8xSyOxhCtbZ+nQie0wWY4iOVeEtTg1a3YQAjd82WvKxrWHHTshjvLb7OXMc2/dYuxw==", + "dev": true, + "requires": { + "chalk": "1.1.3", + "hash-sum": "1.0.2", + "he": "1.2.0", + "lodash.template": "4.5.0", + "lodash.uniq": "4.5.0", + "resolve": "1.17.0", + "serialize-javascript": "3.1.0", + "source-map": "0.5.6" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "serialize-javascript": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz", + "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", + "dev": true, + "requires": { + "randombytes": "2.1.0" + } + }, + "source-map": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", + "dev": true + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + } + } }, "vue-style-loader": { "version": "4.1.2", @@ -11009,26 +13404,18 @@ "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==", "dev": true, "requires": { - "hash-sum": "^1.0.2", - "loader-utils": "^1.0.2" - }, - "dependencies": { - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=", - "dev": true - } + "hash-sum": "1.0.2", + "loader-utils": "1.4.0" } }, "vue-template-compiler": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz", - "integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==", + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz", + "integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==", "dev": true, "requires": { - "de-indent": "^1.0.2", - "he": "^1.1.0" + "de-indent": "1.0.2", + "he": "1.2.0" } }, "vue-template-es2015-compiler": { @@ -11037,25 +13424,11 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, - "vuetify": { - "version": "2.3.9", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.3.9.tgz", - "integrity": "sha512-E5K9flTvS21tCkHgqDBMl0BY/Rld4SLUaJpQ+sQdL8/2uPcWmWLrdumn4SI8LBFojE0UP1GSaH4zKuxLL36fYg==" - }, - "vuetify-loader": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.4.4.tgz", - "integrity": "sha512-ryEtVZ/t+zvTM9UscEX5mWsbTOH5HGWITxlysYkkXtcgzgV21t7rRLHBhReH8oMBYddAij4AOosimhcfKnxFHQ==", - "dev": true, - "requires": { - "file-loader": "^4.0.0", - "loader-utils": "^1.2.0" - } - }, "vuex": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.4.0.tgz", - "integrity": "sha512-ajtqwEW/QhnrBZQsZxCLHThZZaa+Db45c92Asf46ZDXu6uHXgbfVuBaJ4gzD2r4UX0oMJHstFwd2r2HM4l8umg==" + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.5.1.tgz", + "integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw==", + "dev": true }, "watchpack": { "version": "1.7.4", @@ -11063,66 +13436,10 @@ "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==", "dev": true, "requires": { - "chokidar": "^3.4.1", - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0", - "watchpack-chokidar2": "^2.0.0" - }, - "dependencies": { - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "optional": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "chokidar": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", - "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", - "dev": true, - "optional": true, - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "optional": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "optional": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "optional": true, - "requires": { - "is-number": "^7.0.0" - } - } + "chokidar": "3.4.2", + "graceful-fs": "4.2.4", + "neo-async": "2.6.2", + "watchpack-chokidar2": "2.0.0" } }, "watchpack-chokidar2": { @@ -11132,7 +13449,7 @@ "dev": true, "optional": true, "requires": { - "chokidar": "^2.1.8" + "chokidar": "2.1.8" }, "dependencies": { "anymatch": { @@ -11142,8 +13459,8 @@ "dev": true, "optional": true, "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" + "micromatch": "3.1.10", + "normalize-path": "2.1.1" }, "dependencies": { "normalize-path": { @@ -11153,7 +13470,7 @@ "dev": true, "optional": true, "requires": { - "remove-trailing-separator": "^1.0.1" + "remove-trailing-separator": "1.1.0" } } } @@ -11165,6 +13482,35 @@ "dev": true, "optional": true }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, "chokidar": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", @@ -11172,18 +13518,41 @@ "dev": true, "optional": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" + "anymatch": "2.0.0", + "async-each": "1.0.3", + "braces": "2.3.2", + "fsevents": "1.2.13", + "glob-parent": "3.1.0", + "inherits": "2.0.4", + "is-binary-path": "1.0.1", + "is-glob": "4.0.1", + "normalize-path": "3.0.0", + "path-is-absolute": "1.0.1", + "readdirp": "2.2.1", + "upath": "1.2.0" + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, "fsevents": { @@ -11193,8 +13562,7 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0", - "nan": "^2.12.1" + "nan": "2.14.1" } }, "glob-parent": { @@ -11204,8 +13572,8 @@ "dev": true, "optional": true, "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" + "is-glob": "3.1.0", + "path-dirname": "1.0.2" }, "dependencies": { "is-glob": { @@ -11215,7 +13583,7 @@ "dev": true, "optional": true, "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "2.1.1" } } } @@ -11227,7 +13595,70 @@ "dev": true, "optional": true, "requires": { - "binary-extensions": "^1.0.0" + "binary-extensions": "1.13.1" + } + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.3", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "optional": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "readdirp": { @@ -11237,9 +13668,19 @@ "dev": true, "optional": true, "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" + "graceful-fs": "4.2.4", + "micromatch": "3.1.10", + "readable-stream": "2.3.7" + } + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "3.0.0", + "repeat-string": "1.6.1" } } } @@ -11250,16 +13691,7 @@ "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, "requires": { - "minimalistic-assert": "^1.0.0" - } - }, - "wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "dev": true, - "requires": { - "defaults": "^1.0.3" + "minimalistic-assert": "1.0.1" } }, "webpack": { @@ -11272,37 +13704,262 @@ "@webassemblyjs/helper-module-context": "1.9.0", "@webassemblyjs/wasm-edit": "1.9.0", "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.3.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "acorn": "6.4.1", + "ajv": "6.12.5", + "ajv-keywords": "3.5.2", + "chrome-trace-event": "1.0.2", + "enhanced-resolve": "4.3.0", + "eslint-scope": "4.0.3", + "json-parse-better-errors": "1.0.2", + "loader-runner": "2.4.0", + "loader-utils": "1.4.0", + "memory-fs": "0.4.1", + "micromatch": "3.1.10", + "mkdirp": "0.5.5", + "neo-async": "2.6.2", + "node-libs-browser": "2.2.1", + "schema-utils": "1.0.0", + "tapable": "1.1.3", + "terser-webpack-plugin": "1.4.5", + "watchpack": "1.7.4", + "webpack-sources": "1.4.3" }, "dependencies": { + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "cacache": { + "version": "12.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", + "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", + "dev": true, + "requires": { + "bluebird": "3.7.2", + "chownr": "1.1.4", + "figgy-pudding": "3.5.2", + "glob": "7.1.6", + "graceful-fs": "4.2.4", + "infer-owner": "1.0.4", + "lru-cache": "5.1.1", + "mississippi": "3.0.0", + "mkdirp": "0.5.5", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.7.1", + "ssri": "6.0.1", + "unique-filename": "1.1.1", + "y18n": "4.0.0" + } + }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-wsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", + "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", + "dev": true + }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "3.1.1" + } + }, + "memory-fs": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", + "dev": true, + "requires": { + "errno": "0.1.7", + "readable-stream": "2.3.7" + } + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.3", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "7.1.6" + } + }, "schema-utils": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "ajv": "6.12.5", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.5.2" } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "ssri": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "dev": true, + "requires": { + "figgy-pudding": "3.5.2" + } + }, + "terser-webpack-plugin": { + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", + "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", + "dev": true, + "requires": { + "cacache": "12.0.4", + "find-cache-dir": "2.1.0", + "is-wsl": "1.1.0", + "schema-utils": "1.0.0", + "serialize-javascript": "4.0.0", + "source-map": "0.6.1", + "terser": "4.8.0", + "webpack-sources": "1.4.3", + "worker-farm": "1.7.0" + } + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "3.0.0", + "repeat-string": "1.6.1" + } + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true } } }, @@ -11312,37 +13969,48 @@ "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==", "dev": true, "requires": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1", - "bfj": "^6.1.1", - "chalk": "^2.4.1", - "commander": "^2.18.0", - "ejs": "^2.6.1", - "express": "^4.16.3", - "filesize": "^3.6.1", - "gzip-size": "^5.0.0", - "lodash": "^4.17.15", - "mkdirp": "^0.5.1", - "opener": "^1.5.1", - "ws": "^6.0.0" + "acorn": "7.4.0", + "acorn-walk": "7.2.0", + "bfj": "6.1.2", + "chalk": "2.4.2", + "commander": "2.20.3", + "ejs": "2.7.4", + "express": "4.17.1", + "filesize": "3.6.1", + "gzip-size": "5.1.1", + "lodash": "4.17.20", + "mkdirp": "0.5.5", + "opener": "1.5.2", + "ws": "6.2.1" }, "dependencies": { "acorn": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz", - "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", + "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", "dev": true + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } } } }, "webpack-chain": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.4.0.tgz", - "integrity": "sha512-f97PYqxU+9/u0IUqp/ekAHRhBD1IQwhBv3wlJo2nvyELpr2vNnUqO3XQEk+qneg0uWGP54iciotszpjfnEExFA==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz", + "integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==", "dev": true, "requires": { - "deepmerge": "^1.5.2", - "javascript-stringify": "^2.0.1" + "deepmerge": "1.5.2", + "javascript-stringify": "2.0.1" } }, "webpack-dev-middleware": { @@ -11351,11 +14019,44 @@ "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==", "dev": true, "requires": { - "memory-fs": "^0.4.1", - "mime": "^2.4.4", - "mkdirp": "^0.5.1", - "range-parser": "^1.2.1", - "webpack-log": "^2.0.0" + "memory-fs": "0.4.1", + "mime": "2.4.6", + "mkdirp": "0.5.5", + "range-parser": "1.2.1", + "webpack-log": "2.0.0" + }, + "dependencies": { + "memory-fs": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", + "dev": true, + "requires": { + "errno": "0.1.7", + "readable-stream": "2.3.7" + } + }, + "mime": { + "version": "2.4.6", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz", + "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==", + "dev": true + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + } } }, "webpack-dev-server": { @@ -11365,54 +14066,48 @@ "dev": true, "requires": { "ansi-html": "0.0.7", - "bonjour": "^3.5.0", - "chokidar": "^2.1.8", - "compression": "^1.7.4", - "connect-history-api-fallback": "^1.6.0", - "debug": "^4.1.1", - "del": "^4.1.1", - "express": "^4.17.1", - "html-entities": "^1.3.1", + "bonjour": "3.5.0", + "chokidar": "2.1.8", + "compression": "1.7.4", + "connect-history-api-fallback": "1.6.0", + "debug": "4.2.0", + "del": "4.1.1", + "express": "4.17.1", + "html-entities": "1.3.1", "http-proxy-middleware": "0.19.1", - "import-local": "^2.0.0", - "internal-ip": "^4.3.0", - "ip": "^1.1.5", - "is-absolute-url": "^3.0.3", - "killable": "^1.0.1", - "loglevel": "^1.6.8", - "opn": "^5.5.0", - "p-retry": "^3.0.1", - "portfinder": "^1.0.26", - "schema-utils": "^1.0.0", - "selfsigned": "^1.10.7", - "semver": "^6.3.0", - "serve-index": "^1.9.1", + "import-local": "2.0.0", + "internal-ip": "4.3.0", + "ip": "1.1.5", + "is-absolute-url": "3.0.3", + "killable": "1.0.1", + "loglevel": "1.7.0", + "opn": "5.5.0", + "p-retry": "3.0.1", + "portfinder": "1.0.28", + "schema-utils": "1.0.0", + "selfsigned": "1.10.8", + "semver": "6.3.0", + "serve-index": "1.9.1", "sockjs": "0.3.20", "sockjs-client": "1.4.0", - "spdy": "^4.0.2", - "strip-ansi": "^3.0.1", - "supports-color": "^6.1.0", - "url": "^0.11.0", - "webpack-dev-middleware": "^3.7.2", - "webpack-log": "^2.0.0", - "ws": "^6.2.1", - "yargs": "^13.3.2" + "spdy": "4.0.2", + "strip-ansi": "3.0.1", + "supports-color": "6.1.0", + "url": "0.11.0", + "webpack-dev-middleware": "3.7.2", + "webpack-log": "2.0.0", + "ws": "6.2.1", + "yargs": "13.3.2" }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, "anymatch": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" + "micromatch": "3.1.10", + "normalize-path": "2.1.1" }, "dependencies": { "normalize-path": { @@ -11421,7 +14116,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "^1.0.1" + "remove-trailing-separator": "1.1.0" } } } @@ -11432,52 +14127,62 @@ "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", "dev": true }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, "chokidar": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", "dev": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" + "anymatch": "2.0.0", + "async-each": "1.0.3", + "braces": "2.3.2", + "fsevents": "1.2.13", + "glob-parent": "3.1.0", + "inherits": "2.0.4", + "is-binary-path": "1.0.1", + "is-glob": "4.0.1", + "normalize-path": "3.0.0", + "path-is-absolute": "1.0.1", + "readdirp": "2.2.1", + "upath": "1.2.0" } }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + "ms": "2.1.2" } }, "emoji-regex": { @@ -11486,13 +14191,27 @@ "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", "dev": true }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "locate-path": "^3.0.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } } }, "fsevents": { @@ -11502,8 +14221,7 @@ "dev": true, "optional": true, "requires": { - "bindings": "^1.5.0", - "nan": "^2.12.1" + "nan": "2.14.1" } }, "glob-parent": { @@ -11512,8 +14230,8 @@ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" + "is-glob": "3.1.0", + "path-dirname": "1.0.2" }, "dependencies": { "is-glob": { @@ -11522,7 +14240,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "2.1.1" } } } @@ -11539,52 +14257,86 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "^1.0.0" + "binary-extensions": "1.13.1" } }, - "locate-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", - "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", - "dev": true, - "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", - "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", - "dev": true, - "requires": { - "p-limit": "^2.0.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "requires": { + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.3", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, "readdirp": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" + "graceful-fs": "4.2.4", + "micromatch": "3.1.10", + "readable-stream": "2.3.7" } }, "schema-utils": { @@ -11593,9 +14345,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "ajv": "6.12.5", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.5.2" } }, "semver": { @@ -11610,9 +14362,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "7.0.3", + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "5.2.0" }, "dependencies": { "ansi-regex": { @@ -11627,7 +14379,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "4.1.0" } } } @@ -11638,7 +14390,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "supports-color": { @@ -11647,35 +14399,17 @@ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", - "dev": true, - "requires": { - "ansi-regex": "^4.1.0" - } - } + "is-number": "3.0.0", + "repeat-string": "1.6.1" } }, "yargs": { @@ -11684,26 +14418,16 @@ "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" - } - }, - "yargs-parser": { - "version": "13.1.2", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", - "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "cliui": "5.0.0", + "find-up": "3.0.0", + "get-caller-file": "2.0.5", + "require-directory": "2.1.1", + "require-main-filename": "2.0.0", + "set-blocking": "2.0.0", + "string-width": "3.1.0", + "which-module": "2.0.0", + "y18n": "4.0.0", + "yargs-parser": "13.1.2" } } } @@ -11714,8 +14438,8 @@ "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", "dev": true, "requires": { - "ansi-colors": "^3.0.0", - "uuid": "^3.3.2" + "ansi-colors": "3.2.4", + "uuid": "3.4.0" } }, "webpack-merge": { @@ -11724,17 +14448,23 @@ "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", "dev": true, "requires": { - "lodash": "^4.17.15" + "lodash": "4.17.20" } }, + "webpack-node-externals": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-2.5.1.tgz", + "integrity": "sha512-RWxKGibUU5kuJT6JDYmXGa3QsZskqIaiBvZ2wBxHlJzWVJPOyBMnroXf23uxEHnj1rYS8jNdyUfrNAXJ2bANNw==", + "dev": true + }, "webpack-sources": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", "dev": true, "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" + "source-list-map": "2.0.1", + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -11751,22 +14481,28 @@ "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=", "dev": true, "requires": { - "websocket-extensions": ">=0.1.1" + "websocket-extensions": "0.1.4" } }, "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", + "dev": true + }, + "when": { + "version": "3.6.4", + "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz", + "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=", "dev": true }, "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "which-module": { @@ -11775,6 +14511,15 @@ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "dev": true, + "requires": { + "string-width": "2.1.1" + } + }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -11787,7 +14532,16 @@ "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", "dev": true, "requires": { - "errno": "~0.1.7" + "errno": "0.1.7" + } + }, + "worker-rpc": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/worker-rpc/-/worker-rpc-0.1.1.tgz", + "integrity": "sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==", + "dev": true, + "requires": { + "microevent.ts": "0.1.1" } }, "wrap-ansi": { @@ -11796,9 +14550,9 @@ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "ansi-styles": "4.2.1", + "string-width": "4.2.0", + "strip-ansi": "6.0.0" }, "dependencies": { "ansi-styles": { @@ -11807,8 +14561,8 @@ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" + "@types/color-name": "1.1.1", + "color-convert": "2.0.1" } }, "color-convert": { @@ -11817,7 +14571,7 @@ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "color-name": "~1.1.4" + "color-name": "1.1.4" } }, "color-name": { @@ -11838,9 +14592,9 @@ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "emoji-regex": "8.0.0", + "is-fullwidth-code-point": "3.0.0", + "strip-ansi": "6.0.0" } } } @@ -11857,7 +14611,46 @@ "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", "dev": true, "requires": { - "mkdirp": "^0.5.1" + "mkdirp": "0.5.5" + } + }, + "write-file-atomic": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz", + "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", + "dev": true, + "requires": { + "graceful-fs": "4.2.4", + "imurmurhash": "0.1.4", + "signal-exit": "3.0.3" + } + }, + "write-file-webpack-plugin": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/write-file-webpack-plugin/-/write-file-webpack-plugin-4.5.1.tgz", + "integrity": "sha512-AZ7qJUvhTCBiOtG21aFJUcNuLVo2FFM6JMGKvaUGAH+QDqQAp2iG0nq3GcuXmJOFQR2JjpjhyYkyPrbFKhdjNQ==", + "dev": true, + "requires": { + "chalk": "2.4.2", + "debug": "3.1.0", + "filesize": "3.6.1", + "lodash": "4.17.20", + "mkdirp": "0.5.5", + "moment": "2.29.0", + "write-file-atomic": "2.4.3" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" + } + } } }, "ws": { @@ -11866,9 +14659,21 @@ "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", "dev": true, "requires": { - "async-limiter": "~1.0.0" + "async-limiter": "1.0.1" } }, + "xmlbuilder": { + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", + "dev": true + }, + "xmldom": { + "version": "0.1.31", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.31.tgz", + "integrity": "sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==", + "dev": true + }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", @@ -11882,38 +14687,49 @@ "dev": true }, "yallist": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, "yargs": { - "version": "15.3.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz", - "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==", + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dev": true, "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.1" + "cliui": "6.0.0", + "decamelize": "1.2.0", + "find-up": "4.1.0", + "get-caller-file": "2.0.5", + "require-directory": "2.1.1", + "require-main-filename": "2.0.0", + "set-blocking": "2.0.0", + "string-width": "4.2.0", + "which-module": "2.0.0", + "y18n": "4.0.0", + "yargs-parser": "18.1.3" }, "dependencies": { + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "requires": { + "string-width": "4.2.0", + "strip-ansi": "6.0.0", + "wrap-ansi": "6.2.0" + } + }, "find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" + "locate-path": "5.0.0", + "path-exists": "4.0.0" } }, "is-fullwidth-code-point": { @@ -11928,16 +14744,7 @@ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "^4.1.0" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" + "p-locate": "4.1.0" } }, "p-locate": { @@ -11946,15 +14753,9 @@ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "^2.2.0" + "p-limit": "2.3.0" } }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -11967,90 +14768,49 @@ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "emoji-regex": "8.0.0", + "is-fullwidth-code-point": "3.0.0", + "strip-ansi": "6.0.0" + } + }, + "yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "requires": { + "camelcase": "5.3.1", + "decamelize": "1.2.0" } } } }, "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "dev": true, "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "camelcase": "5.3.1", + "decamelize": "1.2.0" } }, - "yorkie": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/yorkie/-/yorkie-2.0.0.tgz", - "integrity": "sha512-jcKpkthap6x63MB4TxwCyuIGkV0oYP/YRyuQU5UO0Yz/E/ZAu+653/uov+phdmO54n6BcvFRyyt0RRrWdN2mpw==", + "zip-stream": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.0.2.tgz", + "integrity": "sha512-TGxB2g+1ur6MHkvM644DuZr8Uzyz0k0OYWtS3YlpfWBEmK4woaC2t3+pozEL3dBfIPmpgmClR5B2QRcMgGt22g==", "dev": true, "requires": { - "execa": "^0.8.0", - "is-ci": "^1.0.10", - "normalize-path": "^1.0.0", - "strip-indent": "^2.0.0" - }, - "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - } - }, - "execa": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz", - "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=", - "dev": true, - "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", - "dev": true, - "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" - } - }, - "normalize-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz", - "integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=", - "dev": true - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - } + "archiver-utils": "2.1.0", + "compress-commons": "4.0.1", + "readable-stream": "3.6.0" } + }, + "zlib": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/zlib/-/zlib-1.0.5.tgz", + "integrity": "sha1-bnyXL8NxxkWmr7A6sUdp3vEU/MA=", + "dev": true } } } diff --git a/package.json b/package.json index 58ab58e..443ebba 100644 --- a/package.json +++ b/package.json @@ -1,61 +1,46 @@ { - "name": "newgruecht-vue", - "version": "1.1.0", + "name": "flaschengeist-frontend", + "version": "0.0.1", + "description": "Dynamischen Managementsystem für Studentenclubs", + "productName": "Flaschengeist", + "author": "Tim Gröger ", "private": true, "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint" + "lint": "eslint --ext .js,.ts,.vue ./", + "test": "echo \"No test specified\" && exit 0" }, "dependencies": { - "@mdi/font": "^4.9.95", - "@mdi/js": "^4.9.95", + "@quasar/extras": "^1.0.0", + "@vue/composition-api": "^0.6.4", + "axios": "^0.18.1", "core-js": "^3.6.5", - "vue": "^2.6.10", - "vue-router": "^3.2.0", - "vuetify": "^2.3.8", - "vuex": "^3.4.0" + "quasar": "^1.0.0" }, "devDependencies": { - "@vue/cli-plugin-babel": "^4.3.1", - "@vue/cli-plugin-eslint": "^4.3.1", - "@vue/cli-plugin-router": "^4.3.1", - "@vue/cli-plugin-vuex": "^4.3.1", - "@vue/cli-service": "^4.3.1", - "@vue/eslint-config-prettier": "^6.0.0", - "axios": "^0.19.2", - "babel-eslint": "^10.1.0", - "eslint": "^5.16.0", - "eslint-plugin-prettier": "^3.1.3", - "eslint-plugin-vue": "^5.0.0", - "material-design-icons-iconfont": "^5.0.1", - "prettier": "^1.19.1", - "sass": "^1.26.5", - "sass-loader": "^8.0.2", - "vue-cli-plugin-vuetify": "^2.0.5", - "vue-template-compiler": "^2.6.10", - "vuetify-loader": "^1.4.4" - }, - "eslintConfig": { - "root": true, - "env": { - "node": true - }, - "extends": [ - "plugin:vue/essential", - "plugin:prettier/recommended", - "@vue/prettier", - "eslint:recommended" - ], - "rules": { - "no-console": "off" - }, - "parserOptions": { - "parser": "babel-eslint" - } + "@quasar/app": "^2.0.0", + "@types/node": "^10.17.15", + "@typescript-eslint/eslint-plugin": "^3.3.0", + "@typescript-eslint/parser": "^3.3.0", + "babel-eslint": "^10.0.1", + "eslint": "^6.8.0", + "eslint-config-prettier": "^6.9.0", + "eslint-loader": "^3.0.3", + "eslint-plugin-vue": "^6.1.2" }, "browserslist": [ - "> 1%", - "last 2 versions" - ] + "last 10 Chrome versions", + "last 10 Firefox versions", + "last 4 Edge versions", + "last 7 Safari versions", + "last 8 Android versions", + "last 8 ChromeAndroid versions", + "last 8 FirefoxAndroid versions", + "last 10 iOS versions", + "last 5 Opera versions" + ], + "engines": { + "node": ">= 10.18.1", + "npm": ">= 6.13.4", + "yarn": ">= 1.21.1" + } } diff --git a/public/favicon.ico b/public/favicon.ico index df36fcfb72584e00488330b560ebcf34a41c64c2..7ace6d1953b07433b2472c49705ed7dfed5876a1 100644 GIT binary patch literal 16645 zcmb8W1zc56*EYNlozkrW(x7w;(v1?*9nvXM(w)+w2uPQ7OE;)=Bb`#xb$|os-N^sG zzvp|N@4dhGo!{^5z1Ga^*)y|et?OEQ&ISMofDYUx2tWncQUX9SDEs-{>!la~fItNR zMn?BK9x4EoGXsFE?7bd`1OV+E03a%QulFGWfC?`Fu(RLm%Lo8KDhL2nU>kSscR~OF zDg@?{-s>8m-uMClaB=VTGXRvqw!)QP$zWrUgLen8kSIt8^Tzz#O%yZn_sh~t-tuqd43c+{#xkaveaUc0iVAZW{FV`=dDwijtE+ZccwP=#Fkv)i~k3~uF zh%2K`4=GE{ek1gz+acZ~zDibIj$XP$%#5@MbDP%rno<6#5m%f&-4UA`p%rb*tHuWl z$q}nUZxZcuFEW#p3chq#2RmfW>8fPLqC=ZJgeRiy**~8WIr}n3FmitvQCKw;$+L5R znZwXnPS}IS{Yi;ou-$`s>{R9=D?1k%dzLM3;`H~ZQRX*HY~@8R&GnTN%*N`>cbF}@0)UF%VJ-@ zpFHs>VTu+DT%|cJR4d7miROAlj+8T!qwN0<#p5A!a@MOhT;UzUf|=0A2@!OK)tI9> zFW)9FZXFe&iKWls2sb9mwm%om5R1|5!JSA+(~0C7?f%l+<*ZhDSi$$Apo5~Od9lgn zRq3>ucfvuw~g3O+S6%k@yL)(_-og zVi{S}vx2x_w1p6)5;51P@BlUail?76qs7xZwBMT`&lZvcUMk^_ugP#+I!R9%V*xug zY{2TM+>-JQ?Zlzf)|Zb6e{;q$_d-ATlV2k_J17M5ens&UeUsIK=UEun7O-zdks0+B zLdE`kJ*SB+bF2Y0DdAa`%0TinALsH}q`PLM`O)`MwM4Ohl=qnv-c@1m zB^kX9=brF;H!2+V_ukUme&;H*Ss}X7`vUh>hAu{ZA_ympibsS){bApPje)1#6 zT@5WUf*8&TTr!vMeK?jmpQk1h@xl_4nET!$%=#)9LRiHw{30{4ZRFFE_@&=Nq(nV& zQ6`0HSkI9lcJmb;Hm2(*@L#zP_oQ}}^Gtp7_^>PyQHk0fWg?k8n@!LVtFPP5j7p0x zd#Jg$LA)!p1muji)*z^>E&aAZttq+*BRM~2HcbefBr21>eogpwSz(Jf8o}~i0j!6? zj%Cu&OYD{OwHne_tzOzwG|bs`yX_oAYcGn-7VC#!$HTXzqwpL(KCp)X*Yj7_6o zcresuMTo}%J7^Hp%m}$xw8kMylt??={s*Iqnm3X??6Ee_A|CcHR@^;4)ItQ2+DTO& z?9i59zc%V_)80a{eQJ)hQ-kVG1%(p#yw}QiTgE8|&VSp6*^At4_CGJZ6|M=DFfNWG zfAGkPT(9J{XZb}0bI#GAj^4ZOaK78Tf@_QO1;-NKc$Zxk*FnONN*0Car0WtN0bcki zN=*!+7;-)SZ=7+p+S-n@gaY0<=!w5p)h6!zA-cX4>U(RXwGAA~xfyFX?QSz9wRy*b z&yBQ>WU^N0_esY5n`%=1QJ+_s%#Oag&&C&*cb?m|m1fsqQYJ}JywD!@R%X*#dNu4| zRqq>rc5^GR*g?)0O>lzKFA!7kz#u);u2wtOa{gg%z!%$MDX8bz!Lm+e&QFcXXj8jZ z-ChgziT<)<;ZL<9&rTS2QMqlFhXo1YT*fg6Rg1#*F{LI_Yh$=X6F=1}4o1tR8WDHr za2zakp4LcFmu|UbGx5&;`LWZc=40b<9BSr2m{GDTV@JYf!>PR+kaV52(Nh=U&N92i zl!frZI)})k`5Vnd`wpj`&yMTd2c2)fbgehVE|=@;YdXR%6L`#v{z!}<6GbgrSq;$Z zj_1R4Mmgz4J)2(^+G>338hgDsUpg5jsiVSO-X3XY)b@8KiikC`+!{M$45Bda z229!=CCiUi-FzQArM(>gFL-=R#a+l#k2q~ z@9g`jP($x6D$QuCLjVS+d}F?_bg1rW0vd3s4&}No4M&WBNp98k(D*ipm2~Eo&AvWv zuH>VQQc;o;8|)XbP2Sqp@>4!Eughk4A?;YCYUXxNcsnJd`%|CU%zpj(NOGQZ%Tii{aB;fy_jt8?_5m?B5t22%@u*Y-~OB~ zhU#YPJYlAE-Nbiz+-HA#Ts~s~huX@i)65%{hU0i<^~aW=7c1m7W#bV6k~Zhud!utZ zxgtvQyTyt^G-9bOd9I1ZtfQGxM0Af2t6%o^GGO z>_&G77aU(p$qBK<(Q9np*x60fo*LK(A5<;0Wj?U?%Dqf@$5sg2ttFxx(;pv9zI-k_ zg;43#)HdKNG^f;XIQqNXzI`FFx|WqdM$VK42(x#T&NAhkgr)t&w997PooDEFLvEB! zh404awYkSOM3TirmX%J}b^Qyid=YB=SE&dtUa3+)0)FOVv`TDc$4CNOUWW6L{kkgY;T8&i$pjuzM*EEu(Sph6<6^9;} zcIpvXbU9*LUQAQarFHHQOs1AAcW}ueoPzBn^O_+V|5bSFaLpy0UVW_3{CCH58pe2Z zQ6J%+{nFODtt-BpGdH{WOEKS@XU^SUg&J(z%KY|I`6ES2k;v?R!bIYjR}2gO1iFdO z$UZgpxy)I+UG64^5l$J>@13Cx3^@qq_OPv280cuspTe~fH`n>{#(qC-g&CnVisaDB zDIx=vQ3}p$sar_n4p(;1Tuy@1Dh~HL8U!{LTO9VzTE}}|8>bZR!x=tb!3u_6!BGcm z-R6`8F;Y3L?O(;u=Yb@1m?n4Hz#HMLw)wNDyVwuSrM_;=7g(vu@TZyS$BE2AV z9d@sekCKhpWe!egyM1^x8f7nt5Q+^%d!0Z3f&X*8|KKpIFMQXu0viQ|2mUcnKFHoS zytnPSc@;V_jnUm^sd`4}C}W>Zku>H#@nVN09VeT`V9e zv8|lv#DO__QyX45wrO{vntthBNDsJ)A^@CAlukd-Hr-MkFb$-t5qe(gJy)WVeCzqU zO?tJw(dR<~PNHnwLja@LWqa7A%zY|KK`wR}xVm_fg}U%*k4c7I{oUedsAQS9g6~ZZ z0-IJ&hVZ5ymbll@&S_io)WRe@h`yAl-*pkm7bElC70Wi41I;-#A@$>Wa)2L#G`qaF z-TLF2_G?);(oh6p4xl`peAy%i>YuH}YX*xs1suZ-Xwphj;XD<@JNlEqhKd`nYZ z;C+TD%C<{KRrka&@U)pR!pI$Q=>^CD{HJpod60HoqNJonzk*N?3;mJN>-rP6mqjdPd;2fb1t|2_ zwJOr>JABH0Uyavg1#;64z+XDcsT%JtBNs=QQ@%C%KGIfe1630&SlckzPcGfEW)v57 z1I9LvE%+i){Zt|&M<%&D+buG1%wSVBB5aiU&wALyf!JWyFhlv^aw`MIPszVf^32S7 zqcTd$_~wJkObC3q*b49qY@0UIbsV}sdpLBINf?MFC5$_(;6pMo^kbdln)AujrQ41h z3ojGYHDi>l$$0^&+}w~-+d*-dgOQ^vWQ0xZfnhfX0K4pHof^nc_UV9Frk`w+=nA6M zsMUw_EJD*zbS45d7D(f8fDhYB0muzgL#7lfi;FnAe7@qS{bpswS9zO%4u`8kMm3;_T9=z#OOb=#-y(SWVeE&cor>6i!1$VGjB z8nKtzdyYnHCbH9c_HWzzSA;V<9$JW^06#Dv#wtk~G9*HU5Ad@@_Gb<*er{ZHW~q7E zs66X}4QzKnmdm%qgTy$SVvB`@y=dqE*rCh4PrtG2;79U{155nbbYzkJ8U$vZmDP!+ z3MGX^dqHM-^&!=MduF4;gzXR`@0W8f|~s`hvU+ zRA7MvkVOGVL=g4#VDFd!c76I8Y{0=T$l@Fw3)N50nYxqe5nx^>5>{ryHPm|8=NMRD zKzC5?SEqs}+-}VU2(>XchWhgZMmWx)l7c|mtG*BV2zK@&9?&EIE%PdJ;IXz|Xqmkc zKk%(#Y=dAMSe~^2X6Jn-DqoX0bG<(pJu}dSEc+vmJ^)6a2^-S@Ld+M6?`AUx_cU3J zSOCXY{)L?os3=<$!`^0MuSETWsMh&7U4LHOKBH+dBZf_n=O=S)t zKuQ5wE)xJ7jC=9(4GZ9vFqYT^%+C09r-bTv^d>JG{+795`HUz^c7LUo*9k5**dynz zXKtCP+oWj~5`w^~HsKynK?2Us3>L5;Z7ZQkVs9@(em2IkWo{kf43JhlorNsZfYW2d z1yqdaO}3!UFYgr+5#bcBPPci-|@xWT^<4UzIG%vtz4T!ffUWc4btI< zH+~IsIZe?+5F?@c8hW3QGqJzOljy(YX?(9E#R-&%;O@=&1&#!xbaw}t=K-IGu1@`8)IxmnJjd&OuFUMmZTt@j9{_H5t4<`E56W zp3ylmb!CGO)aI_W{=_C6JfJbEdmjz@eq*|>SILKBmVPe_vh2-_D0F7&fnwqC#LdXn$HZi@0eDWo52Vx$*FN3e^^uW_fipqCUEOCXZAG0;dz1Pa zfxuO^vWrWU`U$*w&R2Aof-qcBtS$Efl5?f!{sfQ|Z*%C0yN7o zGp^TIx(DIk{W`X+L&Qy}V_kfaUI)@4w6i;l#i~s`I#0GQK3#-nc6&OxwoZdo(BR{W zZi~Wp;!4by`H7m@40b{IK_rTu^_AQ7s5bB-jC(yD!2$MFwLHHgD#L$;?E@Z{uYnk( z(IYDk13-WIBWkEo^aEL{ z5HCkw-VZ(-XQKIShY`iiJiAZ4b(_^u*yed$&2}2?0Glw2~a{iCUSZ_qw8( zd=X?CB|3X&6wt(rYSuPebJrI-u++JITMS||)CCW$9`1&K3xwG*TzTaks=0J5!0TJK z8RB``qdi2D2;G?n0D4PxSJ9b&#}5ebWh#h7Y1XD)Fdd5#MHCqzE*DEwiN{C%#x4Lf zM=EQ^yRB7vT<@GBrXUEVY(6sppO1p}t7ooA_<%cJw{zFc+cH*M z=Iu(}rNyq%P!wq+tOwtTYU$w7`FYaLZQ2~gEO zsEF8Cq#-ZIOs6fG=Es$@eWN3uIu{e9Wy%Avf0u4%>nyJ~XD&E5I1uJwF+6q199;NP z_Lz+rC{rQ=q!nO2#ZMR7UkM*0ZS_zRrga7NT%8<+njuNY;@ze%9~b?l5hTl1O2K8NS{U~o|yz5 zD~dpt-SBl2CLK5|lte$*`1Wh7sGE<3NFdp+_&D9i+x}HUWt*--#;>i)$U<|qB&@T@+*{T$Z9aLKmQ=50!XB9fnyToP*pYG5|KCjZ(B zb}wSP8|5$DuZml(c>5W>Bfsm9oIhdy5MO0(J>Ef>j-D}}hZ&0?x*G)VXSfB$`#jF8 z{sD}rd`-Mm7sQN>$HYqa6&-+;Tr(VCs+CmBCppwut!ATBRF=2!jkM-JJE

G%=kuTi482x#?mvL$4C$1Yr7A>y~TXQkJ%# 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 F{{=TRZEpYo literal 4286 zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56 zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei z@g6Xq-pDoPl=MANPiR7%172VA%r)kevtV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp= zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8 zx!=3<4seY*%=OlbCbcae?5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3 z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD zsW0Ab)ZK@0cIW%W7z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6 z={Xwx{TKxD#iCLfl2vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S diff --git a/public/icons/favicon-128x128.png b/public/icons/favicon-128x128.png new file mode 100644 index 0000000000000000000000000000000000000000..2d6e88c25a81b66e9ac0e5436eee56214e6cab62 GIT binary patch literal 4565 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 hV$}~8!lvI6;x#X;^) z4C~IxyaaMi2Ka=y{`>d;&)>iQVc;JK{C6+#`TO@DL=42o0LX%H-5({`1dm z`B(eJUo01V5h}VMTY35Ni(hZP{^iL#FJ5|)J^NhJmT!08{@(xK*Xc*!ryYFt_2*wP zWzC&eKdwLj-gn9!|te!>4<%L_4{_{i{^dBzg0xPVqu=iN7r zEFNvI{{&JO?7E1zniX3iB!YBhl%$e{agl*>LSdipWU;xO}8?Yv=GJ#YV6i}Mc4cRsmZw%pm)FfHQ$%#y2U*w*2L^oe*w;0)-XUMC8ttJ+64H@bptvH>H#H9Fl#U zo5C0v6BW8P<-A3zi<<=g7tp6W3>YvT@-#2~LuL-rwR==LN>9bZ(^T(0TmzukHUTxrd$NSLbk5kftqTOtV;}?I+ z?VP3GIB$A{hxfLNXFEMPjHS#M#LBE?dLgBltM}9KfWeDnnRA~#J-Byn;%;uM;yJD_ ze`W2u+xYaB|CygWrfKYY{Z<_BxY(yvp1eD)FvQ=c{On8LsYlt&Jl0)U_wMy!`^#M` z*W{i*&Em#2`Ou60*@js;`4W@E*I2}`7EU^%;PGKM|Dw;uUvDwHOxe83LazHMPfT6T z-=K0<4nEmZxe{RnI(n{CArhh(X2u5Y!d@TO4w|l=%S<(xiOqGAYWX#~{>gTe~ HDWM4f4HOdQ literal 0 HcmV?d00001 diff --git a/public/icons/favicon-96x96.png b/public/icons/favicon-96x96.png new file mode 100644 index 0000000000000000000000000000000000000000..3a50144db88079f41dba7606afe161a6e11ea627 GIT binary patch literal 3295 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 MU&k2H1b2x4KP_%wSO5S3 literal 0 HcmV?d00001 diff --git a/public/index.html b/public/index.html deleted file mode 100644 index ec4c4c7..0000000 --- a/public/index.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - Flaschengeist - - - - - -

- - - diff --git a/public/wuicon.ico b/public/wuicon.ico deleted file mode 100644 index a702ff9e78f0187eb3c53ba07d179daefa9ace5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3518 zcmcK53y@D$9KiAa+Pq30sYngGJ&Y0xl`!_|Nza)WG~Q$Ks7M;s>?n&OLP^c2$@UmR zFJ={u=aorQl9);wv#piKQfXsY*7ooF{qMcm*;zfN{LJT`bI(2Z+;e{C{8u88#=j;R z39cE5g=Z%c=O+@07HEP1wx5Qmc^by7YRGqJtO1vEx?%|fCovCwqmK-wB%A+R^kAe- zIDjKjxrVX?&0$n8FRHxOr*(RjPs$q`QRHDSW}!FC-9ChHeILMmYm2I4ER8#0-}Y5? zplusQV-Jd8-)8s~KjIhImJh=m)=Je*Ugl7>k0wUVHKNiY8`~?~Tg`xZyA?;_^J8!f z=ll@jJW}P@mp?NXQ;`nGU4S^2#+6E?xpdrTqjD={8T_7O9KxkA2E)G1&;dq6*k;tm zGR%eZ{1BdlFX0}oM+O{w0(!xBeQus!gmDkdabs_Y;W!Vo;Wy@E1WJ$v^Kma8#VWjv zjc^Rt(;0{1x29n=j61PARV%-2pm+h97=|s#f%`TF&hsO5#Vc@}$*|qAJHqGIS7HvX zM>`ZDj!9I^k6~Z)vJTGOv5ltq1T(Q2&T}b_!x#kLmCswF8}`Gvq`XMY?Lz8nF$xRu z4bl*YXEqnE{Teu?=g$0iE`EY%q8RSuU5LN)8Fj}$BWmwLc^h0$oM)njjq2uX3F2`r z+rWIUMP1mZ1aTkdaTPo-S0WESONZyKEi%ywO|cUb;N0Bj-(hYqLtps(KD>$@*oTiX z5Pn-mXZW4gcm&_W_b!L)NrUVD4nEro-}O7yF%RZB6Fzq==VW*mpGeipFEc2dbAQ-R zo)OPpOBl7$8_QvyGO!M#FdDbRZ~E>=)Wdc70u^I8H#fq53*ekQ(+yD{##1<&s+C{N z>(w}pMfd^kk-0a1LujQ!q)~ql&gET9!vh$E?ih?=Xb;zPCd{=8Fa(7#H?6P><0GE2 zim`&5cGwd&`giGPxV8;=1GDiGK8JrJEbZf&_Kf6U6I`RY(Llsejmja6fP0;XI6N0U zaR8pB{jkr<$YDyy%SR^6b%0~A{XtZWueot7<6AUO)lU9jmBqbtEx?;F`oOXDI{fV$ z3lO)@OtqZ6n4e`>4D;^qAqN%1y`K-y({#A*esDi7fX|;s{EbP}D~Eft6ZTny4j773 zj7LkP!L@dQ=OqXBKY^R@JltR3xdNw(Y#tQhewb^=D2qz#=B*G*;9eIa-k)o!dq(W% z`s(1X!u8LJI+&ATn2Oi%78aoZU%~weV6OeHb8Llw8n@8Vb91V2z2ho9e1?1T`fs8! zojc(qr{qrxXRNIjuAa~>SUsRtu=Jc-LEc4mf)%;lg2lQ0f@QgVf|Yab2o_K58nj8j zAy~ft;&AqnT|x2Q$-&Oj`5`~Tps1j3u)BDAqAhN>nUxhL HOOxRr62p@o diff --git a/quasar.conf.js b/quasar.conf.js new file mode 100644 index 0000000..4003e76 --- /dev/null +++ b/quasar.conf.js @@ -0,0 +1,207 @@ +/* + * This file runs in a Node context (it's NOT transpiled by Babel), so use only + * the ES6 features that are supported by your Node version. https://node.green/ + */ + +// Configuration for your app +// https://quasar.dev/quasar-cli/quasar-conf-js +/* eslint-env node */ +/* eslint-disable @typescript-eslint/no-var-requires */ +const { configure } = require('quasar/wrappers'); + +module.exports = configure(function (ctx) { + return { + // https://quasar.dev/quasar-cli/supporting-ts + supportTS: { + tsCheckerConfig: { + eslint: true + } + }, + + // https://quasar.dev/quasar-cli/prefetch-feature + // preFetch: true, + + // app boot file (/src/boot) + // --> boot files are part of "main.js" + // https://quasar.dev/quasar-cli/boot-files + boot: [ + 'composition-api', + 'axios', + ], + + // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css + css: [ + 'app.scss' + ], + + // https://github.com/quasarframework/quasar/tree/dev/extras + extras: [ + // 'ionicons-v4', + // 'mdi-v5', + // 'fontawesome-v5', + // 'eva-icons', + // 'themify', + // 'line-awesome', + // 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both! + + 'roboto-font', // optional, you are not bound to it + 'material-icons', // optional, you are not bound to it + ], + + // Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build + build: { + vueRouterMode: 'hash', // available values: 'hash', 'history' + + // transpile: false, + + // Add dependencies for transpiling with Babel (Array of string/regex) + // (from node_modules, which are by default not transpiled). + // Applies only if "transpile" is set to true. + // transpileDependencies: [], + + // rtl: false, // https://quasar.dev/options/rtl-support + // preloadChunks: true, + // showProgress: false, + // gzip: true, + // analyze: true, + + // Options below are automatically set depending on the env, set them if you want to override + // extractCSS: false, + + // https://quasar.dev/quasar-cli/handling-webpack + extendWebpack (cfg) { + // linting is slow in TS projects, we execute it only for production builds + if (ctx.prod) { + cfg.module.rules.push({ + enforce: 'pre', + test: /\.(js|vue)$/, + loader: 'eslint-loader', + exclude: /node_modules/ + }) + } + }, + }, + + // Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-devServer + devServer: { + https: false, + port: 8080, + open: true // opens browser window automatically + }, + + // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework + framework: { + iconSet: 'material-icons', // Quasar icon set + lang: 'en-us', // Quasar language pack + config: {}, + + // Possible values for "importStrategy": + // * 'auto' - (DEFAULT) Auto-import needed Quasar components & directives + // * 'all' - Manually specify what to import + importStrategy: 'auto', + + // For special cases outside of where "auto" importStrategy can have an impact + // (like functional components as one of the examples), + // you can manually specify Quasar components/directives to be available everywhere: + // + // components: [], + // directives: [], + + // Quasar plugins + plugins: [] + }, + + // animations: 'all', // --- includes all animations + // https://quasar.dev/options/animations + animations: [], + + // https://quasar.dev/quasar-cli/developing-ssr/configuring-ssr + ssr: { + pwa: false + }, + + // https://quasar.dev/quasar-cli/developing-pwa/configuring-pwa + pwa: { + workboxPluginMode: 'GenerateSW', // 'GenerateSW' or 'InjectManifest' + workboxOptions: {}, // only for GenerateSW + manifest: { + name: 'Flaschengeist', + short_name: 'Flaschengeist', + description: 'Dynamischen Managementsystem für Studentenclubs', + display: 'standalone', + orientation: 'portrait', + background_color: '#ffffff', + theme_color: '#027be3', + icons: [ + { + src: 'icons/icon-128x128.png', + sizes: '128x128', + type: 'image/png' + }, + { + src: 'icons/icon-192x192.png', + sizes: '192x192', + type: 'image/png' + }, + { + src: 'icons/icon-256x256.png', + sizes: '256x256', + type: 'image/png' + }, + { + src: 'icons/icon-384x384.png', + sizes: '384x384', + type: 'image/png' + }, + { + src: 'icons/icon-512x512.png', + sizes: '512x512', + type: 'image/png' + } + ] + } + }, + + // Full list of options: https://quasar.dev/quasar-cli/developing-cordova-apps/configuring-cordova + cordova: { + // noIosLegacyBuildFlag: true, // uncomment only if you know what you are doing + }, + + // Full list of options: https://quasar.dev/quasar-cli/developing-capacitor-apps/configuring-capacitor + capacitor: { + hideSplashscreen: true + }, + + // Full list of options: https://quasar.dev/quasar-cli/developing-electron-apps/configuring-electron + electron: { + bundler: 'packager', // 'packager' or 'builder' + + packager: { + // https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options + + // OS X / Mac App Store + // appBundleId: '', + // appCategoryType: '', + // osxSign: '', + // protocol: 'myapp://path', + + // Windows only + // win32metadata: { ... } + }, + + builder: { + // https://www.electron.build/configuration/configuration + + appId: 'flaschengeist-frontend' + }, + + // More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration + nodeIntegration: true, + + extendWebpack (/* cfg */) { + // do something with Electron main process Webpack cfg + // chainWebpack also available besides this extendWebpack + } + } + } +}); diff --git a/src/App.vue b/src/App.vue index f1720e7..0b7a348 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,232 +1,12 @@ + diff --git a/src/assets/logo-64.png b/src/assets/logo-64.png deleted file mode 100644 index 50aacbbd31695baab87522527a681f9dcf52928d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4487 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 Z{}0oa0s6C6Ip_cY002ovPDHLkV1mXBqWAy+ diff --git a/src/assets/logo-big.png b/src/assets/logo-big.png deleted file mode 100644 index abd2e09c2f6b5b00226460f8463accc4068386f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329633 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 z 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 Q;9rO|R6(Nfg@Nz?0rV6|)&Kwi diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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 46 diff --git a/src/assets/logo_256.png b/src/assets/logo_256.png deleted file mode 100644 index 1317129f157e320b58fed81bcb5df4bd58bb92df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1906 zcmV-&2aWiNP)Zdnw7O$O$UYp%Yhw%Er1UJ2Ll^qd^s=% z*c4a-+z%`Ro~){QD|4n+Vfa8`6mT1G3h)V_Kd=$74$u)pWc~+nZW(YB@G{U@Rp;?R zn|hn8(IVU4rl{AcBh)?-dskcYz3y8b2^<3)4$KA?01ywdzJB_?xmij9;Yr+m#T+mu2(~Dcl9&s1L+S`H&eG)*HX_=yVdCPlhVI6BI~O+s1t!3fir;()Wd++f&T)tt7Sya^M7YVs>)4x=g)QJy^Y{?T%kjH&vfe|DoQf&Q-sf(^;&(8ri=_|4{WCYVRJM zP|s9vR$Cg5>S0m3Sbet5*aY?3M!!p)p}wj9F=MBxC&tD( z>RTB~rgkElB*_Tvgp2z>!rop#jV5Ch+FP*yAzq7;rSu8Tj1~*az4cI3M_7f^#cic!KX^ zRW(-KDG)s`!FLC6LhJZXRo76zqQ0PRlw+D4Sp8fI$}uS}OL{=htAmQ&>90ue&T7bP zrhYcM_g3#}6{7`JwLJMf3%DU``X*Ng=UUFJs%wC!+sk(f*RQIoci?p{upRJswUz4K z!IG)KM}Zk?C+g`@G_8?JH)rhe?CiM)=@^pd0g(teJ&0>|1PeXd+AUY zMA2~dTlxQ1D%n8+ldIzJlJ{U{osG49QbnhxKR&5DDuu5@-LnJOv8q;tb`cWs-9+oz zz*Xrb{%U7c-JT8h1rF{2hE~=598as=T~)Jz}b{R@K}Pl95UK>1zT{#Axq^1KX*e&i}3`7!jDQjBS=< zpAQ_8t9c1{2sj70J?me~wM>?7!8Qo^ zJuof!e=6|rtXrh^$!TpGDz|txi%02S)p+qRmTxSb*qq zbx^pZ>c;BJ8QU`i^}gi&pvauus*)sMN2dmi52;k06>5D%12~4Lzgx*0+RVsJ2oIR3 zo~3S*@u$NLj#k%i;`wO}6x%HdM#i~u4Y^V3`KkHstvkT;LS#2oCpQ@P0QHgp-OTnk zqdDsLs;WCY?(V9Z0xYen^P+&1(=OmgS@)mtg~cf}X8^<0LCO8Q)ZSs-6OyXyR@Kl} z-Do+`Kf)JAS$FdVGRQ?$J(~Le1aLX9W$ + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/boot/.gitkeep b/src/boot/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/boot/axios.ts b/src/boot/axios.ts new file mode 100644 index 0000000..d8ed8d2 --- /dev/null +++ b/src/boot/axios.ts @@ -0,0 +1,13 @@ +import axios, { AxiosInstance } from 'axios'; +import { boot } from 'quasar/wrappers'; + +declare module 'vue/types/vue' { + interface Vue { + $axios: AxiosInstance; + } +} + +export default boot(({ Vue }) => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access + Vue.prototype.$axios = axios; +}); diff --git a/src/boot/composition-api.ts b/src/boot/composition-api.ts new file mode 100644 index 0000000..0880600 --- /dev/null +++ b/src/boot/composition-api.ts @@ -0,0 +1,6 @@ +import VueCompositionApi from '@vue/composition-api'; +import { boot } from 'quasar/wrappers'; + +export default boot(({ Vue }) => { + Vue.use(VueCompositionApi); +}); diff --git a/src/components/CompositionComponent.vue b/src/components/CompositionComponent.vue new file mode 100644 index 0000000..22b4bd7 --- /dev/null +++ b/src/components/CompositionComponent.vue @@ -0,0 +1,59 @@ + + + diff --git a/src/components/ConnectionError.vue b/src/components/ConnectionError.vue deleted file mode 100644 index d753ac8..0000000 --- a/src/components/ConnectionError.vue +++ /dev/null @@ -1,40 +0,0 @@ - - - - - diff --git a/src/components/CookieNotification.vue b/src/components/CookieNotification.vue deleted file mode 100644 index 467e5a6..0000000 --- a/src/components/CookieNotification.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - - - diff --git a/src/components/EssentialLink.vue b/src/components/EssentialLink.vue new file mode 100644 index 0000000..a7bc4eb --- /dev/null +++ b/src/components/EssentialLink.vue @@ -0,0 +1,51 @@ + + + diff --git a/src/components/ResetPassword.vue b/src/components/ResetPassword.vue deleted file mode 100644 index 2eb7cc1..0000000 --- a/src/components/ResetPassword.vue +++ /dev/null @@ -1,146 +0,0 @@ - - - - - diff --git a/src/components/TitleBar.vue b/src/components/TitleBar.vue deleted file mode 100644 index 865cafa..0000000 --- a/src/components/TitleBar.vue +++ /dev/null @@ -1,94 +0,0 @@ - - - - - diff --git a/src/components/baruser/BarFreedrinks.vue b/src/components/baruser/BarFreedrinks.vue deleted file mode 100644 index eec219f..0000000 --- a/src/components/baruser/BarFreedrinks.vue +++ /dev/null @@ -1,446 +0,0 @@ - - - - diff --git a/src/components/baruser/BarNavigation.vue b/src/components/baruser/BarNavigation.vue deleted file mode 100644 index c08adc4..0000000 --- a/src/components/baruser/BarNavigation.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - - diff --git a/src/components/baruser/CreditLists.vue b/src/components/baruser/CreditLists.vue deleted file mode 100644 index f90d8c5..0000000 --- a/src/components/baruser/CreditLists.vue +++ /dev/null @@ -1,595 +0,0 @@ - - - - - diff --git a/src/components/baruser/SearchBar.vue b/src/components/baruser/SearchBar.vue deleted file mode 100644 index 3bfb47a..0000000 --- a/src/components/baruser/SearchBar.vue +++ /dev/null @@ -1,133 +0,0 @@ - - - - - diff --git a/src/components/finanzer/FinanzerNavigation.vue b/src/components/finanzer/FinanzerNavigation.vue deleted file mode 100644 index 1add063..0000000 --- a/src/components/finanzer/FinanzerNavigation.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - - - diff --git a/src/components/finanzer/Overview.vue b/src/components/finanzer/Overview.vue deleted file mode 100644 index 2f64100..0000000 --- a/src/components/finanzer/Overview.vue +++ /dev/null @@ -1,400 +0,0 @@ - - - - - diff --git a/src/components/finanzer/Skeleton/TableSkeleton.vue b/src/components/finanzer/Skeleton/TableSkeleton.vue deleted file mode 100644 index a2cf718..0000000 --- a/src/components/finanzer/Skeleton/TableSkeleton.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - - diff --git a/src/components/finanzer/Skeleton/UserSkeleton.vue b/src/components/finanzer/Skeleton/UserSkeleton.vue deleted file mode 100644 index 86d2cf6..0000000 --- a/src/components/finanzer/Skeleton/UserSkeleton.vue +++ /dev/null @@ -1,82 +0,0 @@ - - - - - diff --git a/src/components/finanzer/Table.vue b/src/components/finanzer/Table.vue deleted file mode 100644 index bfb57c9..0000000 --- a/src/components/finanzer/Table.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - - - diff --git a/src/components/finanzer/User.vue b/src/components/finanzer/User.vue deleted file mode 100644 index be477d0..0000000 --- a/src/components/finanzer/User.vue +++ /dev/null @@ -1,363 +0,0 @@ - - - - - diff --git a/src/components/gastro/GastroNavigation.vue b/src/components/gastro/GastroNavigation.vue deleted file mode 100644 index 36ccbfb..0000000 --- a/src/components/gastro/GastroNavigation.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - - - diff --git a/src/components/models.ts b/src/components/models.ts new file mode 100644 index 0000000..6945920 --- /dev/null +++ b/src/components/models.ts @@ -0,0 +1,8 @@ +export interface Todo { + id: number; + content: string; +} + +export interface Meta { + totalCount: number; +} diff --git a/src/components/pricelist/PriceList.vue b/src/components/pricelist/PriceList.vue deleted file mode 100644 index b84d658..0000000 --- a/src/components/pricelist/PriceList.vue +++ /dev/null @@ -1,497 +0,0 @@ - - - - - diff --git a/src/components/user/AddAmount.vue b/src/components/user/AddAmount.vue deleted file mode 100644 index fa8c089..0000000 --- a/src/components/user/AddAmount.vue +++ /dev/null @@ -1,497 +0,0 @@ - - - - - diff --git a/src/components/user/Config.vue b/src/components/user/Config.vue deleted file mode 100644 index 95c275b..0000000 --- a/src/components/user/Config.vue +++ /dev/null @@ -1,458 +0,0 @@ - - - - - diff --git a/src/components/user/CreditOverview.vue b/src/components/user/CreditOverview.vue deleted file mode 100644 index 3595f20..0000000 --- a/src/components/user/CreditOverview.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - - - diff --git a/src/components/user/JobRequests/JobInvites.vue b/src/components/user/JobRequests/JobInvites.vue deleted file mode 100644 index d0a5f0a..0000000 --- a/src/components/user/JobRequests/JobInvites.vue +++ /dev/null @@ -1,208 +0,0 @@ - - - - - diff --git a/src/components/user/JobRequests/JobTransfer.vue b/src/components/user/JobRequests/JobTransfer.vue deleted file mode 100644 index 1e66168..0000000 --- a/src/components/user/JobRequests/JobTransfer.vue +++ /dev/null @@ -1,224 +0,0 @@ - - - - - diff --git a/src/components/user/Jobs.vue b/src/components/user/Jobs.vue deleted file mode 100644 index 04b74c6..0000000 --- a/src/components/user/Jobs.vue +++ /dev/null @@ -1,192 +0,0 @@ - - - - - diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue deleted file mode 100644 index 5fd61fb..0000000 --- a/src/components/user/Jobs/Day.vue +++ /dev/null @@ -1,438 +0,0 @@ - - - - - diff --git a/src/components/user/JobsRequest.vue b/src/components/user/JobsRequest.vue deleted file mode 100644 index db0ad2a..0000000 --- a/src/components/user/JobsRequest.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - - - diff --git a/src/components/user/Skeleton/AddAmountSkeleton.vue b/src/components/user/Skeleton/AddAmountSkeleton.vue deleted file mode 100644 index ad80d2f..0000000 --- a/src/components/user/Skeleton/AddAmountSkeleton.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - - diff --git a/src/components/user/Skeleton/CreditOverviewSkeleton.vue b/src/components/user/Skeleton/CreditOverviewSkeleton.vue deleted file mode 100644 index 253abf2..0000000 --- a/src/components/user/Skeleton/CreditOverviewSkeleton.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - - diff --git a/src/components/user/UserNavigation.vue b/src/components/user/UserNavigation.vue deleted file mode 100644 index 951500c..0000000 --- a/src/components/user/UserNavigation.vue +++ /dev/null @@ -1,107 +0,0 @@ - - - - - diff --git a/src/components/user/freedrink/freedrinkUserView.vue b/src/components/user/freedrink/freedrinkUserView.vue deleted file mode 100644 index 487a35e..0000000 --- a/src/components/user/freedrink/freedrinkUserView.vue +++ /dev/null @@ -1,474 +0,0 @@ - - - - diff --git a/src/components/vorstand/FreeDrinkList.vue b/src/components/vorstand/FreeDrinkList.vue deleted file mode 100644 index d4189a7..0000000 --- a/src/components/vorstand/FreeDrinkList.vue +++ /dev/null @@ -1,138 +0,0 @@ - - - - - diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue deleted file mode 100644 index c8548eb..0000000 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListBand.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue deleted file mode 100644 index 498ebf9..0000000 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfig.vue +++ /dev/null @@ -1,212 +0,0 @@ - - - - - diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigConfigItem.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigConfigItem.vue deleted file mode 100644 index ea797f5..0000000 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigConfigItem.vue +++ /dev/null @@ -1,120 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigReasonItem.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigReasonItem.vue deleted file mode 100644 index 7ccf745..0000000 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListConfigComponents/FreeDrinkListConfigReasonItem.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue deleted file mode 100644 index f0fd708..0000000 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListJob.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListMain.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListMain.vue deleted file mode 100644 index f5f8801..0000000 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListMain.vue +++ /dev/null @@ -1,166 +0,0 @@ - - - - - diff --git a/src/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup.vue b/src/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup.vue deleted file mode 100644 index 84b6f77..0000000 --- a/src/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup.vue +++ /dev/null @@ -1,112 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/vorstand/JobKindManager.vue b/src/components/vorstand/JobKindManager.vue deleted file mode 100644 index ca4a63d..0000000 --- a/src/components/vorstand/JobKindManager.vue +++ /dev/null @@ -1,171 +0,0 @@ - - - - - diff --git a/src/components/vorstand/ManagementNavigation.vue b/src/components/vorstand/ManagementNavigation.vue deleted file mode 100644 index fb61006..0000000 --- a/src/components/vorstand/ManagementNavigation.vue +++ /dev/null @@ -1,60 +0,0 @@ - - - - - diff --git a/src/components/vorstand/ServiceManagement.vue b/src/components/vorstand/ServiceManagement.vue deleted file mode 100644 index cd28cf6..0000000 --- a/src/components/vorstand/ServiceManagement.vue +++ /dev/null @@ -1,169 +0,0 @@ - - - - - diff --git a/src/components/vorstand/ServiceManagementComponents/Day.vue b/src/components/vorstand/ServiceManagementComponents/Day.vue deleted file mode 100644 index 488b7f9..0000000 --- a/src/components/vorstand/ServiceManagementComponents/Day.vue +++ /dev/null @@ -1,518 +0,0 @@ - - - - - diff --git a/src/components/vorstand/UserManager.vue b/src/components/vorstand/UserManager.vue deleted file mode 100644 index ae4fc64..0000000 --- a/src/components/vorstand/UserManager.vue +++ /dev/null @@ -1,320 +0,0 @@ - - - - - diff --git a/src/components/vorstand/WorkgroupManagement.vue b/src/components/vorstand/WorkgroupManagement.vue deleted file mode 100644 index ddb5247..0000000 --- a/src/components/vorstand/WorkgroupManagement.vue +++ /dev/null @@ -1,190 +0,0 @@ - - - - - diff --git a/src/css/app.scss b/src/css/app.scss new file mode 100644 index 0000000..ecac98f --- /dev/null +++ b/src/css/app.scss @@ -0,0 +1 @@ +// app global css in SCSS form diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss new file mode 100644 index 0000000..dd1fb01 --- /dev/null +++ b/src/css/quasar.variables.scss @@ -0,0 +1,24 @@ +// Quasar SCSS (& Sass) Variables +// -------------------------------------------------- +// To customize the look and feel of this app, you can override +// the Sass/SCSS variables found in Quasar's source Sass/SCSS files. + +// Check documentation for full list of Quasar variables + +// Your own variables (that are declared here) and Quasar's own +// ones will be available out of the box in your .vue/.scss/.sass files + +// It's highly recommended to change the default colors +// to match your app's branding. +// Tip: Use the "Theme Builder" on Quasar's documentation website. + +$primary : #1976D2; +$secondary : #26A69A; +$accent : #9C27B0; + +$dark : #1D1D1D; + +$positive : #21BA45; +$negative : #C10015; +$info : #31CCEC; +$warning : #F2C037; diff --git a/src/env.d.ts b/src/env.d.ts new file mode 100644 index 0000000..12dcd18 --- /dev/null +++ b/src/env.d.ts @@ -0,0 +1,7 @@ +declare namespace NodeJS { + interface ProcessEnv { + NODE_ENV: string; + VUE_ROUTER_MODE: 'hash' | 'history' | 'abstract' | undefined; + VUE_ROUTER_BASE: string | undefined; + } +} diff --git a/src/index.template.html b/src/index.template.html new file mode 100644 index 0000000..8157cbf --- /dev/null +++ b/src/index.template.html @@ -0,0 +1,22 @@ + + + + <%= productName %> + + + + + + + + + + + + + + + +
+ + diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue new file mode 100644 index 0000000..a4547d5 --- /dev/null +++ b/src/layouts/MainLayout.vue @@ -0,0 +1,109 @@ + + + diff --git a/src/main.js b/src/main.js deleted file mode 100644 index 4fb129d..0000000 --- a/src/main.js +++ /dev/null @@ -1,14 +0,0 @@ -import Vue from 'vue' -import App from './App.vue' -import router from './router' -import store from './store' -import vuetify from './plugins/vuetify' - -Vue.config.productionTip = false - -new Vue({ - router, - store, - vuetify, - render: h => h(App) -}).$mount('#app') diff --git a/src/pages/Error404.vue b/src/pages/Error404.vue new file mode 100644 index 0000000..f4c56b4 --- /dev/null +++ b/src/pages/Error404.vue @@ -0,0 +1,31 @@ + + + diff --git a/src/pages/Index.vue b/src/pages/Index.vue new file mode 100644 index 0000000..1d56395 --- /dev/null +++ b/src/pages/Index.vue @@ -0,0 +1,49 @@ + + + diff --git a/src/plugins/routes.js b/src/plugins/routes.js deleted file mode 100644 index d25a4da..0000000 --- a/src/plugins/routes.js +++ /dev/null @@ -1,103 +0,0 @@ -//const main = 'https://192.168.5.128:5000/' -const main = 'http://localhost:5000/' -//const main = 'http://192.168.5.118:5000/' -//const main = 'https://groeger-clan.duckdns.org:5000/' -//const main = 'https://flaschengeist.wu5.de:5000/' - -const url = { - login: main + 'login', - logout: main + 'logout', - getUsers: main + 'getUsers', - pricelist: main + 'pricelist', - getTypes: main + 'drinkTypes', - getFinanzerMain: main + 'getFinanzerMain', - bar: main + 'bar', - barGetUser: main + 'barGetUser', - barAddAmount: main + 'baradd', - finanzerAddAmount: main + 'finanzerAddAmount', - finanzerAddCredit: main + 'finanzerAddCredit', - searchUser: main + 'search', - getAllUser: main + 'barGetUsers', - lockUser: main + 'finanzerLock', - finanzerSetConfig: main + 'finanzerSetConfig', - finanzerAddUser: main + 'finanzerAddUser', - finanzerSendAllMail: main + 'finanzerSendAllMail', - finanzerSendOneMail: main + 'finanzerSendOneMail', - userMain: main + 'user/main', - userAddAmount: main + 'user/addAmount', - saveLifetime: main + 'setLifetime', - getLifetime: main + 'getLifetime', - resetPassword: main + 'passwordReset', - freeDrinkListConfig: main + 'freeDrinkListConfig', - freeDrinkListHistory: main + 'freeDrinkListHistory', - freeDrinkListHistoryFromTo: main + 'freeDrinkListHistoryFromTo', - deleteDrinkListHistory: main + 'deleteDrinkListHistory', - freeDrinkListReasons: main + 'freeDrinkListReasons', - deleteFreeDrinkListReason: main + 'deleteFreeDrinkListReason', - freeDrinkTypes: main + 'freeDrinkTypes', - deleteFreeDrinkListConfig: main + 'deleteFreeDrinkListConfig', - vorstand: { - sm: { - addUser: main + 'sm/addUser', - deleteUser: main + 'sm/deleteUser', - getUser: main + 'sm/getUser', - getUsers: main + 'user/jobs', - lockDay: main + 'sm/lockDay', - searchUser: main + 'sm/searchWithExtern', - jobkind: main + 'sm/JobKind', - getAllJobKindsbKinds: main + 'sm/getAllJobKinds', - getJobKind: main + 'sm/getJobKind', - deleteJobKind: main + 'sm/deleteJobKind', - updateJobKindDates: main + 'jk/JobKindDate', - getJobKindDates: main + 'jk/JobKindDate' - }, - um: { - setStatus: main + 'um/setStatus', - updateStatus: main + 'um/updateStatus', - deleteStatus: main + 'um/deleteStatus', - updateStatusUser: main + 'um/updateStatusUser', - updateVoting: main + 'um/updateVoting', - updateWorkgroups: main + 'um/updateWorkgroups' - }, - wm: { - workgroup: main + 'wgm/workgroup', - getWorkgroup: main + 'wgm/getWorkgroup', - getAllWorkgroups: main + 'wgm/getAllWorkgroups', - deleteWorkgroup: main + 'wgm/deleteWorkgroup' - } - }, - user: { - config: main + 'user/saveConfig', - job: main + 'user/job', - jobs: main + 'user/jobs', - addJob: main + 'user/addJob', - getJobOnDates: main + 'user/jobsOnDates', - deleteJob: main + 'user/deleteJob', - getJobInvites: main + 'user/getJobInvites', - setJobInvites: main + 'user/JobInvites', - deletJobInvite: main + 'user/deleteJobInvite', - getJobRequests: main + 'user/getJobRequests', - setJobRequests: main + 'user/JobRequests', - deletJobRequest: main + 'user/deleteJobRequest', - storno: main + 'user/storno', - getAllStatus: main + 'getAllStatus', - getStatus: main + 'getStatus', - valid: main + 'valid', - getAccessTokens: main + 'user/getAccessTokens' - }, - barU: { - storno: main + 'bar/storno', - lock: main + 'bar/lock', - addUser: main + 'bar/addUser' - }, - gastro: { - setDrink: main + 'gastro/setDrink', - updateDrink: main + 'gastro/updateDrink', - deleteDrink: main + 'gastro/deleteDrink', - setType: main + 'gastro/setDrinkType', - updateType: main + 'gastro/updateDrinkType', - deleteType: main + 'gastro/deleteDrinkType' - } -} - -export default url diff --git a/src/plugins/vuetify.js b/src/plugins/vuetify.js deleted file mode 100644 index 1f6b8b8..0000000 --- a/src/plugins/vuetify.js +++ /dev/null @@ -1,10 +0,0 @@ -import Vue from 'vue' -import Vuetify from 'vuetify/lib' - -Vue.use(Vuetify) - -export default new Vuetify({ - icons: { - iconfont: 'mdiSvg' - } -}) diff --git a/src/router/index.js b/src/router/index.js deleted file mode 100644 index 4a4a7cb..0000000 --- a/src/router/index.js +++ /dev/null @@ -1,274 +0,0 @@ -import Vue from 'vue' -import VueRouter from 'vue-router' -import FinanzerView from '@/views/FinanzerView' -import Login from '@/views/Login' -import store from '@/store/index' -import GeruechteView from '../views/contents/GeruechteView' -import BarFreedrinksView from '../views/contents/BarFreedrinksView' -import AddAmount from '../components/user/AddAmount' -import CreditOverview from '../components/user/CreditOverview' -import MainView from '../views/MainView' -import UserView from '../views/UserView' -import BarView from '../views/BarView' -import UserNavigation from '../components/user/UserNavigation' -import BarNavigation from '../components/baruser/BarNavigation' -import FinanzerNavigation from '../components/finanzer/FinanzerNavigation' -import Overview from '../components/finanzer/Overview' -import User from '../components/finanzer/User' -import ServiceManagement from '../components/vorstand/ServiceManagement' -import Config from '@/components/user/Config' -import FreedrinkUserView from '@/components/user/freedrink/freedrinkUserView' -import Jobs from '@/components/user/Jobs' -import PriceList from '@/components/pricelist/PriceList' -import ManagementNavigation from '@/components/vorstand/ManagementNavigation' -import GastroNavigation from '@/components/gastro/GastroNavigation' -import PriceListView from '@/views/contents/PriceListView' -import UserManager from '@/components/vorstand/UserManager' -import WorkgroupManagement from '@/components/vorstand/WorkgroupManagement' -import JobKindManager from '@/components/vorstand/JobKindManager' -import JobsRequest from '@/components/user/JobsRequest' -import ResetPassword from '@/components/ResetPassword' -import FreeDrinkList from '@/components/vorstand/FreeDrinkList' -import FreeDrinkListMain from '@/components/vorstand/FreeDrinkList/FreeDrinkListMain' -import FreeDrinkListConfig from '@/components/vorstand/FreeDrinkList/FreeDrinkListConfig' -import FreeDrinkListJob from '@/components/vorstand/FreeDrinkList/FreeDrinkListJob' -import FreeDrinkListWorkgroup from '@/components/vorstand/FreeDrinkList/FreeDrinkListWorkgroup' -import FreeDrinkListBand from '@/components/vorstand/FreeDrinkList/FreeDrinkListBand' - -Vue.use(VueRouter) - -const rootPath = '' - -const routes = [ - { - path: rootPath + '/resetPassword', - name: 'resetPassword', - component: ResetPassword - }, - { - path: rootPath + '/cookies', - name: 'cookies' - }, - { - path: rootPath + '/pricelist', - name: 'priceListNoLogin', - component: PriceListView - }, - { - path: rootPath + '/login', - name: 'login', - component: Login - }, - { - path: rootPath + '/main', - name: 'main', - component: MainView, - children: [ - { - path: 'management', - name: 'management', - components: { nav: ManagementNavigation, default: BarView }, - children: [ - { - name: 'serviceManagement', - path: 'servicemanagement/:year/:month', - component: ServiceManagement - }, - { - path: 'usermanager', - name: 'userManager', - component: UserManager - }, - { - path: 'workgroupmanagement', - name: 'workgroupManagement', - component: WorkgroupManagement - }, - { - path: 'jobkindmanagement', - name: 'jobkindManagement', - component: JobKindManager - }, - { - path: 'freeDrinkList', - name: 'freeDrinkList', - component: FreeDrinkList, - children: [ - { - path: 'main', - name: 'freeDrinkListMain', - component: FreeDrinkListMain - }, - { - path: 'config', - name: 'freeDrinkListConfig', - component: FreeDrinkListConfig - }, - { - path: 'freeDrinkListJob', - name: 'freeDrinkListJob', - component: FreeDrinkListJob - }, - { - path: 'freeDrinkListWorkgroup', - name: 'freeDrinkListWorkgroup', - component: FreeDrinkListWorkgroup - }, - { - path: 'freeDrinkListBand', - name: 'freeDrinkListBand', - component: FreeDrinkListBand - } - ] - } - ] - }, - { - path: 'user', - name: 'user', - components: { nav: UserNavigation, default: UserView }, - children: [ - { - path: 'add', - name: 'add', - component: AddAmount - }, - { - path: 'freedrinkUser', - name: 'freedrinkUser', - component: FreedrinkUserView - }, - { - path: 'overview', - name: 'userOverview', - component: CreditOverview - }, - { - path: 'config', - name: 'userConfig', - component: Config - }, - { - path: 'jobs/:year/:month', - name: 'userJobs', - component: Jobs - }, - { - path: 'jobRequests/:kind', - name: 'jobRequests', - component: JobsRequest - } - ] - }, - { - path: 'bar', - name: 'bar', - components: { nav: BarNavigation, default: BarView }, - children: [ - { - path: 'geruecht', - name: 'geruecht', - component: GeruechteView - }, - { - path: 'baruserFreedrinks', - name: 'baruserFreedrinks', - component: BarFreedrinksView - } - ] - }, - { - path: 'finanzer', - name: 'finanzer', - components: { default: FinanzerView, nav: FinanzerNavigation }, - children: [ - { - path: 'overview', - name: 'overview', - component: Overview - }, - { - path: 'user/:id', - name: 'activeUser', - props: true, - component: User - } - ] - }, - { - path: 'gastro', - name: 'gastro', - components: { nav: GastroNavigation, default: BarView }, - children: [ - { - path: 'pricelist', - name: 'gastroPricelist', - component: PriceList - } - ] - } - ] - }, - { - path: '*', - redirect: { - name: 'login' - } - } -] - -const router = new VueRouter({ - mode: 'history', - base: process.env.BASE_URL, - routes -}) - -router.beforeEach((to, from, next) => { - store.dispatch('fetchAccessToken') - if (to.name === 'main') { - if ( - to.name === 'finanzer' || - to.name === 'overview' || - to.name === 'activeUser' - ) { - if (!store.state.login.user.group.includes('moneymaster')) { - next({ name: 'login' }) - } - } - if (to.name === 'bar' || to.name === 'geruecht') { - if (!store.state.login.user.group.includes('bar')) { - next({ name: 'login' }) - } - } - if ( - to.name === 'user' || - to.name === 'userOverview' || - to.name === 'userConfig' || - to.name === 'userJobs' || - to.name === 'jobRequests' - ) { - if (!store.state.login.user.group.includes('user')) { - next({ name: 'login' }) - } - } - if (!store.state.login.user.accessToken) { - next({ name: 'login' }) - } - } - if (to.name === 'login') { - if (store.state.login.user.accessToken) { - if (store.state.login.user.group.includes('moneymaster')) { - next({ name: 'overview' }) - } else if (store.state.login.user.group.includes('bar')) { - next({ name: 'geruecht' }) - } else if (store.state.login.user.group.includes('user')) { - next({ name: 'add' }) - } else if (store.state.login.user.group.includes('extern')) { - next({ name: 'main' }) - } - } - } - next() -}) - -export default router diff --git a/src/router/index.ts b/src/router/index.ts new file mode 100644 index 0000000..b6d4373 --- /dev/null +++ b/src/router/index.ts @@ -0,0 +1,27 @@ +import { route } from 'quasar/wrappers'; +import VueRouter from 'vue-router'; +import { Store } from 'vuex'; +import { StateInterface } from '../store'; +import routes from './routes'; + +/* + * If not building with SSR mode, you can + * directly export the Router instantiation + */ + +export default route>(function ({ Vue }) { + Vue.use(VueRouter); + + const Router = new VueRouter({ + scrollBehavior: () => ({ x: 0, y: 0 }), + routes, + + // Leave these as is and change from quasar.conf.js instead! + // quasar.conf.js -> build -> vueRouterMode + // quasar.conf.js -> build -> publicPath + mode: process.env.VUE_ROUTER_MODE, + base: process.env.VUE_ROUTER_BASE + }); + + return Router; +}) diff --git a/src/router/routes.ts b/src/router/routes.ts new file mode 100644 index 0000000..4876636 --- /dev/null +++ b/src/router/routes.ts @@ -0,0 +1,20 @@ +import { RouteConfig } from 'vue-router'; + +const routes: RouteConfig[] = [ + { + path: '/', + component: () => import('layouts/MainLayout.vue'), + children: [ + { path: '', component: () => import('pages/Index.vue') } + ] + }, + + // Always leave this as last one, + // but you can also remove it + { + path: '*', + component: () => import('pages/Error404.vue') + } +]; + +export default routes; diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts new file mode 100644 index 0000000..b196268 --- /dev/null +++ b/src/shims-vue.d.ts @@ -0,0 +1,5 @@ +// Mocks all files ending in `.vue` showing them as plain Vue instances +declare module '*.vue' { + import Vue from 'vue'; + export default Vue; +} diff --git a/src/store/index.js b/src/store/index.js deleted file mode 100644 index 41c8768..0000000 --- a/src/store/index.js +++ /dev/null @@ -1,37 +0,0 @@ -import Vue from 'vue' -import Vuex from 'vuex' -import login from './modules/login' -import finanzerUsers from './modules/finanzerUsers' -import barUsers from '@/store/modules/barUsers' -import user from '@/store/modules/user' -import sm from '@/store/modules/serviceManagement' -import jobs from '@/store/modules/jobs' -import priceList from '@/store/modules/pricelist' -import usermanager from '@/store/modules/userManager' -import wm from '@/store/modules/workgroupManagement' -import jkm from '@/store/modules/jobkindManager' -import jobInvites from '@/store/modules/jobInvites' -import jobRequests from '@/store/modules/jobRequests' -import connectionError from '@/store/modules/connectionError' -import freeDrinkList from '@/store/modules/freeDrinkList' - -Vue.use(Vuex) - -export default new Vuex.Store({ - modules: { - login, - finanzerUsers, - barUsers, - user, - sm, - jobs, - priceList, - usermanager, - wm, - jkm, - jobInvites, - jobRequests, - connectionError, - freeDrinkList - } -}) diff --git a/src/store/index.ts b/src/store/index.ts new file mode 100644 index 0000000..83d76c2 --- /dev/null +++ b/src/store/index.ts @@ -0,0 +1,33 @@ +import { store } from 'quasar/wrappers'; +import Vuex from 'vuex'; + +// import example from './module-example'; +// import { ExampleStateInterface } from './module-example/state'; + +/* + * If not building with SSR mode, you can + * directly export the Store instantiation + */ + +export interface StateInterface { + // Define your own store structure, using submodules if needed + // example: ExampleStateInterface; + // Declared as unknown to avoid linting issue. Best to strongly type as per the line above. + example: unknown; +} + +export default store(function ({ Vue }) { + Vue.use(Vuex); + + const Store = new Vuex.Store({ + modules: { + // example + }, + + // enable strict mode (adds overhead!) + // for dev mode only + strict: !!process.env.DEV + }); + + return Store; +}); diff --git a/src/store/module-example/actions.ts b/src/store/module-example/actions.ts new file mode 100644 index 0000000..8042ef0 --- /dev/null +++ b/src/store/module-example/actions.ts @@ -0,0 +1,11 @@ +import { ActionTree } from 'vuex'; +import { StateInterface } from '../index'; +import { ExampleStateInterface } from './state'; + +const actions: ActionTree = { + someAction (/* context */) { + // your code + } +}; + +export default actions; diff --git a/src/store/module-example/getters.ts b/src/store/module-example/getters.ts new file mode 100644 index 0000000..2727d49 --- /dev/null +++ b/src/store/module-example/getters.ts @@ -0,0 +1,11 @@ +import { GetterTree } from 'vuex'; +import { StateInterface } from '../index'; +import { ExampleStateInterface } from './state'; + +const getters: GetterTree = { + someAction (/* context */) { + // your code + } +}; + +export default getters; diff --git a/src/store/module-example/index.ts b/src/store/module-example/index.ts new file mode 100644 index 0000000..fee2203 --- /dev/null +++ b/src/store/module-example/index.ts @@ -0,0 +1,16 @@ +import { Module } from 'vuex'; +import { StateInterface } from '../index'; +import state, { ExampleStateInterface } from './state'; +import actions from './actions'; +import getters from './getters'; +import mutations from './mutations'; + +const exampleModule: Module = { + namespaced: true, + actions, + getters, + mutations, + state +}; + +export default exampleModule; diff --git a/src/store/module-example/mutations.ts b/src/store/module-example/mutations.ts new file mode 100644 index 0000000..70d45da --- /dev/null +++ b/src/store/module-example/mutations.ts @@ -0,0 +1,10 @@ +import { MutationTree } from 'vuex'; +import { ExampleStateInterface } from './state'; + +const mutation: MutationTree = { + someMutation (/* state: ExampleStateInterface */) { + // your code + } +}; + +export default mutation; diff --git a/src/store/module-example/state.ts b/src/store/module-example/state.ts new file mode 100644 index 0000000..8a9c71e --- /dev/null +++ b/src/store/module-example/state.ts @@ -0,0 +1,9 @@ +export interface ExampleStateInterface { + prop: boolean; +} + +const state: ExampleStateInterface = { + prop: false +}; + +export default state; diff --git a/src/store/modules/barUsers.js b/src/store/modules/barUsers.js deleted file mode 100644 index 1971017..0000000 --- a/src/store/modules/barUsers.js +++ /dev/null @@ -1,411 +0,0 @@ -import axios from 'axios' -import url from '@/plugins/routes' -const timeout = 5000 -const state = { - users: [], - allUsers: [], - filter: '', - usersLoading: false, - allUsersLoading: false, - messages: [], - menu: false, - locked: false -} - -const mutations = { - setAllUsers: (state, users) => { - state.allUsers = [] - state.allUsers = users - for (let i = 0; i < state.allUsers.length; i++) { - state.allUsers[i].fullName = - state.allUsers[i].firstname + ' ' + state.allUsers[i].lastname - } - }, - setUsers: (state, users) => { - for (let user in users) { - let existuser = state.users.find(a => { - return user === a.username - }) - if (users[user].last_seen != null || users[user].last_seen != undefined) { - users[user].last_seen = new Date( - users[user].last_seen.year, - users[user].last_seen.month - 1, - users[user].last_seen.day, - users[user].last_seen.hour, - users[user].last_seen.minute, - users[user].last_seen.second - ) - } - if (existuser) { - existuser.sername = users[user].username - existuser.firstname = users[user].firstname - existuser.lastname = users[user].lastname - existuser.locked = users[user].locked - existuser.amount = users[user].amount - existuser.type = users[user].type - existuser.limit = users[user].limit - existuser.last_seen = users[user].last_seen - existuser.autoLock = users[user].autoLock - ? users[user].autoLock - : existuser.autoLock - } else { - state.users.push({ - username: users[user].username, - firstname: users[user].firstname, - lastname: users[user].lastname, - locked: users[user].locked, - amount: users[user].amount, - type: users[user].type, - loading: false, - limit: users[user].limit, - last_seen: users[user].last_seen, - autoLock: users[user].autoLock - }) - } - } - mutations.sortUsers(state) - }, - updateUser: (state, data) => { - let index = state.users.indexOf( - state.users.find(a => { - return a.username === data.username - }) - ) - if (data.loading !== undefined) state.users[index].loading = data.loading - if (data.last_seen !== undefined) - state.users[index].last_seen = data.last_seen - }, - sortUsers: state => { - state.users = state.users.sort((a, b) => { - if (a.lastname > b.lastname) return 1 - if (a.lastname < b.lastname) return -1 - if (a.firstname > b.firstname) return 1 - if (a.firstname < b.firstname) return -1 - return 0 - }) - }, - setFilter: (state, filter) => { - state.filter = filter - }, - setUsersLoading: (state, value) => { - state.usersLoading = value - }, - setAllUsersLoading: (state, value) => { - state.allUsersLoading = value - }, - addMessage: (state, data) => { - var message = null - if (state.messages.length > 0) { - if ( - state.messages[0].user.username === data.user.username && - !data.error - ) { - message = state.messages[0] - if ((new Date() - state.messages[0].date) / 1000 < 2) { - clearTimeout(message.timeout) - message.amount = message.amount + data.amount - message.visible = true - message.date = new Date() - message.timeout = setTimeout(() => { - if (!message.error) { - message.visible = false - } - }, 5000) - return - } else { - message.visible = false - } - } - } - let message2 = { - user: data.user, - error: data.error, - storno: false, - loading: false, - visible: true, - amount: data.amount, - date: new Date(), - timeout: setTimeout(() => { - if (!message2.error) { - message2.visible = false - } - }, 5000) - } - state.messages.unshift(message2) - }, - updateMessage: (state, data) => { - var message = state.messages.find(msg => { - return msg.date - data.date === 0 ? true : false - }) - if (message) { - if (data.storno !== undefined) message.storno = data.storno - if (data.loading !== undefined) message.loading = data.loading - } - }, - setMenu: (state, value) => { - state.menu = value - }, - setLocked: (satet, value) => { - state.locked = value - } -} - -const actions = { - // eslint-disable-next-line no-unused-vars - async getUsers({ commit, rootState, dispatch }) { - commit('setUsersLoading', true) - try { - const response = await axios.get(url.bar, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setUsers', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) { - dispatch('getLifetime', null, { root: true }) - location.reload() - } - } - commit('setUsersLoading', false) - }, - async addAmount({ commit, rootState, dispatch }, data) { - try { - commit('updateUser', { username: data.username, loading: true }) - } catch (e) { - //error - } - try { - const response = await axios.post( - url.barAddAmount, - { userId: data.username, amount: data.amount }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setUsers', { [response.data.username]: response.data }) - commit('addMessage', { - user: data.user, - amount: data.amount, - error: false - }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - console.log(typeof e) - for (const [key, value] of Object.entries(e)) { - console.log(`${key}: ${value}`) - } - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('addMessage', { - user: data.user, - amount: data.amount, - error: true - }) - if (e.response) - if (e.response.status === 401) { - dispatch('getLifetime', null, { root: true }) - location.reload() - } - } - try { - commit('updateUser', { username: data.username, loading: false }) - } catch (e) { - //error - } - }, - async addCreditList({ commit, rootState, dispatch }, data) { - try { - commit('updateUser', { username: data.username, loading: true }) - } catch (e) { - //error - } - try { - const response = await axios.post( - url.barGetUser, - { userId: data.username }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setUsers', { [response.data.username]: response.data }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) { - dispatch('getLifetime', null, { root: true }) - location.reload() - } - } - try { - commit('updateUser', { - username: data.username, - loading: false, - last_seen: new Date() - }) - } catch { - // error - } - }, - async getAllUsers({ commit, rootState, dispatch }) { - commit('setAllUsersLoading', true) - try { - const response = await axios.get(url.searchUser, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setAllUsers', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.data === 401) { - dispatch('getLifetime', null, { root: true }) - location.reload() - } - } - commit('setAllUsersLoading', false) - }, - async storno({ commit, rootState, dispatch }, data) { - commit('updateMessage', { date: data.date, loading: true }) - try { - const response = await axios.post( - url.barU.storno, - { - userId: data.username, - amount: data.amount - }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setUsers', { [response.data.username]: response.data }) - commit('updateMessage', { date: data.date, storno: true }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) { - dispatch('getLifetime', null, { root: true }) - location.reload() - } - } - commit('updateMessage', { date: data.date, loading: false }) - }, - async getLocked({ commit, rootState, dispatch }) { - try { - const response = await axios.get(url.barU.lock, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setLocked', response.data.value) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) { - dispatch('getLifetime', null, { root: true }) - location.reload() - } - } - }, - async setLocked({ commit, rootState, dispatch }) { - try { - const response = await axios.post( - url.barU.lock, - { value: true }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setLocked', response.data.value) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) { - dispatch('getLifetime', null, { root: true }) - location.reload() - } - } - }, - async unlock({ commit, rootState, dispatch }, password) { - try { - const valid = await axios.post( - url.user.valid, - { password: password }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - if (valid.data.ok === 'ok') { - const response = await axios.post( - url.barU.lock, - { value: false }, - { headers: { Token: rootState.login.user.accessToken } } - ) - commit('setLocked', response.data.value) - } - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) { - dispatch('getLifetime', null, { root: true }) - location.reload() - } - } - }, - setLockStatus({ commit }, status) { - commit('setLocked', status) - }, - setFilter({ commit }, data) { - commit('setFilter', data) - }, - activateMenu({ commit }) { - commit('setMenu', true) - }, - deactivateMenu({ commit }) { - commit('setMenu', false) - } -} - -const getters = { - users: state => { - return state.users - }, - allUsers: state => { - return state.allUsers - }, - filter: state => { - return state.filter - }, - usersLoading: state => { - return state.usersLoading - }, - allUsersLoading: state => { - return state.allUsersLoading - }, - messages: state => { - return state.messages - }, - menu: state => { - return state.menu - }, - locked: state => { - return state.locked - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/connectionError.js b/src/store/modules/connectionError.js deleted file mode 100644 index 63f5884..0000000 --- a/src/store/modules/connectionError.js +++ /dev/null @@ -1,43 +0,0 @@ -const state = { - errors: [] -} - -const mutations = { - addError: state => { - state.errors.push({ - message: 'Connection Error: Server nicht verfügbar!', - visible: true - }) - }, - deleteErrors: state => { - state.errors = [] - } -} - -const actions = { - addError: ({ commit }) => { - commit('addError') - }, - deleteErrors: ({ commit }) => { - commit('deleteErrors') - } -} - -const getters = { - errors: state => { - return state.errors - }, - visible: state => { - return state.errors.find(error => { - return error.visible - }) - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/finanzerUsers.js b/src/store/modules/finanzerUsers.js deleted file mode 100644 index 51d0289..0000000 --- a/src/store/modules/finanzerUsers.js +++ /dev/null @@ -1,512 +0,0 @@ -import axios from 'axios' -// eslint-disable-next-line no-unused-vars -import url from '@/plugins/routes' -const timeout = 15000 -const state = { - users: [], - activeUser: '', - allUsers: [], - user: null, - errorMails: null, - errorMail: null, - year: new Date().getFullYear(), - years: [], - months: [ - { value: 1, text: 'Januar' }, - { value: 2, text: 'Februar' }, - { value: 3, text: 'März' }, - { value: 4, text: 'April' }, - { value: 5, text: 'Mai' }, - { value: 6, text: 'Juni' }, - { value: 7, text: 'Juli' }, - { value: 8, text: 'August' }, - { value: 9, text: 'September' }, - { value: 10, text: 'Oktober' }, - { value: 11, text: 'November' }, - { value: 12, text: 'Dezember' } - ], - allUsersLoading: false, - usersLoading: false, - emailLoading: false, - addUserLoading: false -} - -const mutations = { - setAllUsers: (state, users) => { - state.allUsers = [] - state.allUsers = users - for (let i = 0; i < state.allUsers.length; i++) { - state.allUsers[i].fullName = - state.allUsers[i].firstname + ' ' + state.allUsers[i].lastname - } - }, - setActiveUser: (state, username) => { - state.activeUser = username - }, - setUsers: (state, users) => { - for (let user in users) { - let list = {} - for (let creditList in users[user]['creditList']) { - let amount = mutations.createAmount( - users[user]['creditList'][creditList] - ) - let credit = mutations.createCredit( - users[user]['creditList'][creditList] - ) - let sum = mutations.createSum(credit, amount) - list[creditList] = [{ ...credit }, { ...amount }, { ...sum }] - } - - let existUser = state.users.find(a => { - return a.username === user - }) - if (existUser) { - existUser.username = users[user].username - existUser.firstname = users[user].firstname - existUser.lastname = users[user].lastname - existUser.limit = users[user].limit - existUser.locked = users[user].locked - existUser.autoLock = users[user].autoLock - existUser.creditList = list - } else { - state.users.push({ - username: users[user].username, - firstname: users[user].firstname, - lastname: users[user].lastname, - limit: users[user].limit, - locked: users[user].locked, - autoLock: users[user].autoLock, - creditList: list, - expand: false, - loading: false - }) - } - } - mutations.sortUsers(state) - }, - createAmount(creditList) { - let amount = { - type: 'Schulden', - jan_amount: 0 - creditList.jan.depts, - feb_amount: 0 - creditList.feb.depts, - maer_amount: 0 - creditList.maer.depts, - apr_amount: 0 - creditList.apr.depts, - mai_amount: 0 - creditList.mai.depts, - jun_amount: 0 - creditList.jun.depts, - jul_amount: 0 - creditList.jul.depts, - aug_amount: 0 - creditList.aug.depts, - sep_amount: 0 - creditList.sep.depts, - okt_amount: 0 - creditList.okt.depts, - nov_amount: 0 - creditList.nov.depts, - dez_amount: 0 - creditList.dez.depts, - last: 0 - creditList['last'] - } - - amount.sum = - amount.jan_amount + - amount.feb_amount + - amount.maer_amount + - amount.apr_amount + - amount.mai_amount + - amount.jun_amount + - amount.jul_amount + - amount.aug_amount + - amount.sep_amount + - amount.okt_amount + - amount.nov_amount + - amount.dez_amount - return amount - }, - createCredit(creditList) { - let credit = { - type: 'Guthaben', - jan_amount: creditList.jan.credit, - feb_amount: creditList.feb.credit, - maer_amount: creditList.maer.credit, - apr_amount: creditList.apr.credit, - mai_amount: creditList.mai.credit, - jun_amount: creditList.jun.credit, - jul_amount: creditList.jul.credit, - aug_amount: creditList.aug.credit, - sep_amount: creditList.sep.credit, - okt_amount: creditList.okt.credit, - nov_amount: creditList.nov.credit, - dez_amount: creditList.dez.credit - } - credit.sum = - credit.jan_amount + - credit.feb_amount + - credit.maer_amount + - credit.apr_amount + - credit.mai_amount + - credit.jun_amount + - credit.jul_amount + - credit.aug_amount + - credit.sep_amount + - credit.okt_amount + - credit.nov_amount + - credit.dez_amount - return credit - }, - createSum(credit, amount) { - let sum = { - type: 'Summe', - jan_amount: credit.jan_amount + amount.jan_amount, - feb_amount: credit.feb_amount + amount.feb_amount, - maer_amount: credit.maer_amount + amount.maer_amount, - apr_amount: credit.apr_amount + amount.apr_amount, - mai_amount: credit.mai_amount + amount.mai_amount, - jun_amount: credit.jun_amount + amount.jun_amount, - jul_amount: credit.jul_amount + amount.jul_amount, - aug_amount: credit.aug_amount + amount.aug_amount, - sep_amount: credit.sep_amount + amount.sep_amount, - okt_amount: credit.okt_amount + amount.okt_amount, - nov_amount: credit.nov_amount + amount.nov_amount, - dez_amount: credit.dez_amount + amount.dez_amount - } - sum.sum = - sum.jan_amount + - sum.feb_amount + - sum.maer_amount + - sum.apr_amount + - sum.mai_amount + - sum.jun_amount + - sum.jul_amount + - sum.aug_amount + - sum.sep_amount + - sum.okt_amount + - sum.nov_amount + - sum.dez_amount - return sum - }, - sortUsers: state => { - state.users = state.users.sort((a, b) => { - if (a.locked && b.locked) { - if (a.lastname > b.lastname) return 1 - if (a.lastname < b.lastname) return -1 - if (a.firstname > b.firstname) return 1 - if (a.firstname < b.firstname) return -1 - return 0 - } - if (a.locked) return -1 - if (b.locked) return 1 - if (a.lastname > b.lastname) return 1 - if (a.lastname < b.lastname) return -1 - if (a.firstname > b.firstname) return 1 - if (a.firstname < b.firstname) return -1 - return 0 - }) - }, - updateUsers: (state, data) => { - let index = state.users.indexOf( - state.users.find(a => { - return a.username === data.username - }) - ) - if (data.creditLists !== undefined) { - let list = {} - for (let creditList in data.creditLists) { - let amount = mutations.createAmount(data.creditLists[creditList]) - let credit = mutations.createCredit(data.creditLists[creditList]) - let sum = mutations.createSum(credit, amount) - list[creditList] = [{ ...credit }, { ...amount }, { ...sum }] - } - state.users[index].creditList = list - } - if (data.locked !== undefined) state.users[index].locked = data.locked - if (data.limit !== undefined) state.users[index].limit = data.limit - if (data.autoLock !== undefined) state.users[index].autoLock = data.autoLock - if (data.loading !== undefined) state.users[index].loading = data.loading - }, - setMails: (state, data) => { - state.errorMails = data - }, - setMail: (state, data) => { - state.errorMail = data - }, - setYears: state => { - for (let year = new Date().getFullYear(); year >= 2000; year--) { - state.years.push({ value: year, text: year }) - } - }, - setYear: (state, value) => { - if (value) state.year++ - else state.year-- - }, - setAllUsersLoading: (state, value) => { - state.allUsersLoading = value - }, - setUsersLoading: (state, value) => { - state.usersLoading = value - }, - setEMailLoading: (state, value) => { - state.emailLoading = value - }, - setAddUserLoading: (state, value) => { - state.addUserLoading = value - } -} - -const actions = { - // eslint-disable-next-line no-unused-vars - async getAllUsers({ commit, rootState, dispatch }) { - commit('setAllUsersLoading', true) - try { - const response = await axios.get(url.searchUser, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setAllUsers', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (err) { - if (err.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (err.response) - if (err.response.status === 401) - dispatch('logout', null, { root: true }) - } - commit('setAllUsersLoading', false) - }, - async getUsers({ commit, rootState, dispatch }) { - commit('setUsersLoading', true) - try { - const response = await axios.get(url.getFinanzerMain, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setUsers', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (err) { - if (err.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (err.response) - if (err.response.status === 401) - dispatch('logout', null, { root: true }) - } - commit('setUsersLoading', false) - }, - setActiveUser({ commit }, username) { - commit('setActiveUser', username) - }, - async addAmount({ commit, rootState, dispatch }, data) { - commit('updateUsers', { username: data.user.username, loading: true }) - try { - const response = await axios.post( - url.finanzerAddAmount, - { - userId: data.user.username, - amount: data.amount * 100, - year: data.year, - month: data.month - }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - const creditLists = { ...response.data } - delete creditLists.locked - commit('updateUsers', { - creditLists: creditLists, - locked: response.data.locked, - username: data.user.username - }) - dispatch('getLifetime', null, { root: true }) - } catch (err) { - if (err.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (err.response) - if (err.response.status === 401) - dispatch('logout', null, { root: true }) - } - commit('updateUsers', { username: data.user.username, loading: false }) - }, - async addCredit({ commit, rootState, dispatch }, data) { - commit('updateUsers', { username: data.user.username, loading: true }) - try { - const response = await axios.post( - url.finanzerAddCredit, - { - userId: data.user.username, - credit: data.credit * 100, - year: data.year, - month: data.month - }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - const creditLists = { ...response.data } - delete creditLists.locked - commit('updateUsers', { - creditLists: creditLists, - locked: response.data.locked, - username: data.user.username - }) - dispatch('getLifetime', null, { root: true }) - } catch (err) { - if (err.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (err.response) - if (err.response.status === 401) - dispatch('logout', null, { root: true }) - } - commit('updateUsers', { username: data.user.username, loading: false }) - }, - async doLock({ commit, rootState, dispatch }, data) { - commit('updateUsers', { username: data.user.username, loading: true }) - try { - const response = await axios.post( - url.lockUser, - { userId: data.user.username, locked: data.locked }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateUsers', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - commit('updateUsers', { username: data.user.username, loading: false }) - }, - async saveConfig({ commit, rootState, dispatch }, data) { - commit('updateUsers', { username: data.user.username, loading: true }) - try { - const response = await axios.post( - url.finanzerSetConfig, - { - userId: data.user.username, - limit: data.limit * 100, - autoLock: data.autoLock - }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateUsers', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - commit('updateUsers', { username: data.user.username, loading: false }) - }, - async addUser({ commit, rootState, dispatch }, data) { - commit('setAddUserLoading', true) - try { - const response = await axios.post( - url.finanzerAddUser, - { userId: data.username }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setUsers', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - commit('setAddUserLoading', false) - }, - async sendMails({ commit, rootState, dispatch }) { - commit('setEMailLoading', true) - try { - const response = await axios.get(url.finanzerSendAllMail, { - headers: { Token: rootState.login.user.accessToken }, - timeout: 60000 - }) - commit('setMails', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - commit('setEMailLoading', false) - }, - async sendMail({ commit, rootState, dispatch }, data) { - commit('updateUsers', { username: data.username, loading: true }) - try { - const response = await axios.post( - url.finanzerSendOneMail, - { userId: data.username }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setMail', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - commit('updateUsers', { username: data.username, loading: false }) - }, - createYears({ commit }) { - commit('setYears') - return 'hallo' - }, - countYear({ commit }, value) { - commit('setYear', value) - } -} - -const getters = { - users: state => { - return state.users - }, - activeUser: state => { - return state.users.find(user => { - return user.username === state.activeUser - }) - }, - allUsers: state => { - return state.allUsers - }, - user: state => { - return state.user - }, - errorMails: state => { - return state.errorMails - }, - errorMail: state => { - return state.errorMail - }, - years: state => { - return state.years - }, - selectYears: state => { - return state.years - }, - year: state => { - return state.year - }, - months: state => { - return state.months - }, - allUsersLoading: state => { - return state.allUsersLoading - }, - usersLoading: state => { - return state.usersLoading - }, - addUserLoading: state => { - return state.addUserLoading - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/freeDrinkList.js b/src/store/modules/freeDrinkList.js deleted file mode 100644 index e9fc998..0000000 --- a/src/store/modules/freeDrinkList.js +++ /dev/null @@ -1,438 +0,0 @@ -import axios from 'axios' -import url from '@/plugins/routes' -const timeout = 20000 - -const state = { - free_drink_list_config: [], - free_drink_list_history: [], - free_drink_list_reasons: [], - free_drink_types: [], - free_drink_list_config_loading: false, - free_drink_list_history_loading: false, - free_drink_list_reasons_loading: false, - free_drink_types_loading: false, - snackbar_messages: [] -} - -const mutations = { - set_free_drink_list_config(state, data) { - state.free_drink_list_config = data - }, - set_free_drink_list_history(state, data) { - data.forEach(item => { - item.timestamp = new Date( - item.timestamp.year, - item.timestamp.month - 1, - item.timestamp.day, - item.timestamp.hour, - item.timestamp.minute, - item.timestamp.second - ) - }) - state.free_drink_list_history = data - state.free_drink_list_history.reverse() - }, - set_free_drink_list_config_loading(state, loading) { - state.free_drink_list_config_loading = loading - }, - set_free_drink_list_history_loading(state, loading) { - state.free_drink_list_history_loading = loading - }, - set_free_drink_list_reasons_loading(state, loading) { - state.free_drink_list_reasons_loading = loading - }, - add_snackbar_message(state, { data, error }) { - data.error = error - data.visible = true - data.label = data.free_drink_config != null && data.label == null ? data.free_drink_config.label : data.label - data.price = data.free_drink_config != null && data.price == null ? data.free_drink_config.price : data.price - data.free_drink_type = data.free_drink_type == null ? data.free_drink_types.find(item => { - return item.id == data.free_drink_type_id - }) : data.free_drink_type - data.timer = setTimeout(() => { - if (!data.error) { - data.visible = false - } - }, 5000) - state.snackbar_messages.unshift(data) - }, - set_free_drink_list_reasons(state, data) { - state.free_drink_list_reasons = data - }, - set_free_drink_types(state, data) { - state.free_drink_types = data - }, - set_free_drink_types_loading(state, loading) { - state.free_drink_types_loading = loading - }, - set_free_drink_config(state, data) { - let config = state.free_drink_list_config.find(item => { - return item.id == data.id - }) - Object.assign(config, data) - } -} - -const actions = { - async get_free_drink_list_config({ commit, dispatch, rootState }) { - try { - commit('set_free_drink_list_config_loading', true) - const response = await axios.get(url.freeDrinkListConfig, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('set_free_drink_list_config', response.data) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_list_config_loading', false) - } - }, - async get_free_drink_list_history({ commit, dispatch, rootState }) { - try { - commit('set_free_drink_list_history_loading', true) - const response = await axios.get(url.freeDrinkListHistory, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('set_free_drink_list_history', response.data) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_list_history_loading', false) - } - }, - async get_free_drink_list_history_from_to({ commit, dispatch, rootState }, data) { - try { - commit('set_free_drink_list_history_loading', true) - const response = await axios.post(url.freeDrinkListHistoryFromTo, {...data},{ - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('set_free_drink_list_history', response.data) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_list_history_loading', false) - } - }, - async set_free_drink_list_history({ commit, dispatch, rootState }, data) { - try { - commit('set_free_drink_list_history_loading', true) - const response = await axios.post( - url.freeDrinkListHistory, - { ...data }, - { - headers: { Token: rootState.login.user.accessToken }, - timeout - } - ) - commit('set_free_drink_list_history', response.data) - commit('add_snackbar_message', { data, error: false }) - } catch (e) { - commit('add_snackbar_message', { data, error: true }) - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_list_history_loading', false) - } - }, - async update_free_drink_list_history({ commit, dispatch, rootState }, data) { - try { - commit('set_free_drink_list_history_loading', true) - const response = await axios.put( - url.freeDrinkListHistory, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('set_free_drink_list_history', response.data) - commit('add_snackbar_message', { data, error: false }) - } catch (e) { - dispatch('connectionError/addError', null, { root: true }) - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_list_history_loading', false) - } - }, - async get_free_drink_list_reasons({ commit, dispatch, rootState }) { - try { - commit('set_free_drink_list_reasons_loading', true) - const response = await axios.get(url.freeDrinkListReasons, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('set_free_drink_list_reasons', response.data) - } catch (e) { - dispatch('connectionError/addError', null, { root: true }) - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_list_reasons_loading', false) - } - }, - async get_free_drink_types({ commit, dispatch, rootState }) { - try { - commit('set_free_drink_types_loading', true) - const response = await axios.get(url.freeDrinkTypes, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('set_free_drink_types', response.data) - } catch (e) { - dispatch('connectionError/addError', null, { root: true }) - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_types_loading', false) - } - }, - async set_free_drink_list_config({commit, dispatch, rootState}, data) { - try { - commit('set_free_drink_list_config_loading', true) - const response = await axios.post(url.freeDrinkListConfig, {...data},{ - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('set_free_drink_list_config', response.data) - } catch (e) { - dispatch('connectionError/addError', null, { root: true }) - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_list_config_loading', false) - } - }, - async update_free_drink_list_config({commit, dispatch, rootState}, data) { - try { - commit('set_free_drink_list_config_loading', true) - const response = await axios.put(url.freeDrinkListConfig, {...data},{ - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('set_free_drink_list_config', response.data) - } catch (e) { - dispatch('connectionError/addError', null, { root: true }) - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_list_config_loading', false) - } - }, - async delete_free_drink_list_config({commit, dispatch, rootState}, data) { - try { - commit('set_free_drink_list_config_loading', true) - const response = await axios.post(url.deleteFreeDrinkListConfig, {...data},{ - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('set_free_drink_list_config', response.data) - } catch (e) { - dispatch('connectionError/addError', null, { root: true }) - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_list_config_loading', false) - } - }, - async set_free_drink_list_reason({ commit, dispatch, rootState }, data) { - try { - commit('set_free_drink_list_reasons_loading', true) - const response = await axios.post(url.freeDrinkListReasons, {...data},{ - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('set_free_drink_list_reasons', response.data) - } catch (e) { - dispatch('connectionError/addError', null, { root: true }) - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_list_reasons_loading', false) - } - } - , - async update_free_drink_list_reason({ commit, dispatch, rootState }, data) { - try { - commit('set_free_drink_list_reasons_loading', true) - const response = await axios.put(url.freeDrinkListReasons, {...data},{ - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('set_free_drink_list_reasons', response.data) - } catch (e) { - dispatch('connectionError/addError', null, { root: true }) - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_list_reasons_loading', false) - } - }, - async delete_free_drink_list_reason({ commit, dispatch, rootState }, data) { - try { - commit('set_free_drink_list_reasons_loading', true) - const response = await axios.post(url.deleteFreeDrinkListReason, {...data},{ - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('set_free_drink_list_reasons', response.data) - } catch (e) { - dispatch('connectionError/addError', null, { root: true }) - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } finally { - commit('set_free_drink_list_reasons_loading', false) - } - } - -} - -const getters = { - free_drink_list_config(state) { - return state.free_drink_list_config - }, - free_drink_list_config_job(state) { - return state.free_drink_list_config.filter(item => { - return item.free_drink_types.find(drink_type => { - return drink_type.id == 1 - }) - }) - }, - free_drink_list_config_workgroup(state) { - return state.free_drink_list_config.filter(item => { - return item.free_drink_types.find(drink_type => { - return drink_type.id == 2 - }) - }) - }, - free_drink_list_config_band(state) { - return state.free_drink_list_config.filter(item => { - return item.free_drink_types.find(drink_type => { - return drink_type.id == 3 - }) - }) - }, - free_drink_list_history(state) { - return state.free_drink_list_history - }, - free_drink_list_history_without_canceled(state) { - return state.free_drink_list_history.filter(item => { - return !item.canceled - }) - }, - free_drink_list_history_band(state) { - return state.free_drink_list_history.filter(item => { - return item.free_drink_type.id == 3 - }) - }, - free_drink_list_history_band_without_canceled(state) { - return state.free_drink_list_history.filter(item => { - return item.free_drink_type.id == 3 && !item.canceled - }) - }, - free_drink_list_history_job_without_canceled(state) { - return state.free_drink_list_history.filter(item => { - return item.free_drink_type.id == 1 && !item.canceled - }) - }, - free_drink_list_history_job_credit(state) { - let jobDrinks = state.free_drink_list_history.filter(item => { - return item.free_drink_type.id == 1 && !item.canceled - }) - let credit = 0 - jobDrinks.forEach(item => { - credit += item.free_drink_config.price - }) - return credit - }, - free_drink_list_history_workgroup_without_canceled(state) { - return state.free_drink_list_history.filter(item => { - return item.free_drink_type.id == 2 && !item.canceled - }) - }, - free_drink_list_history_workgroup(state) { - return state.free_drink_list_history.filter(item => { - return item.free_drink_type.id == 2 - }) - }, - loading(state) { - return ( - state.free_drink_list_history_loading || - state.free_drink_list_config_loading - ) - }, - snackbar_messages(state) { - return state.snackbar_messages - }, - free_drink_list_reasons(state) { - return state.free_drink_list_reasons - }, - free_drink_list_reasons_loading(state) { - return state.free_drink_list_reasons_loading - }, - free_drink_types(state) { - return state.free_drink_types - }, - free_drink_list_history_loading(state) { - return state.free_drink_list_history_loading - }, - free_drink_list_config_loading(state) { - return state.free_drink_list_config_loading - }, - free_drink_types_loading(state) { - return state.free_drink_types_loading - }, - free_drink_list_config_by_id: (state) => (id) => { - return state.free_drink_list_config.find(item => { return item.id == id}) - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/jobInvites.js b/src/store/modules/jobInvites.js deleted file mode 100644 index d3de850..0000000 --- a/src/store/modules/jobInvites.js +++ /dev/null @@ -1,437 +0,0 @@ -import axios from 'axios' -import url from '@/plugins/routes' -const timeout = 20000 -const state = { - jobInvitesFromMe: [], - jobInvitesToMe: [], - jobInvitesLoading: false -} - -const mutations = { - setJobInvitesFromMe: (state, jobInvites) => { - state.jobInvitesFromMe = jobInvites - state.jobInvitesFromMe.forEach(item => { - item.on_date = new Date( - item.on_date.year, - item.on_date.month - 1, - item.on_date.day - ) - item.day = { - date: new Date(), - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - }) - }, - setJobInvitesToMe: (state, jobInvites) => { - state.jobInvitesToMe = jobInvites - state.jobInvitesToMe.forEach(item => { - item.on_date = new Date( - item.on_date.year, - item.on_date.month - 1, - item.on_date.day - ) - item.day = { - date: new Date(), - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - }) - }, - setJobInvitesLoading: (state, value) => { - state.jobInvitesLoading = value - }, - updateJobInviteToMe: (state, jobInvite) => { - state.jobInvitesToMe.forEach(item => { - if (item.id === jobInvite.id) { - item.watched = jobInvite.watched - } - }) - }, - updateMonthWorker: (state, { workers, date, getters, from_me }) => { - let mop - if (from_me) { - mop = getters.getDayFromMe(date) - } else { - mop = getters.getDayToMe(date) - } - mop.forEach(a => { - let day = a.day - day.jobkinddate.forEach(item => { - var filtered = workers.filter(worker => { - return item.job_kind.id === (worker.job_kind ? worker.job_kind.id : 1) - }) - var filteredWorkers = [] - filtered.forEach(item => { - filteredWorkers.push(item.user) - }) - filteredWorkers.forEach(worker => { - if ( - !item.worker.find(a => { - return a.id === worker.id - }) - ) { - item.worker.push(worker) - } - }) - item.worker.forEach(worker => { - if ( - !filteredWorkers.find(a => { - return a.id === worker.id - }) - ) { - item.worker.splice(item.worker.indexOf(worker), 1) - } - }) - }) - }) - }, - updateMonthLocked: (state, { locked, date, getters, from_me }) => { - let mop - if (from_me) { - mop = getters.getDayFromMe(date) - } else { - mop = getters.getDayToMe(date) - } - mop.forEach(a => { - let day = a.day - day.locked = !!locked - }) - }, - updateMonthJobkind: (state, { data, date, getters, from_me }) => { - let mop - if (from_me) { - mop = getters.getDayFromMe(date) - } else { - mop = getters.getDayToMe(date) - } - mop.forEach(a => { - let day = a.day - day.date = date - var backup = [] - - for (let jobkind in day.jobkinddate) { - if (day.jobkinddate[jobkind].worker !== undefined) { - backup.push({ - id: day.jobkinddate[jobkind].job_kind.id, - worker: day.jobkinddate[jobkind].worker, - backupWorker: day.jobkinddate[jobkind].backupWorker - }) - } else { - backup.push({ - id: day.jobkinddate[jobkind].job_kind.id, - worker: [], - backupWorker: [] - }) - } - } - day.jobkinddate = [...data] - var test = day.jobkinddate.find(jobkind => { - return jobkind.job_kind.id === 1 - }) - if (!test) { - day.jobkinddate.push({ - id: -1, - job_kind: { id: 1, name: 'Bardienst' }, - maxpersons: 2, - daydate: { - year: date.getFullYear(), - month: date.getMonth() + 1, - day: date.getDate() - }, - worker: [], - backupWorker: [] - }) - } - for (var jobkind in day.jobkinddate) { - var worker = backup.find(item => { - return item.id === day.jobkinddate[jobkind].job_kind.id - }) - day.jobkinddate[jobkind].worker = worker ? worker.worker : [] - day.jobkinddate[jobkind].backupWorker = worker - ? worker.backupWorker - : [] - } - }) - }, - setDayLoading: (state, { getters, date, value }) => { - let day = getters.getDayToMe(date) - day.forEach(a => { - a.day.loading = value - console.log('day', value ? 'loading' : 'not loading', day, a.day.loading) - }) - }, - deleteJobInviteFromMe: (state, jobinvite) => { - var item = state.jobInvitesFromMe.find(item => { - return item.id === jobinvite.id - }) - state.jobInvitesFromMe.splice(state.jobInvitesFromMe.indexOf(item), 1) - } -} - -const actions = { - async getJobInvites({ commit, dispatch, rootState, getters }) { - try { - commit('setJobInvitesLoading', true) - const date = new Date() - const from_me = await axios.post( - url.user.getJobInvites, - { - from_user: rootState.user.user, - date: { - year: date.getFullYear(), - month: date.getMonth() + 1, - day: date.getDate() - } - }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - const workers_from_me = await axios.post( - url.user.getJobOnDates, - from_me.data, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setJobInvitesFromMe', from_me.data) - workers_from_me.data.forEach(item => { - var date = new Date( - item.day.date.year, - item.day.date.month - 1, - item.day.date.day - ) - commit('updateMonthJobkind', { - data: item.jobkinddate, - date, - getters, - from_me: true - }) - commit('updateMonthWorker', { - workers: item.worker, - date, - getters, - from_me: true - }) - commit('updateMonthLocked', { - locked: item.day.locked, - date, - getters, - from_me: true - }) - }) - const to_me = await axios.post( - url.user.getJobInvites, - { - to_user: rootState.user.user, - date: { - year: date.getFullYear(), - month: date.getMonth() + 1, - day: date.getDate() - } - }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - const workers_to_me = await axios.post( - url.user.getJobOnDates, - to_me.data, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setJobInvitesToMe', to_me.data) - workers_to_me.data.forEach(item => { - var date = new Date( - item.day.date.year, - item.day.date.month - 1, - item.day.date.day - ) - commit('updateMonthJobkind', { - data: item.jobkinddate, - date, - getters, - from_me: false - }) - commit('updateMonthWorker', { - workers: item.worker, - date, - getters, - from_me: false - }) - commit('updateMonthLocked', { - locked: item.day.locked, - date, - getters, - from_me: false - }) - }) - commit('setJobInvitesLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async setJobInvites({ commit, dispatch, rootState }, data) { - try { - commit('setJobInvitesLoading', true) - const response = await axios.put(url.user.setJobInvites, data, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setJobInvitesFromMe', response.data) - commit('setJobInvitesLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async addJob({ commit, rootState, dispatch, getters }, data) { - var date = new Date(data.year, data.month - 1, data.day) - commit('setDayLoading', { date, getters, value: true }) - try { - commit('setJobInvitesLoading', true) - const response = await axios.post( - url.user.addJob, - { ...data }, - { - headers: { Token: rootState.login.user.accessToken }, - timeout - } - ) - commit('updateMonthWorker', { - workers: [...response.data], - date: new Date(data.year, data.month - 1, data.day), - getters, - from_me: false - }) - commit('setDayLoading', { date, getters, value: false }) - dispatch('getLifetime', null, { root: true }) - commit('setJobInvitesLoading', false) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async deleteJob({ commit, rootState, dispatch, getters }, data) { - var date = new Date(data.year, data.month - 1, data.day) - commit('setDayLoading', { date, getters, value: true }) - commit('setJobInvitesLoading', true) - try { - const response = await axios.post( - url.user.deleteJob, - { ...data }, - { - headers: { Token: rootState.login.user.accessToken }, - timeout - } - ) - console.log(response.data) - commit('updateMonthWorker', { - workers: [...response.data], - date: new Date(data.year, data.month - 1, data.day), - getters - }) - commit('setDayLoading', { date, getters, value: false }) - dispatch('getLifetime', null, { root: true }) - commit('setJobInvitesLoading', false) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async updateJobInviteToMe({ commit, rootState, dispatch }, data) { - try { - commit('setJobInvitesLoading', true) - const response = await axios.post(url.user.setJobInvites, data, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('updateJobInviteToMe', response.data) - dispatch('getLifetime', null, { root: true }) - commit('setJobInvitesLoading', false) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async deleteJobInviteFromMe({ commit, rootState, dispatch }, data) { - try { - commit('setJobInvitesLoading', true) - await axios.post(url.user.deletJobInvite, data, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('deleteJobInviteFromMe', data) - commit('setJobInvitesLoading', false) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - } -} - -const getters = { - jobInvitesFromMe: state => { - return state.jobInvitesFromMe - }, - jobInvitesToMe: state => { - return state.jobInvitesToMe - }, - jobInvitesLoading: state => { - return state.jobInvitesLoading - }, - getDayToMe: state => { - return date => { - return state.jobInvitesToMe.filter(item => { - return item.on_date - date === 0 - }) - } - }, - getDayFromMe: state => { - return date => { - return state.jobInvitesFromMe.filter(item => { - return item.on_date - date === 0 - }) - } - }, - getDayWorkerFromMe: state => { - return date => { - return state.jobInvitesFromMe.filter(jobInvite => { - return jobInvite.on_date - date === 0 - }) - } - }, - news: state => { - var test = state.jobInvitesToMe.filter(item => { - return !item.watched - }) - return test.length - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/jobRequests.js b/src/store/modules/jobRequests.js deleted file mode 100644 index 65b0ffa..0000000 --- a/src/store/modules/jobRequests.js +++ /dev/null @@ -1,387 +0,0 @@ -import axios from 'axios' -import url from '@/plugins/routes' -const timeout = 20000 -const state = { - jobRequestsFromMe: [], - jobRequestsToMe: [], - jobRequestsLoading: false -} - -const mutations = { - setJobRequestsFromMe: (state, jobRequests) => { - state.jobRequestsFromMe = jobRequests - state.jobRequestsFromMe.forEach(item => { - item.on_date = new Date( - item.on_date.year, - item.on_date.month - 1, - item.on_date.day - ) - item.day = { - date: new Date(), - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - }) - }, - setJobRequestsToMe: (state, jobRequests) => { - state.jobRequestsToMe = jobRequests - state.jobRequestsToMe.forEach(item => { - item.on_date = new Date( - item.on_date.year, - item.on_date.month - 1, - item.on_date.day - ) - item.day = { - date: new Date(), - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - }) - }, - setJobRequestsLoading: (state, value) => { - state.jobRequestsLoading = value - }, - updateJobRequestToMe: (state, jobRequest) => { - state.jobRequestsToMe.forEach(item => { - if (item.id === jobRequest.id) { - item.watched = jobRequest.watched - item.accepted = jobRequest.accepted - } - }) - }, - updateMonthWorker: (state, { workers, date, getters, from_me }) => { - let mop - if (from_me) { - mop = getters.getDayFromMe(date) - } else { - mop = getters.getDayToMe(date) - } - mop.forEach(a => { - let day = a.day - day.jobkinddate.forEach(item => { - var filtered = workers.filter(worker => { - return item.job_kind.id === (worker.job_kind ? worker.job_kind.id : 1) - }) - var filteredWorkers = [] - filtered.forEach(item => { - filteredWorkers.push(item.user) - }) - filteredWorkers.forEach(worker => { - if ( - !item.worker.find(a => { - return a.id === worker.id - }) - ) { - item.worker.push(worker) - } - }) - item.worker.forEach(worker => { - if ( - !filteredWorkers.find(a => { - return a.id === worker.id - }) - ) { - item.worker.splice(item.worker.indexOf(worker), 1) - } - }) - }) - }) - }, - updateMonthLocked: (state, { locked, date, getters, from_me }) => { - let mop - if (from_me) { - mop = getters.getDayFromMe(date) - } else { - mop = getters.getDayToMe(date) - } - mop.forEach(a => { - let day = a.day - day.locked = !!locked - }) - }, - updateMonthJobkind: (state, { data, date, getters, from_me }) => { - let mop - if (from_me) { - mop = getters.getDayFromMe(date) - } else { - mop = getters.getDayToMe(date) - } - mop.forEach(a => { - let day = a.day - day.date = date - var backup = [] - - for (let jobkind in day.jobkinddate) { - if (day.jobkinddate[jobkind].worker !== undefined) { - backup.push({ - id: day.jobkinddate[jobkind].job_kind.id, - worker: day.jobkinddate[jobkind].worker, - backupWorker: day.jobkinddate[jobkind].backupWorker - }) - } else { - backup.push({ - id: day.jobkinddate[jobkind].job_kind.id, - worker: [], - backupWorker: [] - }) - } - } - day.jobkinddate = [...data] - var test = day.jobkinddate.find(jobkind => { - return jobkind.job_kind.id === 1 - }) - if (!test) { - day.jobkinddate.push({ - id: -1, - job_kind: { id: 1, name: 'Bardienst' }, - maxpersons: 2, - daydate: { - year: date.getFullYear(), - month: date.getMonth() + 1, - day: date.getDate() - }, - worker: [], - backupWorker: [] - }) - } - for (var jobkind in day.jobkinddate) { - var worker = backup.find(item => { - return item.id === day.jobkinddate[jobkind].job_kind.id - }) - day.jobkinddate[jobkind].worker = worker ? worker.worker : [] - day.jobkinddate[jobkind].backupWorker = worker - ? worker.backupWorker - : [] - } - }) - }, - setDayLoading: (state, { getters, date, value }) => { - let day = getters.getDayToMe(date) - day.forEach(a => { - a.day.loading = value - }) - }, - deleteJobRequestFromMe: (state, jobrequest) => { - var item = state.jobRequestsFromMe.find(item => { - return item.id === jobrequest.id - }) - state.jobRequestsFromMe.splice(state.jobRequestsFromMe.indexOf(item), 1) - } -} - -const actions = { - async getJobRequests({ commit, dispatch, rootState, getters }) { - try { - commit('setJobRequestsLoading', true) - const date = new Date() - const from_me = await axios.post( - url.user.getJobRequests, - { - from_user: rootState.user.user, - date: { - year: date.getFullYear(), - month: date.getMonth() + 1, - day: date.getDate() - } - }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - const workers_from_me = await axios.post( - url.user.getJobOnDates, - from_me.data, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setJobRequestsFromMe', from_me.data) - workers_from_me.data.forEach(item => { - var date = new Date( - item.day.date.year, - item.day.date.month - 1, - item.day.date.day - ) - commit('updateMonthJobkind', { - data: item.jobkinddate, - date, - getters, - from_me: true - }) - commit('updateMonthWorker', { - workers: item.worker, - date, - getters, - from_me: true - }) - commit('updateMonthLocked', { - locked: item.day.locked, - date, - getters, - from_me: true - }) - }) - const to_me = await axios.post( - url.user.getJobRequests, - { - to_user: rootState.user.user, - date: { - year: date.getFullYear(), - month: date.getMonth() + 1, - day: date.getDate() - } - }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - const workers_to_me = await axios.post( - url.user.getJobOnDates, - to_me.data, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setJobRequestsToMe', to_me.data) - workers_to_me.data.forEach(item => { - var date = new Date( - item.day.date.year, - item.day.date.month - 1, - item.day.date.day - ) - commit('updateMonthJobkind', { - data: item.jobkinddate, - date, - getters, - from_me: false - }) - commit('updateMonthWorker', { - workers: item.worker, - date, - getters, - from_me: false - }) - commit('updateMonthLocked', { - locked: item.day.locked, - date, - getters, - from_me: false - }) - }) - commit('setJobRequestsLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async setJobRequests({ commit, dispatch, rootState }, data) { - try { - commit('setJobRequestsLoading', true) - const response = await axios.put(url.user.setJobRequests, data, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setJobRequestsFromMe', response.data) - commit('setJobRequestsLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async updateJobRequestToMe({ commit, rootState, dispatch }, data) { - try { - commit('setJobRequestsLoading', true) - data.on_date = { - year: data.on_date.getFullYear(), - month: data.on_date.getMonth() + 1, - day: data.on_date.getDate() - } - const response = await axios.post(url.user.setJobRequests, data, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - response.data.on_date = new Date( - response.data.on_date.year, - response.data.on_date.month - 1, - response.data.on_date.day - ) - commit('updateJobRequestToMe', response.data) - commit('setJobRequestsLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async deleteJobRequestFromMe({ commit, rootState, dispatch }, data) { - try { - commit('setJobRequestsLoading', true) - await axios.post(url.user.deletJobRequest, data, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('deleteJobRequestFromMe', data) - commit('setJobRequestsLoading', false) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - } -} - -const getters = { - jobRequestsFromMe: state => { - return state.jobRequestsFromMe - }, - jobRequestsToMe: state => { - return state.jobRequestsToMe - }, - jobRequestsLoading: state => { - return state.jobRequestsLoading - }, - getDayToMe: state => { - return date => { - return state.jobRequestsToMe.filter(item => { - return item.on_date - date === 0 - }) - } - }, - getDayFromMe: state => { - return date => { - return state.jobRequestsFromMe.filter(item => { - return item.on_date - date === 0 - }) - } - }, - getDayWorkerFromMe: state => { - return date => { - return state.jobRequestsFromMe.filter(jobRequest => { - return jobRequest.on_date - date === 0 - }) - } - }, - news: state => { - var test = state.jobRequestsToMe.filter(item => { - return !item.watched - }) - return test.length - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/jobkindManager.js b/src/store/modules/jobkindManager.js deleted file mode 100644 index 3ec1ebf..0000000 --- a/src/store/modules/jobkindManager.js +++ /dev/null @@ -1,132 +0,0 @@ -import url from '@/plugins/routes' -import axios from 'axios' -const timeout = 20000 -const state = { - jobkinds: [], - jobkindLoading: false -} - -const mutations = { - setJobkinds: (state, jobkinds) => { - state.jobkinds = jobkinds - }, - updateJobKind: (state, jobkind) => { - console.log(jobkind) - const exists = state.jobkinds.find(a => { - return a.id === jobkind.id - }) - console.log(exists) - if (exists) { - exists.name = jobkind.name - exists.workgroup = jobkind.workgroup - } else { - state.jobkinds.push(jobkind) - } - }, - deleteJobKind: (state, jobkind) => { - const exists = state.jobkinds.indexOf( - state.jobkinds.find(a => { - return a.id === jobkind.id - }) - ) - state.jobkinds.splice(exists, 1) - }, - setJobkindsLoading: (state, value) => { - state.jobkindLoading = value - } -} - -const actions = { - async getAllJobKinds({ commit, rootState, dispatch }) { - try { - commit('setJobkindsLoading', true) - const response = await axios.get(url.vorstand.sm.getAllJobKindsbKinds, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setJobkinds', response.data) - commit('setJobkindsLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async addJobKind({ commit, rootState, dispatch }, data) { - try { - commit('setJobkindsLoading', true) - const response = await axios.put( - url.vorstand.sm.jobkind, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateJobKind', response.data) - commit('setJobkindsLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async updateJobKind({ commit, rootState, dispatch }, data) { - try { - commit('setJobkindsLoading', true) - const response = await axios.post( - url.vorstand.sm.jobkind, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateJobKind', response.data) - commit('setJobkindsLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async deleteJobKind({ commit, rootState, dispatch }, data) { - try { - commit('setJobkindsLoading', true) - await axios.post( - url.vorstand.sm.deleteJobKind, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('deleteJobKind', data) - commit('setJobkindsLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - } -} - -const getters = { - jobkinds: state => { - return state.jobkinds - }, - jobkindsLoading: state => { - return state.jobkindLoading - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/jobs.js b/src/store/modules/jobs.js deleted file mode 100644 index 85ae0e9..0000000 --- a/src/store/modules/jobs.js +++ /dev/null @@ -1,476 +0,0 @@ -import axios from 'axios' -import url from '@/plugins/routes' -const timeout = 20000 -const state = { - month: [], - allUsers: [], - disabled: false -} - -const mutations = { - setAllUsers: (state, data) => { - state.allUsers = [] - state.allUsers = data.users - const index = state.allUsers.indexOf( - state.allUsers.find(a => a.username === data.username) - ) - state.allUsers.splice(index, 1) - for (let i = 0; i < state.allUsers.length; i++) { - state.allUsers[i].fullName = - state.allUsers[i].firstname + ' ' + state.allUsers[i].lastname - } - }, - createMonth: (state, date) => { - let month = [] - let id = 0 - const year = date.getFullYear() - const mon = date.getMonth() - let a = new Date(year, mon + 1, 0) - let days = a.getDate() - let startDate = 1 - for (let intDay = 1; intDay <= days; intDay++) { - if (new Date(year, mon, intDay).getDay() === 3) { - startDate = intDay - break - } - } - let end = false - let week = { id: id, days: {} } - for (let intDay = startDate; intDay <= days + 7; intDay++) { - if (end) break - let currentDate = new Date(year, mon, intDay) - - switch (currentDate.getDay()) { - case 1: - mutations.setStartEndDate(week) - month.push(week) - id++ - week = { id: id, days: {} } - week.days.monday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Montag', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - break - case 2: - week.days.tuesday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Dienstag', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - break - case 3: - if (currentDate.getMonth() === mon + 1) { - end = true - mutations.setStartEndDate(week) - month.push(week) - } else { - week.days.wednesday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Mittwoch', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - } - break - case 4: - week.days.thursday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Donnerstag', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - break - case 5: - week.days.friday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Freitag', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - break - case 6: - week.days.satturday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Samstag', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - break - case 0: - week.days.sunday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Sonntag', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - break - } - } - state.month = month - }, - updateMonth: (state, data) => { - const date = new Date(data.start.year, data.start.month - 1, data.start.day) - const user = data.user - for (let week = 0; week < state.month.length; week++) { - for (let day in state.month[week].days) { - if (state.month[week].days[day].date - date === 0) { - if (user) { - let worker = state.month[week].days[day].worker.find(a => { - return a.username === user.username - }) - if (!worker && data.com === 'add') { - state.month[week].days[day].worker.push({ - firstname: user.firstname, - lastname: user.lastname, - username: user.username, - fullName: user.firstname + ' ' + user.lastname - }) - } - if (worker && data.com === 'delete') { - const index = state.month[week].days[day].worker.indexOf(worker) - state.month[week].days[day].worker.splice(index, 1) - } - } - if (data.day) { - state.month[week].days[day].locked = data.day.locked - } - } - } - } - }, - // eslint-disable-next-line no-unused-vars - updateMonthWorker: (state, { workers, date, getters }) => { - var day = getters.getDay(date) - day.jobkinddate.forEach(item => { - var filtered = workers.filter(worker => { - return item.job_kind.id === (worker.job_kind ? worker.job_kind.id : 1) - }) - var filteredWorkers = [] - filtered.forEach(item => { - filteredWorkers.push(item.user) - }) - filteredWorkers.forEach(worker => { - if ( - !item.worker.find(a => { - return a.id === worker.id - }) - ) { - item.worker.push(worker) - } - }) - item.worker.forEach(worker => { - if ( - !filteredWorkers.find(a => { - return a.id === worker.id - }) - ) { - item.worker.splice(item.worker.indexOf(worker), 1) - } - }) - }) - }, - updateMonthLocked: (state, { locked, date, getters }) => { - var day = getters.getDay(date) - day.locked = !!locked - }, - updateMonthJobkind: (state, { data, date, getters }) => { - let day = getters.getDay(date) - var backup = [] - - for (let jobkind in day.jobkinddate) { - if (day.jobkinddate[jobkind].worker !== undefined) { - backup.push({ - id: day.jobkinddate[jobkind].job_kind.id, - worker: day.jobkinddate[jobkind].worker, - backupWorker: day.jobkinddate[jobkind].backupWorker - }) - } else { - backup.push({ - id: day.jobkinddate[jobkind].job_kind.id, - worker: [], - backupWorker: [] - }) - } - } - day.jobkinddate = [...data] - var test = day.jobkinddate.find(jobkind => { - return jobkind.job_kind.id === 1 - }) - if (!test) { - day.jobkinddate.push({ - id: -1, - job_kind: { id: 1, name: 'Bardienst' }, - maxpersons: 2, - daydate: { - year: date.getFullYear(), - month: date.getMonth() + 1, - day: date.getDate() - }, - worker: [], - backupWorker: [] - }) - } - for (var jobkind in day.jobkinddate) { - var worker = backup.find(item => { - return item.id === day.jobkinddate[jobkind].job_kind.id - }) - day.jobkinddate[jobkind].worker = worker ? worker.worker : [] - day.jobkinddate[jobkind].backupWorker = worker ? worker.backupWorker : [] - } - }, - setAllDayLoading: state => { - for (let week = 0; week < state.month.length; week++) { - for (let day in state.month[week].days) { - state.month[week].days[day].loading = true - } - } - }, - setDayLoading: (state, { date, getters }) => { - let day = getters.getDay(date) - day.loading = true - }, - setDayNotLoading: (state, { date, getters }) => { - let day = getters.getDay(date) - day.loading = false - }, - setDisabled: (state, data) => { - state.disabled = data - }, - setStartEndDate: week => { - if (week.days.monday) { - week.startDate = week.days.monday.date - } else if (week.days.tuesday) { - week.startDate = week.days.tuesday.date - } else if (week.days.wednesday) { - week.startDate = week.days.wednesday.date - } else if (week.days.thursday) { - week.startDate = week.days.thursday.date - } else if (week.days.friday) { - week.startDate = week.days.friday.date - } else if (week.days.satturday) { - week.startDate = week.days.satturday.date - } else if (week.days.sunday) { - week.startDate = week.days.sunday.date - } - - if (week.days.sunday) { - week.endDate = week.days.sunday.date - } else if (week.days.satturday) { - week.endDate = week.days.satturday.date - } else if (week.days.friday) { - week.endDate = week.days.friday.date - } else if (week.days.thursday) { - week.endDate = week.days.thursday.date - } else if (week.days.wednesday) { - week.endDate = week.days.wednesday.date - } else if (week.days.tuesday) { - week.endDate = week.days.tuesday.date - } else if (week.days.monday) { - week.endDate = week.days.monday.date - } - } -} - -const actions = { - async getAllUsers({ commit, rootState, dispatch }) { - try { - const response = await axios.get(url.searchUser, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setAllUsers', { - users: response.data, - username: rootState.login.user.username - }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.data === 401) dispatch('logout', null, { root: true }) - } - }, - createMonth({ commit }, date) { - commit('setDisabled', true) - commit('createMonth', date) - commit('setDisabled', false) - }, - setDayLoading({ commit, getters }, date) { - commit('setDayLoading', { date, getters }) - }, - setDayNotLoading({ commit, getters }, date) { - commit('setDayNotLoading', { date, getters }) - }, - async getUsers({ commit, rootState, dispatch, getters }, data) { - commit('setAllDayLoading') - try { - const response = await axios.post( - url.vorstand.sm.getUsers, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - for (var day in response.data) { - var date = new Date( - response.data[day].day.date.year, - response.data[day].day.date.month - 1, - response.data[day].day.date.day - ) - commit('updateMonthJobkind', { - data: [...response.data[day].jobkinddate], - date, - getters - }) - commit('updateMonthWorker', { - workers: [...response.data[day].worker], - date, - getters - }) - commit('updateMonthLocked', { - locked: response.data[day].day.locked, - date, - getters - }) - commit('setDayNotLoading', { date, getters }) - } - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async addJob({ commit, rootState, dispatch, getters }, data) { - var date = new Date(data.year, data.month - 1, data.day) - commit('setDayLoading', { date, getters }) - try { - const response = await axios.post( - url.user.addJob, - { ...data }, - { - headers: { Token: rootState.login.user.accessToken }, - timeout - } - ) - commit('updateMonthWorker', { - workers: [...response.data], - date: new Date(data.year, data.month - 1, data.day), - getters - }) - commit('setDayNotLoading', { date, getters }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - // eslint-disable-next-line no-unused-vars - async deleteJob({ commit, rootState, dispatch, getters }, data) { - var date = new Date(data.year, data.month - 1, data.day) - commit('setDayLoading', { date, getters }) - try { - const response = await axios.post( - url.user.deleteJob, - { ...data }, - { - headers: { Token: rootState.login.user.accessToken }, - timeout - } - ) - console.log(response.data) - commit('updateMonthWorker', { - workers: [...response.data], - date: new Date(data.year, data.month - 1, data.day), - getters - }) - commit('setDayNotLoading', { date, getters }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - console.log(e) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async transactJob({ rootState, dispatch }, data) { - try { - await axios.post( - url.user.transactJob, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - } -} - -const getters = { - month: state => { - return state.month - }, - getDay: state => date => { - for (let week = 0; week < state.month.length; week++) { - for (let day in state.month[week].days) { - if (state.month[week].days[day].date - date === 0) { - return state.month[week].days[day] - } - } - } - }, - disabled: state => { - return state.disabled - }, - allUsers: state => { - return state.allUsers - }, - getStartDate: state => { - return state.month[0].startDate - }, - getEndDate: state => { - return state.month[state.month.length - 1].endDate - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/login.js b/src/store/modules/login.js deleted file mode 100644 index 2597370..0000000 --- a/src/store/modules/login.js +++ /dev/null @@ -1,268 +0,0 @@ -import axios from 'axios' -import router from '@/router' -import url from '@/plugins/routes' -const timeout = 20000 -const state = { - user: { - username: null, - firstname: null, - lastname: null, - accessToken: null, - groups: null - }, - loggingIn: false, - loginError: null, - cookieNotification: true, - cookieAccepted: false, - lifeTime: 1800 -} - -const mutations = { - loginStart: state => (state.loggingIn = true), - loginStop(state, errorMessage) { - state.loggingIn = false - state.loginError = errorMessage - }, - updateAccessToken(state, data) { - if (typeof data === typeof '') { - data = JSON.parse(data) - } - if (data === null || data === undefined) { - state.user.username = null - state.user.accessToken = null - state.user.groups = null - } else { - state.user.username = data.username - state.user.accessToken = data.accessToken - state.user.groups = data.groups - state.user.firstname = data.firstname - state.user.lastname = data.lastname - } - }, - logout(state) { - state.user.accessToken = null - state.user.username = null - state.user.groups = null - state.user.firstname = null - state.user.lastname = null - }, - setCookieNotification(state, value) { - state.cookieNotification = value - }, - setCookieAccepted(state, value) { - state.cookieAccepted = value - }, - setLifetime(state, value) { - state.lifeTime = value - } -} - -const actions = { - async doLogin({ commit, dispatch }, loginData) { - commit('loginStart') - try { - const response = await axios.post(url.login, { ...loginData }) - /*const cookieA = localStorage.getItem('cookie:accepted') - if (!cookieA) { - commit('loginStop', 'Sie müssen die Cookies akzeptieren!') - commit('setCookieNotification', true) - commit('setCookieAccepted', false) - return - }*/ - localStorage.setItem( - 'user', - JSON.stringify({ - username: response.data.username, - accessToken: response.data.accessToken, - groups: response.data.groups, - firstname: response.data.firstname, - lastname: response.data.lastname - }) - ) - commit('loginStop', null) - commit('updateAccessToken', response.data) - if (state.user.groups.includes('bar')) { - router.push('/main/bar/geruecht') - } else if (state.user.groups.includes('user')) { - router.push('/main/user/add') - } else if (state.user.groups.includes('extern')) { - router.push('/main') - } - } catch (err) { - if (err.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('loginStop', err.response.data.error) - commit('updateAccessToken', { - username: null, - accessToken: null, - groups: null, - firstname: null, - lastname: null - }) - } - }, - fetchAccessToken({ commit }) { - commit('updateAccessToken', localStorage.getItem('user')) - }, - logout({ commit, rootState }) { - var accessToken = rootState.login.user.accessToken - localStorage.removeItem('user') - localStorage.removeItem('cookie:accepted') - commit('setCookieNotification', true) - commit('setCookieAccepted', false) - commit('logout') - router.push('/login') - axios.get(url.logout, { - headers: { Token: accessToken } - }) - }, - resetLoginError({ commit }) { - commit('loginStop') - }, - acceptNotification({ commit }) { - localStorage.setItem('cookie:accepted', true) - commit('setCookieAccepted', true) - commit('setCookieNotification', false) - }, - disableNotification({ commit }) { - commit('setCookieNotification', false) - }, - getCookieAccepted({ commit }) { - var cookie = localStorage.getItem('cookie:accepted') - commit('setCookieAccepted', cookie) - }, - setLifetime({ commit }, value) { - commit('setLifetime', value) - }, - async saveLifetime({ commit, rootState, dispatch }, value) { - try { - const response = await axios.post( - url.saveLifetime, - { value: value }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setLifetime', response.data.value) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async getLifetime({ commit, rootState, dispatch }) { - try { - if (!rootState.login.user.accessToken) { - return - } - const response = await axios.get(url.getLifetime, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setLifetime', response.data.value) - var user = JSON.parse(localStorage.getItem('user')) - user.groups = response.data.groups - localStorage.setItem('user', JSON.stringify(user)) - commit('updateAccessToken', user) - dispatch('barUsers/setLockStatus', response.data.lock_bar, { - root: true - }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - } -} - -const getters = { - loggingIn: state => { - return state.loggingIn - }, - getGroup: state => { - return state.user.groups - }, - group: state => { - return state.user.groups - }, - getToken: state => { - return state.user.accessToken - }, - token: state => { - return state.user.accessToken - }, - loginError: state => { - return state.loginError - }, - isBar: state => { - try { - return state.user.groups.includes('bar') - } catch (e) { - return false - } - }, - isFinanzer: state => { - try { - return state.user.groups.includes('moneymaster') - } catch (e) { - return false - } - }, - isUser: state => { - try { - return state.user.groups.includes('user') - } catch (e) { - return false - } - }, - isGastro: state => { - try { - return state.user.groups.includes('gastro') - } catch (e) { - return false - } - }, - isExtern: state => { - try { - return state.user.groups.includes('extern') - } catch (e) { - return false - } - }, - isManagement: state => { - try { - return ( - state.user.groups.includes('vorstand') || - state.user.groups.includes('gastro') || - state.user.groups.includes('moneymaster') - ) - } catch (e) { - return false - } - }, - isLoggedIn: state => { - return state.user.accessToken - }, - user: state => { - return state.user - }, - cookieNotification: state => { - return state.cookieNotification - }, - cookieAccepted: state => { - return state.cookieAccepted - }, - lifeTime: state => { - return state.lifeTime - } -} - -export default { - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/pricelist.js b/src/store/modules/pricelist.js deleted file mode 100644 index b87a8e4..0000000 --- a/src/store/modules/pricelist.js +++ /dev/null @@ -1,269 +0,0 @@ -import url from '@/plugins/routes' -import axios from 'axios' -const timeout = 20000 -const state = { - priceListLoading: false, - typesLoading: false, - priceList: [], - types: [] -} - -const mutations = { - setPriceList: (state, priceList) => { - state.priceList = priceList - }, - setTypes: (state, types) => { - state.types = types - state.types.sort((a, b) => { - const low = b.name.toLowerCase() - const high = a.name.toLowerCase() - if (high < low) return -1 - if (high > low) return 1 - return 0 - }) - }, - updatePriceList: (state, drink) => { - var a = state.priceList.find(b => { - return b.id === drink.id - }) - if (a) { - a.name = drink.name - a.type = drink.type - a.price = drink.price - a.price_big = drink.price_big - a.price_club = drink.price_club - a.price_club_big = drink.price_club_big - a.premium = drink.premium - a.premium_club = drink.premium_club - a.price_extern_club = drink.price_extern_club - } else { - state.priceList.push({ - id: drink.id, - name: drink.name, - type: drink.type, - price: drink.price, - price_big: drink.price_big, - price_club: drink.price_club, - price_club_big: drink.price_club_big, - premium: drink.premium, - premium_club: drink.premium_club, - price_extern_club: drink.price_extern_club - }) - } - }, - deleteDrinkPrice: (state, data) => { - var index = state.priceList.indexOf( - state.priceList.find(a => { - return a.id === data.id - }) - ) - state.priceList.splice(index, 1) - }, - updateDrinkType: (state, type) => { - var a = state.types.find(b => { - return b.id === type.id - }) - if (a) { - a.name = type.name - } else { - state.types.push({ - ...type - }) - } - state.types.sort((a, b) => { - const low = b.name.toLowerCase() - const high = a.name.toLowerCase() - if (high < low) return -1 - if (high > low) return 1 - return 0 - }) - }, - deleteDrinkType: (state, type) => { - var index = state.types.indexOf( - state.types.find(a => { - return a.id === type.id - }) - ) - state.types.splice(index, 1) - }, - setPriceListLoading: (state, value) => { - state.priceListLoading = value - }, - setTypesLoading: (state, value) => { - state.typesLoading = value - } -} - -const actions = { - async getPriceList({ commit, dispatch }) { - try { - commit('setPriceListLoading', true) - const response = await axios.get(url.pricelist, { timeout }) - commit('setPriceList', response.data) - commit('setPriceListLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setPriceListLoading', false) - } - }, - async getTypes({ commit, dispatch }) { - try { - commit('setTypesLoading', true) - const response = await axios.get(url.getTypes, { timeout }) - commit('setTypes', response.data) - commit('setTypesLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setTypesLoading', false) - } - }, - async setDrink({ commit, rootState, dispatch }, data) { - try { - commit('setPriceListLoading', true) - const response = await axios.post( - url.gastro.setDrink, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updatePriceList', response.data) - commit('setPriceListLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setPriceListLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async updateDrink({ commit, rootState, dispatch }, data) { - try { - commit('setPriceListLoading', true) - const response = await axios.post( - url.gastro.updateDrink, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updatePriceList', response.data) - commit('setPriceListLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setPriceListLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async deleteDrink({ commit, rootState, dispatch }, data) { - try { - commit('setPriceListLoading', true) - await axios.post( - url.gastro.deleteDrink, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('deleteDrinkPrice', data) - commit('setPriceListLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setPriceListLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async setDrinkType({ commit, rootState, dispatch }, data) { - try { - commit('setTypesLoading', true) - const response = await axios.post( - url.gastro.setType, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateDrinkType', response.data) - commit('setTypesLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setTypesLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async updateDrinkType({ commit, rootState, dispatch }, data) { - try { - commit('setTypesLoading', true) - const response = await axios.post( - url.gastro.updateType, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateDrinkType', response.data) - commit('setTypesLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setTypesLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async deleteDrinkType({ commit, rootState, dispatch }, data) { - try { - commit('setTypesLoading', true) - await axios.post( - url.gastro.deleteType, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('deleteDrinkType', data) - commit('setTypesLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setTypesLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - } -} - -const getters = { - priceList: state => { - return state.priceList - }, - types: state => { - return state.types - }, - priceListLoading: state => { - return state.priceListLoading - }, - typesLoading: state => { - return state.typesLoading - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/serviceManagement.js b/src/store/modules/serviceManagement.js deleted file mode 100644 index d9cef29..0000000 --- a/src/store/modules/serviceManagement.js +++ /dev/null @@ -1,460 +0,0 @@ -import axios from 'axios' -import url from '@/plugins/routes' -const timeout = 20000 -const state = { - month: [], - allUsers: [], - disabled: false -} - -const mutations = { - setAllUsers: (state, users) => { - state.allUsers = [] - state.allUsers = users - for (let i = 0; i < state.allUsers.length; i++) { - state.allUsers[i].fullName = - state.allUsers[i].firstname + ' ' + state.allUsers[i].lastname - } - }, - createMonth: (state, date) => { - let month = [] - let id = 0 - const year = date.getFullYear() - const mon = date.getMonth() - let a = new Date(year, mon + 1, 0) - let days = a.getDate() - let startDate = 1 - for (let intDay = 1; intDay <= days; intDay++) { - if (new Date(year, mon, intDay).getDay() === 3) { - startDate = intDay - break - } - } - let end = false - let week = { id: id, days: {} } - for (let intDay = startDate; intDay <= days + 7; intDay++) { - if (end) break - let currentDate = new Date(year, mon, intDay) - - switch (currentDate.getDay()) { - case 1: - mutations.setStartEndDate(week) - month.push(week) - id++ - week = { id: id, days: {} } - week.days.monday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Montag', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - break - case 2: - week.days.tuesday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Dienstag', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - break - case 3: - if (currentDate.getMonth() === mon + 1) { - end = true - mutations.setStartEndDate(week) - month.push(week) - } else { - week.days.wednesday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Mittwoch', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - } - break - case 4: - week.days.thursday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Donnerstag', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - break - case 5: - week.days.friday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Freitag', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - break - case 6: - week.days.satturday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Samstag', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - break - case 0: - week.days.sunday = { - id: currentDate.getDay(), - date: currentDate, - name: 'Sonntag', - worker: [], - loading: false, - locked: false, - jobkinddate: [] - } - break - } - } - state.month = month - }, - setStartEndDate: week => { - if (week.days.monday) { - week.startDate = week.days.monday.date - } else if (week.days.tuesday) { - week.startDate = week.days.tuesday.date - } else if (week.days.wednesday) { - week.startDate = week.days.wednesday.date - } else if (week.days.thursday) { - week.startDate = week.days.thursday.date - } else if (week.days.friday) { - week.startDate = week.days.friday.date - } else if (week.days.satturday) { - week.startDate = week.days.satturday.date - } else if (week.days.sunday) { - week.startDate = week.days.sunday.date - } - - if (week.days.sunday) { - week.endDate = week.days.sunday.date - } else if (week.days.satturday) { - week.endDate = week.days.satturday.date - } else if (week.days.friday) { - week.endDate = week.days.friday.date - } else if (week.days.thursday) { - week.endDate = week.days.thursday.date - } else if (week.days.wednesday) { - week.endDate = week.days.wednesday.date - } else if (week.days.tuesday) { - week.endDate = week.days.tuesday.date - } else if (week.days.monday) { - week.endDate = week.days.monday.date - } - }, - // eslint-disable-next-line no-unused-vars - updateMonthWorker: (state, { workers, date, getters }) => { - var day = getters.getDay(date) - day.jobkinddate.forEach(item => { - var filtered = workers.filter(worker => { - return item.job_kind.id === (worker.job_kind ? worker.job_kind.id : 1) - }) - var filteredWorkers = [] - filtered.forEach(item => { - filteredWorkers.push(item.user) - }) - filteredWorkers.forEach(worker => { - if ( - !item.worker.find(a => { - return a.id === worker.id - }) - ) { - item.worker.push(worker) - item.backupWorker.push(worker) - } - }) - item.worker.forEach(worker => { - if ( - !filteredWorkers.find(a => { - return a.id === worker.id - }) - ) { - item.worker.splice(item.worker.indexOf(worker), 1) - } - }) - }) - }, - updateMonthLocked: (state, { locked, date, getters }) => { - var day = getters.getDay(date) - day.locked = !!locked - }, - updateMonthJobkind: (state, { data, date, getters }) => { - let day = getters.getDay(date) - var backup = [] - - for (let jobkind in day.jobkinddate) { - if (day.jobkinddate[jobkind].worker !== undefined) { - backup.push({ - id: day.jobkinddate[jobkind].job_kind.id, - worker: day.jobkinddate[jobkind].worker, - backupWorker: day.jobkinddate[jobkind].backupWorker - }) - } else { - backup.push({ - id: day.jobkinddate[jobkind].job_kind.id, - worker: [], - backupWorker: [] - }) - } - } - day.jobkinddate = [...data] - var test = day.jobkinddate.find(jobkind => { - return jobkind.job_kind.id === 1 - }) - if (!test) { - day.jobkinddate.push({ - id: -1, - job_kind: { id: 1, name: 'Bardienst' }, - maxpersons: 2, - daydate: { - year: date.getFullYear(), - month: date.getMonth() + 1, - day: date.getDate() - }, - worker: [], - backupWorker: [] - }) - } - for (var jobkind in day.jobkinddate) { - var worker = backup.find(item => { - return item.id === day.jobkinddate[jobkind].job_kind.id - }) - day.jobkinddate[jobkind].worker = worker ? worker.worker : [] - day.jobkinddate[jobkind].backupWorker = worker ? worker.backupWorker : [] - } - }, - setAllDayLoading: state => { - for (let week = 0; week < state.month.length; week++) { - for (let day in state.month[week].days) { - state.month[week].days[day].loading = true - } - } - }, - setDayLoading: (state, { date, getters }) => { - let day = getters.getDay(date) - day.loading = true - }, - setDayNotLoading: (state, { date, getters }) => { - let day = getters.getDay(date) - day.loading = false - }, - setDisabled: (state, data) => { - state.disabled = data - } -} -const actions = { - createMonth({ commit }, date) { - commit('setDisabled', true) - commit('createMonth', date) - commit('setDisabled', false) - }, - async getAllUsers({ commit, rootState, dispatch }) { - try { - const response = await axios.get(url.vorstand.sm.searchUser, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setAllUsers', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.data === 401) dispatch('logout', null, { root: true }) - } - }, - // eslint-disable-next-line no-unused-vars - async addUser({ commit, rootState, dispatch }, data) { - try { - // eslint-disable-next-line no-unused-vars - const response = await axios.post( - url.vorstand.sm.addUser, - { ...data }, - { - headers: { Token: rootState.login.user.accessToken }, - timeout - } - ) - //commit('updateMonth', { ...response.data[0], com: 'add' }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - // eslint-disable-next-line no-unused-vars - async getUsers({ commit, rootState, dispatch, getters }, data) { - commit('setAllDayLoading') - try { - const response = await axios.post( - url.vorstand.sm.getUsers, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - for (var day in response.data) { - var date = new Date( - response.data[day].day.date.year, - response.data[day].day.date.month - 1, - response.data[day].day.date.day - ) - commit('updateMonthJobkind', { - data: [...response.data[day].jobkinddate], - date, - getters - }) - commit('updateMonthWorker', { - workers: [...response.data[day].worker], - date, - getters - }) - commit('updateMonthLocked', { - locked: response.data[day].day.locked, - date, - getters - }) - commit('setDayNotLoading', { date, getters }) - } - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - // eslint-disable-next-line no-unused-vars - async deleteUser({ commit, rootState, dispatch }, data) { - try { - // eslint-disable-next-line no-unused-vars - const response = await axios.post( - url.vorstand.sm.deleteUser, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - //commit('updateMonth', { ...data, com: 'delete' }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async lockDay({ commit, rootState, dispatch, getters }, data) { - try { - const response = await axios.post( - url.vorstand.sm.lockDay, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - console.log(response.data) - let date = new Date( - response.data.date.year, - response.data.date.month - 1, - response.data.date.day - ) - commit('updateMonthLocked', { - locked: response.data.locked, - date, - getters - }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async updateJobKindDate( - { commit, rootState, dispatch, getters }, - { data, date } - ) { - try { - commit('setDayLoading', { date, getters }) - const response = await axios.post( - url.vorstand.sm.updateJobKindDates, - [...data], - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateMonthJobkind', { data: response.data, date, getters }) - commit('setDayNotLoading', { date, getters }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - setDayLoading({ commit, getters }, date) { - commit('setDayLoading', { date, getters }) - }, - setDayNotLoading({ commit, getters }, date) { - commit('setDayNotLoading', { date, getters }) - } -} -const getters = { - month: state => { - return state.month - }, - allUsers: state => { - return state.allUsers - }, - getDayLoading: (state, getters) => date => { - let day = getters.getDay(date) - return day.loading - }, - getDay: state => date => { - for (let week = 0; week < state.month.length; week++) { - for (let day in state.month[week].days) { - if (state.month[week].days[day].date - date === 0) { - return state.month[week].days[day] - } - } - } - }, - disabled: state => { - return state.disabled - }, - getStartDate: state => { - return state.month[0].startDate - }, - getEndDate: state => { - return state.month[state.month.length - 1].endDate - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/user.js b/src/store/modules/user.js deleted file mode 100644 index 7e4d467..0000000 --- a/src/store/modules/user.js +++ /dev/null @@ -1,430 +0,0 @@ -import axios from 'axios' -import url from '@/plugins/routes' -const timeout = 20000 -const state = { - user: null, - creditList: [], - loading: false, - addLoading: false, - error: null, - days: [], - messages: [], - status: [], - tokens: [] -} - -const mutations = { - setStatus: (state, status) => { - state.status = status - }, - setUser: (state, user) => { - state.user = user - let list = {} - for (let creditList in user['creditList']) { - let amount = mutations.createAmount(user['creditList'][creditList]) - let credit = mutations.createCredit(user['creditList'][creditList]) - let sum = mutations.createSum(credit, amount) - list[creditList] = [{ ...credit }, { ...amount }, { ...sum }] - } - state.user.creditList = list - state.creditList = [] - state.error = '' - }, - setTokens: (state, tokens) => { - state.tokens = tokens - }, - createAmount(creditList) { - let amount = { - type: 'Schulden', - jan_amount: 0 - creditList.jan.depts, - feb_amount: 0 - creditList.feb.depts, - maer_amount: 0 - creditList.maer.depts, - apr_amount: 0 - creditList.apr.depts, - mai_amount: 0 - creditList.mai.depts, - jun_amount: 0 - creditList.jun.depts, - jul_amount: 0 - creditList.jul.depts, - aug_amount: 0 - creditList.aug.depts, - sep_amount: 0 - creditList.sep.depts, - okt_amount: 0 - creditList.okt.depts, - nov_amount: 0 - creditList.nov.depts, - dez_amount: 0 - creditList.dez.depts, - last: 0 - creditList['last'] - } - - amount.sum = - amount.jan_amount + - amount.feb_amount + - amount.maer_amount + - amount.apr_amount + - amount.mai_amount + - amount.jun_amount + - amount.jul_amount + - amount.aug_amount + - amount.sep_amount + - amount.okt_amount + - amount.nov_amount + - amount.dez_amount - return amount - }, - createCredit(creditList) { - let credit = { - type: 'Guthaben', - jan_amount: creditList.jan.credit, - feb_amount: creditList.feb.credit, - maer_amount: creditList.maer.credit, - apr_amount: creditList.apr.credit, - mai_amount: creditList.mai.credit, - jun_amount: creditList.jun.credit, - jul_amount: creditList.jul.credit, - aug_amount: creditList.aug.credit, - sep_amount: creditList.sep.credit, - okt_amount: creditList.okt.credit, - nov_amount: creditList.nov.credit, - dez_amount: creditList.dez.credit - } - credit.sum = - credit.jan_amount + - credit.feb_amount + - credit.maer_amount + - credit.apr_amount + - credit.mai_amount + - credit.jun_amount + - credit.jul_amount + - credit.aug_amount + - credit.sep_amount + - credit.okt_amount + - credit.nov_amount + - credit.dez_amount - return credit - }, - createSum(credit, amount) { - let sum = { - type: 'Summe', - jan_amount: credit.jan_amount + amount.jan_amount, - feb_amount: credit.feb_amount + amount.feb_amount, - maer_amount: credit.maer_amount + amount.maer_amount, - apr_amount: credit.apr_amount + amount.apr_amount, - mai_amount: credit.mai_amount + amount.mai_amount, - jun_amount: credit.jun_amount + amount.jun_amount, - jul_amount: credit.jul_amount + amount.jul_amount, - aug_amount: credit.aug_amount + amount.aug_amount, - sep_amount: credit.sep_amount + amount.sep_amount, - okt_amount: credit.okt_amount + amount.okt_amount, - nov_amount: credit.nov_amount + amount.nov_amount, - dez_amount: credit.dez_amount + amount.dez_amount - } - sum.sum = - sum.jan_amount + - sum.feb_amount + - sum.maer_amount + - sum.apr_amount + - sum.mai_amount + - sum.jun_amount + - sum.jul_amount + - sum.aug_amount + - sum.sep_amount + - sum.okt_amount + - sum.nov_amount + - sum.dez_amount - return sum - }, - setLoading(state, value) { - state.loading = value - }, - setAddLoading(state, value) { - state.addLoading = value - }, - setError(state, { value, error }) { - //clearTimeout(state.error? state.error.timeout : null) - state.error = { value, error } - state.error.timeout = setTimeout(() => { - state.error = null - }, 6000) - }, - createDays(state, date) { - let days = [] - for (let i = 0; i <= 10; i++) { - days.push({ - date: new Date( - date.getFullYear(), - date.getMonth(), - date.getDate() + i, - 12 - ), - job: false, - workers: [] - }) - } - state.days = days - }, - updateDay(state, data) { - const date = data.date - for (let day in state.days) { - if (state.days[day].date - date === 0) { - state.days[day].job = data.job - if (data.workers) state.days[day].workers = data.workers - } - } - }, - addMessage: (state, data) => { - var message = null - if (state.messages.length > 0) { - if ( - state.messages[0].user.username === data.user.username && - !data.error - ) { - message = state.messages[0] - if ((new Date() - state.messages[0].date) / 1000 < 2) { - clearTimeout(message.timeout) - message.amount = message.amount + data.amount - message.visible = true - message.date = new Date() - message.timeout = setTimeout(() => { - message.visible = false - }, 300000) - return - } else { - message.visible = false - } - } - } - let message2 = { - user: data.user, - error: data.error, - storno: false, - loading: false, - visible: true, - amount: data.amount, - date: new Date(), - timeout: setTimeout(() => { - message2.visible = false - }, 300000) - } - state.messages.unshift(message2) - }, - updateMessage: (state, data) => { - var message = state.messages.find(msg => { - return msg.date - data.date === 0 ? true : false - }) - if (message) { - if (data.storno !== undefined) message.storno = data.storno - if (data.loading !== undefined) message.loading = data.loading - } - } -} - -const actions = { - async getUser({ commit, rootState, dispatch }) { - commit('setLoading', true) - try { - const response = await axios.get(url.userMain, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setUser', response.data) - commit('setError', '') - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - commit('setLoading', false) - }, - async addAmount({ commit, rootState, dispatch }, amount) { - commit('setAddLoading', true) - try { - const response = await axios.post( - url.userAddAmount, - { amount: amount }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setUser', response.data) - commit('addMessage', { - user: rootState.login.user, - amount: amount, - error: false - }) - commit('setError', '') - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('addMessage', { - user: rootState.login.user, - amount: amount, - error: true - }) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - commit('setAddLoading', false) - }, - async saveConfig({ commit, rootState, dispatch }, data) { - commit('setLoading', true) - try { - const response = await axios.post( - url.user.config, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - console.log(response.data) - commit('setUser', response.data) - commit('setError', { value: 'Daten gespeichert', error: false }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) { - if (e.response.status === 401) dispatch('logout', null, { root: true }) - if (e.response.data) { - commit('setError', { value: e.response.data.error, error: true }) - } - } - } - commit('setLoading', false) - }, - createDays({ commit }, date) { - commit('createDays', date) - }, - async updateDay({ commit, rootState, dispatch }, data) { - commit('setLoading', true) - try { - const response = await axios.post( - url.user.job, - { date: data.date.getTime() / 1000 }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateDay', { ...response.data, date: data.date }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) { - if (e.response.status === 401) dispatch('logout', null, { root: true }) - if (e.response.data) { - commit('setError', e.response.data.error) - } - } - } - commit('setLoading', false) - }, - async storno({ commit, rootState, dispatch }, data) { - commit('updateMessage', { date: data.date, loading: true }) - try { - const response = await axios.post( - url.user.storno, - { - amount: data.amount - }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('setUser', response.data) - commit('updateMessage', { date: data.date, storno: true }) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - commit('updateMessage', { date: data.date, loading: false }) - }, - async getStatus({ commit, rootState, dispatch }) { - try { - const response = await axios.get(url.user.getAllStatus, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setStatus', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async getTokens({ commit, rootState, dispatch }) { - try { - const response = await axios.get(url.user.getAccessTokens, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setTokens', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async deleteToken({ commit, rootState, dispatch }, token) { - try { - const response = await axios.post(url.user.getAccessTokens, token, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setTokens', response.data) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - } -} - -const getters = { - user: state => { - return state.user - }, - year: state => { - let year = 0 - for (let creditList in state.user.creditList) { - let currentYear = parseInt(creditList) - if (currentYear > year) year = currentYear - } - return year - }, - loading: state => { - return state.loading - }, - addLoading: state => { - return state.addLoading - }, - error: state => { - return state.error - }, - days: state => { - return state.days - }, - messages: state => { - return state.messages - }, - status: state => { - return state.status - }, - tokens: state => { - return state.tokens - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/userManager.js b/src/store/modules/userManager.js deleted file mode 100644 index 60c11d0..0000000 --- a/src/store/modules/userManager.js +++ /dev/null @@ -1,216 +0,0 @@ -import url from '@/plugins/routes' -import axios from 'axios' -const timeout = 20000 -const state = { - users: [], - status: [], - usersLoading: false, - statusLoading: false -} - -const mutations = { - setUsers: (state, users) => { - state.users = users - }, - setStatus: (state, status) => { - state.status = status - }, - updateUser: (state, user) => { - let exists = state.users.find(a => { - return a.username === user.username - }) - if (exists) { - exists.firstname = user.firstname - exists.lastname = user.lastname - exists.mail = user.mail - exists.statusgroup = user.statusgroup - exists.voting = user.voting - exists.workgroups = user.workgroup - } else { - state.users.push({ - username: user.username, - firstname: user.firstname, - lastname: user.lastname, - mail: user.mail, - statusgroup: user.statusgroup, - voting: user.voting, - workgroups: user.workgroups - }) - } - }, - updateStatus: (state, status) => { - let exists = state.status.find(a => { - return a.id === status.id - }) - if (exists) { - exists.name = status.name - } else { - state.status.push(status) - } - }, - deleteStatus: (state, status) => { - let index = state.status.indexOf( - state.status.find(a => { - return a.id === status.id - }) - ) - state.status.splice(index, 1) - }, - setUsersLoading: (state, value) => { - state.usersLoading = value - }, - setStatusLoading: (state, value) => { - state.statusLoading = value - }, - updateWorkgroups: (state, { id, workgroups }) => { - let exists = state.users.find(a => { - return a.id === id - }) - if (exists) { - exists.workgroups = workgroups - } - } -} - -const actions = { - async getUsers({ commit, rootState, dispatch }) { - try { - commit('setUsersLoading', true) - const response = await axios.get(url.getUsers, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setUsers', response.data) - commit('setUsersLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setUsersLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async getUsersWithExtern({ commit, rootState, dispatch }) { - try { - commit('setUsersLoading', true) - const response = await axios.get(url.getUsers + '?extern=1', { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setUsers', response.data) - commit('setUsersLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setUsersLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async getStatus({ commit, rootState, dispatch }) { - try { - commit('setStatusLoading', true) - const response = await axios.get(url.user.getAllStatus, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setStatus', response.data) - commit('setStatusLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setStatusLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async updateStatusUser({ commit, rootState, dispatch }, data) { - try { - commit('setUsersLoading', true) - const response = await axios.post( - url.vorstand.um.updateStatusUser, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateUser', response.data) - commit('setUsersLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setUsersLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async updateVoting({ commit, rootState, dispatch }, data) { - try { - commit('setUsersLoading', true) - const response = await axios.post( - url.vorstand.um.updateVoting, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateUser', response.data) - commit('setUsersLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setUsersLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async updateWorkgroups({ commit, rootState, dispatch }, data) { - try { - commit('setUsersLoading', true) - const response = await axios.post( - url.vorstand.um.updateWorkgroups, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateWorkgroups', { id: data.id, workgroups: response.data }) - commit('setUsersLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setUsersLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - } -} - -const getters = { - users: state => { - return state.users - }, - status: state => { - return state.status - }, - usersLoading: state => { - return state.usersLoading - }, - statusLoading: state => { - return state.statusLoading - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/modules/workgroupManagement.js b/src/store/modules/workgroupManagement.js deleted file mode 100644 index 7fa0a79..0000000 --- a/src/store/modules/workgroupManagement.js +++ /dev/null @@ -1,133 +0,0 @@ -import url from '@/plugins/routes' -import axios from 'axios' -const timeout = 20000 -const state = { - workgroupsLoading: false, - workgroups: [] -} - -const mutations = { - setWorkgroups: (state, workgroups) => { - state.workgroups = workgroups - }, - updateWorkgroup: (state, workgroup) => { - console.log('workgroup is', workgroup) - let exists = state.workgroups.find(a => { - return a.id === workgroup.id - }) - console.log('exists is', exists) - if (exists) { - exists.name = workgroup.name - exists.boss = workgroup.boss - } else { - state.workgroups.push(workgroup) - } - }, - deleteWorkgroup: (state, workergroup) => { - let index = state.workgroups.indexOf( - state.workgroups.find(a => { - return a.id === workergroup.id - }) - ) - state.workgroups.splice(index, 1) - }, - setWorkgroupLoading: (state, value) => { - state.workgroupsLoading = value - } -} - -const actions = { - async getAllWorkgroups({ commit, rootState, dispatch }) { - try { - commit('setWorkgroupLoading', true) - const response = await axios.get(url.vorstand.wm.getAllWorkgroups, { - headers: { Token: rootState.login.user.accessToken }, - timeout - }) - commit('setWorkgroups', response.data) - commit('setWorkgroupLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - commit('setWorkgroupLoading', false) - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async setWorkgroup({ commit, rootState, dispatch }, data) { - try { - commit('setWorkgroupLoading', true) - const response = await axios.put( - url.vorstand.wm.workgroup, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateWorkgroup', response.data) - commit('setWorkgroupLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async updateWorkgroup({ commit, rootState, dispatch }, data) { - try { - commit('setWorkgroupLoading', true) - const repsonse = await axios.post( - url.vorstand.wm.workgroup, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('updateWorkgroup', repsonse.data) - commit('setWorkgroupLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - }, - async deleteWorkgroup({ commit, rootState, dispatch }, data) { - try { - commit('setWorkgroupLoading', true) - await axios.post( - url.vorstand.wm.deleteWorkgroup, - { ...data }, - { headers: { Token: rootState.login.user.accessToken }, timeout } - ) - commit('deleteWorkgroup', data) - commit('setWorkgroupLoading', false) - dispatch('getLifetime', null, { root: true }) - } catch (e) { - if (e.message == 'Network Error') { - dispatch('connectionError/addError', null, { root: true }) - } - if (e.response) - if (e.response.status === 401) dispatch('logout', null, { root: true }) - } - } -} - -const getters = { - workgroups: state => { - return state.workgroups - }, - workgroupLoading: state => { - return state.workgroupsLoading - } -} - -export default { - namespaced: true, - state, - mutations, - actions, - getters -} diff --git a/src/store/store-flag.d.ts b/src/store/store-flag.d.ts new file mode 100644 index 0000000..ec274bd --- /dev/null +++ b/src/store/store-flag.d.ts @@ -0,0 +1,9 @@ +// THIS FEATURE-FLAG FILE IS AUTOGENERATED, +// REMOVAL OR CHANGES WILL CAUSE RELATED TYPES TO STOP WORKING +import "quasar/dist/types/feature-flag"; + +declare module "quasar/dist/types/feature-flag" { + interface QuasarFeatureFlags { + store: true; + } +} diff --git a/src/views/About.vue b/src/views/About.vue deleted file mode 100644 index 3fa2807..0000000 --- a/src/views/About.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/views/BarView.vue b/src/views/BarView.vue deleted file mode 100644 index 3487f61..0000000 --- a/src/views/BarView.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/src/views/FinanzerView.vue b/src/views/FinanzerView.vue deleted file mode 100644 index 9d27a1c..0000000 --- a/src/views/FinanzerView.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/src/views/Login.vue b/src/views/Login.vue deleted file mode 100644 index f391be5..0000000 --- a/src/views/Login.vue +++ /dev/null @@ -1,93 +0,0 @@ - - - - - diff --git a/src/views/MainView.vue b/src/views/MainView.vue deleted file mode 100644 index afb60f5..0000000 --- a/src/views/MainView.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - - - diff --git a/src/views/UserView.vue b/src/views/UserView.vue deleted file mode 100644 index 0463d74..0000000 --- a/src/views/UserView.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/src/views/contents/BarFreedrinksView.vue b/src/views/contents/BarFreedrinksView.vue deleted file mode 100644 index bbe6270..0000000 --- a/src/views/contents/BarFreedrinksView.vue +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/src/views/contents/GeruechteView.vue b/src/views/contents/GeruechteView.vue deleted file mode 100644 index 204f650..0000000 --- a/src/views/contents/GeruechteView.vue +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/src/views/contents/PriceListView.vue b/src/views/contents/PriceListView.vue deleted file mode 100644 index c3dc025..0000000 --- a/src/views/contents/PriceListView.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..d7fb0a3 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,6 @@ +{ + "extends": "@quasar/app/tsconfig-preset", + "compilerOptions": { + "baseUrl": "." + } +} diff --git a/vue.config.js b/vue.config.js deleted file mode 100644 index 573f9db..0000000 --- a/vue.config.js +++ /dev/null @@ -1,15 +0,0 @@ -//const fs = require('fs') - -module.exports = { - transpileDependencies: ['vuetify'], - devServer: { - disableHostCheck: true - // https: { - // key: fs.readFileSync('./cert/server.key'), - // cert: fs.readFileSync('./cert/server.crt') - // } - }, - configureWebpack: { - devtool: 'source-map' - } -} From 09f72a289379e70367814f9408a1bd029bd59002 Mon Sep 17 00:00:00 2001 From: Dominik Date: Fri, 9 Oct 2020 18:04:32 +0200 Subject: [PATCH 021/448] grobes layout --- .vscode/settings.json | 20 +- package-lock.json | 5440 +++++++++++++++--------------- quasar.conf.js | 18 +- src/components/EssentialLink.vue | 16 +- src/layouts/MainLayout.vue | 108 +- src/pages/About.vue | 13 + src/router/routes.ts | 4 +- 7 files changed, 2808 insertions(+), 2811 deletions(-) create mode 100644 src/pages/About.vue diff --git a/.vscode/settings.json b/.vscode/settings.json index d4af05c..5fb9ecd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,15 @@ { - "vetur.validation.template": false, - "vetur.format.enable": false, - "eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"], - "typescript.tsdk": "node_modules/typescript/lib", - "vetur.experimental.templateInterpolationService": true -} + "editor.formatOnPaste": true, + "editor.formatOnSave": true, + "editor.codeActionsOnSave": { + "source.fixAll": true + }, + "javascript.format.insertSpaceBeforeFunctionParenthesis": true, + "javascript.format.placeOpenBraceOnNewLineForControlBlocks": false, + "javascript.format.placeOpenBraceOnNewLineForFunctions": false, + "typescript.format.insertSpaceBeforeFunctionParenthesis": true, + "typescript.format.placeOpenBraceOnNewLineForControlBlocks": false, + "typescript.format.placeOpenBraceOnNewLineForFunctions": false, + "vetur.format.defaultFormatter.html": "js-beautify-html", + "vetur.format.defaultFormatter.js": "vscode-typescript" +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 7f962c3..6ca15bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", "dev": true, "requires": { - "@babel/highlight": "7.10.4" + "@babel/highlight": "^7.10.4" } }, "@babel/compat-data": { @@ -19,9 +19,9 @@ "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==", "dev": true, "requires": { - "browserslist": "4.14.5", - "invariant": "2.2.4", - "semver": "5.7.1" + "browserslist": "^4.12.0", + "invariant": "^2.2.4", + "semver": "^5.5.0" }, "dependencies": { "semver": { @@ -38,22 +38,22 @@ "integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==", "dev": true, "requires": { - "@babel/code-frame": "7.10.4", - "@babel/generator": "7.11.6", - "@babel/helper-module-transforms": "7.11.0", - "@babel/helpers": "7.10.4", - "@babel/parser": "7.11.5", - "@babel/template": "7.10.4", - "@babel/traverse": "7.11.5", - "@babel/types": "7.11.5", - "convert-source-map": "1.7.0", - "debug": "4.2.0", - "gensync": "1.0.0-beta.1", - "json5": "2.1.3", - "lodash": "4.17.20", - "resolve": "1.17.0", - "semver": "5.7.1", - "source-map": "0.5.7" + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.11.6", + "@babel/helper-module-transforms": "^7.11.0", + "@babel/helpers": "^7.10.4", + "@babel/parser": "^7.11.5", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.11.5", + "@babel/types": "^7.11.5", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.19", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" }, "dependencies": { "debug": { @@ -85,9 +85,9 @@ "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==", "dev": true, "requires": { - "@babel/types": "7.11.5", - "jsesc": "2.5.2", - "source-map": "0.5.7" + "@babel/types": "^7.11.5", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" } }, "@babel/helper-annotate-as-pure": { @@ -96,7 +96,7 @@ "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.10.4" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { @@ -105,8 +105,8 @@ "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==", "dev": true, "requires": { - "@babel/helper-explode-assignable-expression": "7.11.4", - "@babel/types": "7.11.5" + "@babel/helper-explode-assignable-expression": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-compilation-targets": { @@ -115,11 +115,11 @@ "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==", "dev": true, "requires": { - "@babel/compat-data": "7.11.0", - "browserslist": "4.14.5", - "invariant": "2.2.4", - "levenary": "1.1.1", - "semver": "5.7.1" + "@babel/compat-data": "^7.10.4", + "browserslist": "^4.12.0", + "invariant": "^2.2.4", + "levenary": "^1.1.1", + "semver": "^5.5.0" }, "dependencies": { "semver": { @@ -136,12 +136,12 @@ "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==", "dev": true, "requires": { - "@babel/helper-function-name": "7.10.4", - "@babel/helper-member-expression-to-functions": "7.11.0", - "@babel/helper-optimise-call-expression": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-replace-supers": "7.10.4", - "@babel/helper-split-export-declaration": "7.11.0" + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-member-expression-to-functions": "^7.10.5", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-replace-supers": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4" } }, "@babel/helper-create-regexp-features-plugin": { @@ -150,9 +150,9 @@ "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "7.10.4", - "@babel/helper-regex": "7.10.5", - "regexpu-core": "4.7.1" + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-regex": "^7.10.4", + "regexpu-core": "^4.7.0" } }, "@babel/helper-define-map": { @@ -161,9 +161,9 @@ "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==", "dev": true, "requires": { - "@babel/helper-function-name": "7.10.4", - "@babel/types": "7.11.5", - "lodash": "4.17.20" + "@babel/helper-function-name": "^7.10.4", + "@babel/types": "^7.10.5", + "lodash": "^4.17.19" } }, "@babel/helper-explode-assignable-expression": { @@ -172,7 +172,7 @@ "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.10.4" } }, "@babel/helper-function-name": { @@ -181,9 +181,9 @@ "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "7.10.4", - "@babel/template": "7.10.4", - "@babel/types": "7.11.5" + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-get-function-arity": { @@ -192,7 +192,7 @@ "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.10.4" } }, "@babel/helper-hoist-variables": { @@ -201,7 +201,7 @@ "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.10.4" } }, "@babel/helper-member-expression-to-functions": { @@ -210,7 +210,7 @@ "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.11.0" } }, "@babel/helper-module-imports": { @@ -219,7 +219,7 @@ "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.10.4" } }, "@babel/helper-module-transforms": { @@ -228,13 +228,13 @@ "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==", "dev": true, "requires": { - "@babel/helper-module-imports": "7.10.4", - "@babel/helper-replace-supers": "7.10.4", - "@babel/helper-simple-access": "7.10.4", - "@babel/helper-split-export-declaration": "7.11.0", - "@babel/template": "7.10.4", - "@babel/types": "7.11.5", - "lodash": "4.17.20" + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-replace-supers": "^7.10.4", + "@babel/helper-simple-access": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/template": "^7.10.4", + "@babel/types": "^7.11.0", + "lodash": "^4.17.19" } }, "@babel/helper-optimise-call-expression": { @@ -243,7 +243,7 @@ "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.10.4" } }, "@babel/helper-plugin-utils": { @@ -258,7 +258,7 @@ "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==", "dev": true, "requires": { - "lodash": "4.17.20" + "lodash": "^4.17.19" } }, "@babel/helper-remap-async-to-generator": { @@ -267,10 +267,10 @@ "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "7.10.4", - "@babel/helper-wrap-function": "7.10.4", - "@babel/template": "7.10.4", - "@babel/types": "7.11.5" + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-wrap-function": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-replace-supers": { @@ -279,10 +279,10 @@ "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "7.11.0", - "@babel/helper-optimise-call-expression": "7.10.4", - "@babel/traverse": "7.11.5", - "@babel/types": "7.11.5" + "@babel/helper-member-expression-to-functions": "^7.10.4", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-simple-access": { @@ -291,8 +291,8 @@ "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==", "dev": true, "requires": { - "@babel/template": "7.10.4", - "@babel/types": "7.11.5" + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-skip-transparent-expression-wrappers": { @@ -301,7 +301,7 @@ "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.11.0" } }, "@babel/helper-split-export-declaration": { @@ -310,7 +310,7 @@ "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.11.0" } }, "@babel/helper-validator-identifier": { @@ -325,10 +325,10 @@ "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==", "dev": true, "requires": { - "@babel/helper-function-name": "7.10.4", - "@babel/template": "7.10.4", - "@babel/traverse": "7.11.5", - "@babel/types": "7.11.5" + "@babel/helper-function-name": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helpers": { @@ -337,9 +337,9 @@ "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==", "dev": true, "requires": { - "@babel/template": "7.10.4", - "@babel/traverse": "7.11.5", - "@babel/types": "7.11.5" + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/highlight": { @@ -348,9 +348,9 @@ "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "7.10.4", - "chalk": "2.4.2", - "js-tokens": "4.0.0" + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" }, "dependencies": { "chalk": { @@ -359,9 +359,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -378,9 +378,9 @@ "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-remap-async-to-generator": "7.11.4", - "@babel/plugin-syntax-async-generators": "7.8.4" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-remap-async-to-generator": "^7.10.4", + "@babel/plugin-syntax-async-generators": "^7.8.0" } }, "@babel/plugin-proposal-class-properties": { @@ -389,8 +389,8 @@ "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "7.10.5", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-create-class-features-plugin": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-proposal-decorators": { @@ -399,9 +399,9 @@ "integrity": "sha512-Sc5TAQSZuLzgY0664mMDn24Vw2P8g/VhyLyGPaWiHahhgLqeZvcGeyBZOrJW0oSKIK2mvQ22a1ENXBIQLhrEiQ==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "7.10.5", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-decorators": "7.10.4" + "@babel/helper-create-class-features-plugin": "^7.10.5", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-decorators": "^7.10.4" } }, "@babel/plugin-proposal-dynamic-import": { @@ -410,8 +410,8 @@ "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-dynamic-import": "7.8.3" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-dynamic-import": "^7.8.0" } }, "@babel/plugin-proposal-export-namespace-from": { @@ -420,8 +420,8 @@ "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-export-namespace-from": "7.8.3" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3" } }, "@babel/plugin-proposal-function-sent": { @@ -430,9 +430,9 @@ "integrity": "sha512-aBtve/DhQsVPAGnSDcgt33gF36rO0TK+KtHp9Hwtj3KwH+o1Cii9vfVVYeB9c6Jo1SXOgTRwRD7ljpTS0qbN8w==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-wrap-function": "7.10.4", - "@babel/plugin-syntax-function-sent": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-wrap-function": "^7.10.4", + "@babel/plugin-syntax-function-sent": "^7.10.4" } }, "@babel/plugin-proposal-json-strings": { @@ -441,8 +441,8 @@ "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-json-strings": "7.8.3" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-json-strings": "^7.8.0" } }, "@babel/plugin-proposal-logical-assignment-operators": { @@ -451,8 +451,8 @@ "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-logical-assignment-operators": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" } }, "@babel/plugin-proposal-nullish-coalescing-operator": { @@ -461,8 +461,8 @@ "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "7.8.3" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0" } }, "@babel/plugin-proposal-numeric-separator": { @@ -471,8 +471,8 @@ "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-numeric-separator": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" } }, "@babel/plugin-proposal-object-rest-spread": { @@ -481,9 +481,9 @@ "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-object-rest-spread": "7.8.3", - "@babel/plugin-transform-parameters": "7.10.5" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-transform-parameters": "^7.10.4" } }, "@babel/plugin-proposal-optional-catch-binding": { @@ -492,8 +492,8 @@ "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-optional-catch-binding": "7.8.3" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" } }, "@babel/plugin-proposal-optional-chaining": { @@ -502,9 +502,9 @@ "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "7.11.0", - "@babel/plugin-syntax-optional-chaining": "7.8.3" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0", + "@babel/plugin-syntax-optional-chaining": "^7.8.0" } }, "@babel/plugin-proposal-private-methods": { @@ -513,8 +513,8 @@ "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "7.10.5", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-create-class-features-plugin": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-proposal-throw-expressions": { @@ -523,8 +523,8 @@ "integrity": "sha512-m7K9duXeH/rko36i9G9seLOg2AVdeVTn65k8nnTxgozex0hkDSUr6cktJxTO7jElGEpmMz410pTs0Jn8+empxw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-throw-expressions": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-throw-expressions": "^7.10.4" } }, "@babel/plugin-proposal-unicode-property-regex": { @@ -533,8 +533,8 @@ "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-async-generators": { @@ -543,7 +543,7 @@ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-class-properties": { @@ -552,7 +552,7 @@ "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-decorators": { @@ -561,7 +561,7 @@ "integrity": "sha512-2NaoC6fAk2VMdhY1eerkfHV+lVYC1u8b+jmRJISqANCJlTxYy19HGdIkkQtix2UtkcPuPu+IlDgrVseZnU03bw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-dynamic-import": { @@ -570,7 +570,7 @@ "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-export-namespace-from": { @@ -579,7 +579,7 @@ "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.3" } }, "@babel/plugin-syntax-function-sent": { @@ -588,7 +588,7 @@ "integrity": "sha512-dwElaRoDQhlVevbgKOlEUTe08QNJo4ZjWw3rqnMbEvH8NRJM+iPN2tTQtzyfNloXD8f3Jdiyf5Pn400B1U3SVA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-import-meta": { @@ -597,7 +597,7 @@ "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-json-strings": { @@ -606,7 +606,7 @@ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-logical-assignment-operators": { @@ -615,7 +615,7 @@ "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-nullish-coalescing-operator": { @@ -624,7 +624,7 @@ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-numeric-separator": { @@ -633,7 +633,7 @@ "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-object-rest-spread": { @@ -642,7 +642,7 @@ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-optional-catch-binding": { @@ -651,7 +651,7 @@ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-optional-chaining": { @@ -660,7 +660,7 @@ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-throw-expressions": { @@ -669,7 +669,7 @@ "integrity": "sha512-Yac/4W71+JdAiOV3aLbnUUe2R0NZzNvdy5EqdauFnBQTxIXT58M89lOplIFVELTSus6PxFMjmbi2vXaJDiV/PQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-top-level-await": { @@ -678,7 +678,7 @@ "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-arrow-functions": { @@ -687,7 +687,7 @@ "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-async-to-generator": { @@ -696,9 +696,9 @@ "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==", "dev": true, "requires": { - "@babel/helper-module-imports": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-remap-async-to-generator": "7.11.4" + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-remap-async-to-generator": "^7.10.4" } }, "@babel/plugin-transform-block-scoped-functions": { @@ -707,7 +707,7 @@ "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-block-scoping": { @@ -716,7 +716,7 @@ "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-classes": { @@ -725,14 +725,14 @@ "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "7.10.4", - "@babel/helper-define-map": "7.10.5", - "@babel/helper-function-name": "7.10.4", - "@babel/helper-optimise-call-expression": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-replace-supers": "7.10.4", - "@babel/helper-split-export-declaration": "7.11.0", - "globals": "11.12.0" + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-define-map": "^7.10.4", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-replace-supers": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.10.4", + "globals": "^11.1.0" } }, "@babel/plugin-transform-computed-properties": { @@ -741,7 +741,7 @@ "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-destructuring": { @@ -750,7 +750,7 @@ "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-dotall-regex": { @@ -759,8 +759,8 @@ "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-duplicate-keys": { @@ -769,7 +769,7 @@ "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-exponentiation-operator": { @@ -778,8 +778,8 @@ "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-for-of": { @@ -788,7 +788,7 @@ "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-function-name": { @@ -797,8 +797,8 @@ "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==", "dev": true, "requires": { - "@babel/helper-function-name": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-literals": { @@ -807,7 +807,7 @@ "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-member-expression-literals": { @@ -816,7 +816,7 @@ "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-modules-amd": { @@ -825,9 +825,9 @@ "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "7.11.0", - "@babel/helper-plugin-utils": "7.10.4", - "babel-plugin-dynamic-import-node": "2.3.3" + "@babel/helper-module-transforms": "^7.10.5", + "@babel/helper-plugin-utils": "^7.10.4", + "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-commonjs": { @@ -836,10 +836,10 @@ "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==", "dev": true, "requires": { - "@babel/helper-module-transforms": "7.11.0", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-simple-access": "7.10.4", - "babel-plugin-dynamic-import-node": "2.3.3" + "@babel/helper-module-transforms": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-simple-access": "^7.10.4", + "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { @@ -848,10 +848,10 @@ "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "7.10.4", - "@babel/helper-module-transforms": "7.11.0", - "@babel/helper-plugin-utils": "7.10.4", - "babel-plugin-dynamic-import-node": "2.3.3" + "@babel/helper-hoist-variables": "^7.10.4", + "@babel/helper-module-transforms": "^7.10.5", + "@babel/helper-plugin-utils": "^7.10.4", + "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-umd": { @@ -860,8 +860,8 @@ "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==", "dev": true, "requires": { - "@babel/helper-module-transforms": "7.11.0", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-module-transforms": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-named-capturing-groups-regex": { @@ -870,7 +870,7 @@ "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.10.4" } }, "@babel/plugin-transform-new-target": { @@ -879,7 +879,7 @@ "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-object-super": { @@ -888,8 +888,8 @@ "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-replace-supers": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-replace-supers": "^7.10.4" } }, "@babel/plugin-transform-parameters": { @@ -898,8 +898,8 @@ "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-property-literals": { @@ -908,7 +908,7 @@ "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-regenerator": { @@ -917,7 +917,7 @@ "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==", "dev": true, "requires": { - "regenerator-transform": "0.14.5" + "regenerator-transform": "^0.14.2" } }, "@babel/plugin-transform-reserved-words": { @@ -926,7 +926,7 @@ "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-runtime": { @@ -935,10 +935,10 @@ "integrity": "sha512-9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg==", "dev": true, "requires": { - "@babel/helper-module-imports": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4", - "resolve": "1.17.0", - "semver": "5.7.1" + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "resolve": "^1.8.1", + "semver": "^5.5.1" }, "dependencies": { "semver": { @@ -955,7 +955,7 @@ "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-spread": { @@ -964,8 +964,8 @@ "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "7.11.0" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0" } }, "@babel/plugin-transform-sticky-regex": { @@ -974,8 +974,8 @@ "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-regex": "7.10.5" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-regex": "^7.10.4" } }, "@babel/plugin-transform-template-literals": { @@ -984,8 +984,8 @@ "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-typeof-symbol": { @@ -994,7 +994,7 @@ "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-unicode-escapes": { @@ -1003,7 +1003,7 @@ "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-unicode-regex": { @@ -1012,8 +1012,8 @@ "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/preset-env": { @@ -1022,74 +1022,74 @@ "integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==", "dev": true, "requires": { - "@babel/compat-data": "7.11.0", - "@babel/helper-compilation-targets": "7.10.4", - "@babel/helper-module-imports": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-proposal-async-generator-functions": "7.10.5", - "@babel/plugin-proposal-class-properties": "7.10.4", - "@babel/plugin-proposal-dynamic-import": "7.10.4", - "@babel/plugin-proposal-export-namespace-from": "7.10.4", - "@babel/plugin-proposal-json-strings": "7.10.4", - "@babel/plugin-proposal-logical-assignment-operators": "7.11.0", - "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.4", - "@babel/plugin-proposal-numeric-separator": "7.10.4", - "@babel/plugin-proposal-object-rest-spread": "7.11.0", - "@babel/plugin-proposal-optional-catch-binding": "7.10.4", - "@babel/plugin-proposal-optional-chaining": "7.11.0", - "@babel/plugin-proposal-private-methods": "7.10.4", - "@babel/plugin-proposal-unicode-property-regex": "7.10.4", - "@babel/plugin-syntax-async-generators": "7.8.4", - "@babel/plugin-syntax-class-properties": "7.10.4", - "@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", - "@babel/plugin-syntax-logical-assignment-operators": "7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "7.8.3", - "@babel/plugin-syntax-numeric-separator": "7.10.4", - "@babel/plugin-syntax-object-rest-spread": "7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "7.8.3", - "@babel/plugin-syntax-optional-chaining": "7.8.3", - "@babel/plugin-syntax-top-level-await": "7.10.4", - "@babel/plugin-transform-arrow-functions": "7.10.4", - "@babel/plugin-transform-async-to-generator": "7.10.4", - "@babel/plugin-transform-block-scoped-functions": "7.10.4", - "@babel/plugin-transform-block-scoping": "7.11.1", - "@babel/plugin-transform-classes": "7.10.4", - "@babel/plugin-transform-computed-properties": "7.10.4", - "@babel/plugin-transform-destructuring": "7.10.4", - "@babel/plugin-transform-dotall-regex": "7.10.4", - "@babel/plugin-transform-duplicate-keys": "7.10.4", - "@babel/plugin-transform-exponentiation-operator": "7.10.4", - "@babel/plugin-transform-for-of": "7.10.4", - "@babel/plugin-transform-function-name": "7.10.4", - "@babel/plugin-transform-literals": "7.10.4", - "@babel/plugin-transform-member-expression-literals": "7.10.4", - "@babel/plugin-transform-modules-amd": "7.10.5", - "@babel/plugin-transform-modules-commonjs": "7.10.4", - "@babel/plugin-transform-modules-systemjs": "7.10.5", - "@babel/plugin-transform-modules-umd": "7.10.4", - "@babel/plugin-transform-named-capturing-groups-regex": "7.10.4", - "@babel/plugin-transform-new-target": "7.10.4", - "@babel/plugin-transform-object-super": "7.10.4", - "@babel/plugin-transform-parameters": "7.10.5", - "@babel/plugin-transform-property-literals": "7.10.4", - "@babel/plugin-transform-regenerator": "7.10.4", - "@babel/plugin-transform-reserved-words": "7.10.4", - "@babel/plugin-transform-shorthand-properties": "7.10.4", - "@babel/plugin-transform-spread": "7.11.0", - "@babel/plugin-transform-sticky-regex": "7.10.4", - "@babel/plugin-transform-template-literals": "7.10.5", - "@babel/plugin-transform-typeof-symbol": "7.10.4", - "@babel/plugin-transform-unicode-escapes": "7.10.4", - "@babel/plugin-transform-unicode-regex": "7.10.4", - "@babel/preset-modules": "0.1.4", - "@babel/types": "7.11.5", - "browserslist": "4.14.5", - "core-js-compat": "3.6.5", - "invariant": "2.2.4", - "levenary": "1.1.1", - "semver": "5.7.1" + "@babel/compat-data": "^7.11.0", + "@babel/helper-compilation-targets": "^7.10.4", + "@babel/helper-module-imports": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-proposal-async-generator-functions": "^7.10.4", + "@babel/plugin-proposal-class-properties": "^7.10.4", + "@babel/plugin-proposal-dynamic-import": "^7.10.4", + "@babel/plugin-proposal-export-namespace-from": "^7.10.4", + "@babel/plugin-proposal-json-strings": "^7.10.4", + "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4", + "@babel/plugin-proposal-numeric-separator": "^7.10.4", + "@babel/plugin-proposal-object-rest-spread": "^7.11.0", + "@babel/plugin-proposal-optional-catch-binding": "^7.10.4", + "@babel/plugin-proposal-optional-chaining": "^7.11.0", + "@babel/plugin-proposal-private-methods": "^7.10.4", + "@babel/plugin-proposal-unicode-property-regex": "^7.10.4", + "@babel/plugin-syntax-async-generators": "^7.8.0", + "@babel/plugin-syntax-class-properties": "^7.10.4", + "@babel/plugin-syntax-dynamic-import": "^7.8.0", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.0", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", + "@babel/plugin-syntax-optional-chaining": "^7.8.0", + "@babel/plugin-syntax-top-level-await": "^7.10.4", + "@babel/plugin-transform-arrow-functions": "^7.10.4", + "@babel/plugin-transform-async-to-generator": "^7.10.4", + "@babel/plugin-transform-block-scoped-functions": "^7.10.4", + "@babel/plugin-transform-block-scoping": "^7.10.4", + "@babel/plugin-transform-classes": "^7.10.4", + "@babel/plugin-transform-computed-properties": "^7.10.4", + "@babel/plugin-transform-destructuring": "^7.10.4", + "@babel/plugin-transform-dotall-regex": "^7.10.4", + "@babel/plugin-transform-duplicate-keys": "^7.10.4", + "@babel/plugin-transform-exponentiation-operator": "^7.10.4", + "@babel/plugin-transform-for-of": "^7.10.4", + "@babel/plugin-transform-function-name": "^7.10.4", + "@babel/plugin-transform-literals": "^7.10.4", + "@babel/plugin-transform-member-expression-literals": "^7.10.4", + "@babel/plugin-transform-modules-amd": "^7.10.4", + "@babel/plugin-transform-modules-commonjs": "^7.10.4", + "@babel/plugin-transform-modules-systemjs": "^7.10.4", + "@babel/plugin-transform-modules-umd": "^7.10.4", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4", + "@babel/plugin-transform-new-target": "^7.10.4", + "@babel/plugin-transform-object-super": "^7.10.4", + "@babel/plugin-transform-parameters": "^7.10.4", + "@babel/plugin-transform-property-literals": "^7.10.4", + "@babel/plugin-transform-regenerator": "^7.10.4", + "@babel/plugin-transform-reserved-words": "^7.10.4", + "@babel/plugin-transform-shorthand-properties": "^7.10.4", + "@babel/plugin-transform-spread": "^7.11.0", + "@babel/plugin-transform-sticky-regex": "^7.10.4", + "@babel/plugin-transform-template-literals": "^7.10.4", + "@babel/plugin-transform-typeof-symbol": "^7.10.4", + "@babel/plugin-transform-unicode-escapes": "^7.10.4", + "@babel/plugin-transform-unicode-regex": "^7.10.4", + "@babel/preset-modules": "^0.1.3", + "@babel/types": "^7.11.5", + "browserslist": "^4.12.0", + "core-js-compat": "^3.6.2", + "invariant": "^2.2.2", + "levenary": "^1.1.1", + "semver": "^5.5.0" }, "dependencies": { "semver": { @@ -1106,11 +1106,11 @@ "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-proposal-unicode-property-regex": "7.10.4", - "@babel/plugin-transform-dotall-regex": "7.10.4", - "@babel/types": "7.11.5", - "esutils": "2.0.3" + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", + "@babel/plugin-transform-dotall-regex": "^7.4.4", + "@babel/types": "^7.4.4", + "esutils": "^2.0.2" } }, "@babel/runtime": { @@ -1119,7 +1119,7 @@ "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==", "dev": true, "requires": { - "regenerator-runtime": "0.13.7" + "regenerator-runtime": "^0.13.4" } }, "@babel/template": { @@ -1128,9 +1128,9 @@ "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", "dev": true, "requires": { - "@babel/code-frame": "7.10.4", - "@babel/parser": "7.11.5", - "@babel/types": "7.11.5" + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/traverse": { @@ -1139,15 +1139,15 @@ "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==", "dev": true, "requires": { - "@babel/code-frame": "7.10.4", - "@babel/generator": "7.11.6", - "@babel/helper-function-name": "7.10.4", - "@babel/helper-split-export-declaration": "7.11.0", - "@babel/parser": "7.11.5", - "@babel/types": "7.11.5", - "debug": "4.2.0", - "globals": "11.12.0", - "lodash": "4.17.20" + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.11.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.11.5", + "@babel/types": "^7.11.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" }, "dependencies": { "debug": { @@ -1173,9 +1173,9 @@ "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "7.10.4", - "lodash": "4.17.20", - "to-fast-properties": "2.0.0" + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" } }, "@electron/get": { @@ -1184,15 +1184,15 @@ "integrity": "sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==", "dev": true, "requires": { - "debug": "4.2.0", - "env-paths": "2.2.0", - "fs-extra": "8.1.0", - "global-agent": "2.1.12", - "global-tunnel-ng": "2.7.1", - "got": "9.6.0", - "progress": "2.0.3", - "sanitize-filename": "1.6.3", - "sumchecker": "3.0.1" + "debug": "^4.1.1", + "env-paths": "^2.2.0", + "fs-extra": "^8.1.0", + "global-agent": "^2.0.2", + "global-tunnel-ng": "^2.7.1", + "got": "^9.6.0", + "progress": "^2.0.3", + "sanitize-filename": "^1.6.2", + "sumchecker": "^3.0.1" }, "dependencies": { "debug": { @@ -1210,9 +1210,9 @@ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "ms": { @@ -1230,7 +1230,7 @@ "dev": true, "requires": { "@nodelib/fs.stat": "2.0.3", - "run-parallel": "1.1.9" + "run-parallel": "^1.1.9" } }, "@nodelib/fs.stat": { @@ -1246,7 +1246,7 @@ "dev": true, "requires": { "@nodelib/fs.scandir": "2.1.3", - "fastq": "1.8.0" + "fastq": "^1.6.0" } }, "@npmcli/move-file": { @@ -1255,7 +1255,7 @@ "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==", "dev": true, "requires": { - "mkdirp": "1.0.4" + "mkdirp": "^1.0.4" }, "dependencies": { "mkdirp": { @@ -1290,7 +1290,7 @@ "@types/webpack-dev-server": "3.11.0", "archiver": "5.0.0", "autoprefixer": "9.8.6", - "browserslist": "4.14.5", + "browserslist": "^4.12.0", "chalk": "4.1.0", "chokidar": "3.4.2", "ci-info": "2.0.0", @@ -1363,26 +1363,26 @@ "integrity": "sha512-Eiu8B2rFl3nEvA+PYaybcXknkXcgVy//OqM7+f5fu3UEVw050/JyHBsrnBOMc+muon16Og1RKxOVmQuAWDS1hA==", "dev": true, "requires": { - "@babel/core": "7.11.6", - "@babel/helper-compilation-targets": "7.10.4", - "@babel/helper-module-imports": "7.10.4", - "@babel/plugin-proposal-class-properties": "7.10.4", - "@babel/plugin-proposal-decorators": "7.10.5", - "@babel/plugin-proposal-export-namespace-from": "7.10.4", - "@babel/plugin-proposal-function-sent": "7.10.4", - "@babel/plugin-proposal-json-strings": "7.10.4", - "@babel/plugin-proposal-numeric-separator": "7.10.4", - "@babel/plugin-proposal-throw-expressions": "7.10.4", - "@babel/plugin-syntax-dynamic-import": "7.8.3", - "@babel/plugin-syntax-import-meta": "7.10.4", - "@babel/plugin-transform-runtime": "7.11.5", - "@babel/preset-env": "7.11.5", - "@babel/runtime": "7.11.2", - "babel-loader": "8.1.0", - "babel-plugin-dynamic-import-node": "2.3.3", - "babel-plugin-module-resolver": "4.0.0", - "core-js": "3.6.5", - "core-js-compat": "3.6.5" + "@babel/core": "^7.9.0", + "@babel/helper-compilation-targets": "^7.9.6", + "@babel/helper-module-imports": "^7.8.3", + "@babel/plugin-proposal-class-properties": "^7.5.5", + "@babel/plugin-proposal-decorators": "^7.4.4", + "@babel/plugin-proposal-export-namespace-from": "^7.2.0", + "@babel/plugin-proposal-function-sent": "^7.2.0", + "@babel/plugin-proposal-json-strings": "^7.2.0", + "@babel/plugin-proposal-numeric-separator": "^7.2.0", + "@babel/plugin-proposal-throw-expressions": "^7.2.0", + "@babel/plugin-syntax-dynamic-import": "^7.2.0", + "@babel/plugin-syntax-import-meta": "^7.2.0", + "@babel/plugin-transform-runtime": "^7.9.0", + "@babel/preset-env": "^7.9.0", + "@babel/runtime": "^7.9.0", + "babel-loader": "^8.0.6", + "babel-plugin-dynamic-import-node": "^2.3.0", + "babel-plugin-module-resolver": "^4.0.0", + "core-js": "^3.6.5", + "core-js-compat": "^3.6.5" } }, "@quasar/extras": { @@ -1408,7 +1408,7 @@ "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", "dev": true, "requires": { - "defer-to-connect": "1.1.3" + "defer-to-connect": "^1.0.1" } }, "@types/anymatch": { @@ -1423,8 +1423,8 @@ "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==", "dev": true, "requires": { - "@types/connect": "3.4.33", - "@types/node": "10.17.35" + "@types/connect": "*", + "@types/node": "*" } }, "@types/color-name": { @@ -1439,7 +1439,7 @@ "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", "dev": true, "requires": { - "@types/node": "10.17.35" + "@types/node": "*" } }, "@types/connect-history-api-fallback": { @@ -1448,8 +1448,8 @@ "integrity": "sha512-7SxFCd+FLlxCfwVwbyPxbR4khL9aNikJhrorw8nUIOqeuooc9gifBuDQOJw5kzN7i6i3vLn9G8Wde/4QDihpYw==", "dev": true, "requires": { - "@types/express-serve-static-core": "4.17.13", - "@types/node": "10.17.35" + "@types/express-serve-static-core": "*", + "@types/node": "*" } }, "@types/cordova": { @@ -1464,10 +1464,10 @@ "integrity": "sha512-n47/AbT4DEYPyXtES2myPyKCxVE3hICAB3MnpoVg+Ba8CLBGOpUUsNJ5fyLhfKt5N06sT9nTk4eAc+rtYVpvTQ==", "dev": true, "requires": { - "@electron/get": "1.12.2", - "@types/node": "10.17.35", - "electron-notarize": "0.1.1", - "electron-osx-sign": "0.4.17" + "@electron/get": "^1.3.1", + "@types/node": "*", + "electron-notarize": "^0.1.1", + "electron-osx-sign": "^0.4.11" } }, "@types/eslint-visitor-keys": { @@ -1482,10 +1482,10 @@ "integrity": "sha512-n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==", "dev": true, "requires": { - "@types/body-parser": "1.19.0", - "@types/express-serve-static-core": "4.17.13", - "@types/qs": "6.9.5", - "@types/serve-static": "1.13.5" + "@types/body-parser": "*", + "@types/express-serve-static-core": "*", + "@types/qs": "*", + "@types/serve-static": "*" } }, "@types/express-serve-static-core": { @@ -1494,9 +1494,9 @@ "integrity": "sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA==", "dev": true, "requires": { - "@types/node": "10.17.35", - "@types/qs": "6.9.5", - "@types/range-parser": "1.2.3" + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*" } }, "@types/glob": { @@ -1505,8 +1505,8 @@ "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", "dev": true, "requires": { - "@types/minimatch": "3.0.3", - "@types/node": "10.17.35" + "@types/minimatch": "*", + "@types/node": "*" } }, "@types/html-minifier-terser": { @@ -1521,7 +1521,7 @@ "integrity": "sha512-IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==", "dev": true, "requires": { - "@types/node": "10.17.35" + "@types/node": "*" } }, "@types/http-proxy-middleware": { @@ -1530,9 +1530,9 @@ "integrity": "sha512-lnBTx6HCOUeIJMLbI/LaL5EmdKLhczJY5oeXZpX/cXE4rRqb3RmV7VcMpiEfYkmTjipv3h7IAyIINe4plEv7cA==", "dev": true, "requires": { - "@types/connect": "3.4.33", - "@types/http-proxy": "1.17.4", - "@types/node": "10.17.35" + "@types/connect": "*", + "@types/http-proxy": "*", + "@types/node": "*" } }, "@types/json-schema": { @@ -1589,8 +1589,8 @@ "integrity": "sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==", "dev": true, "requires": { - "@types/express-serve-static-core": "4.17.13", - "@types/mime": "2.0.3" + "@types/express-serve-static-core": "*", + "@types/mime": "*" } }, "@types/source-list-map": { @@ -1611,8 +1611,8 @@ "integrity": "sha512-K5C7izOT8rR4qiE2vfXcQNEJN4lT9cq/2qJgpMUWR2HsjDW/KVrHx2CaHuaXvaqDNsRmdELPLaxeJHiI4GjVrA==", "dev": true, "requires": { - "@types/webpack": "4.41.17", - "terser": "4.8.0" + "@types/webpack": "*", + "terser": "^4.6.13" } }, "@types/uglify-js": { @@ -1621,7 +1621,7 @@ "integrity": "sha512-I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q==", "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "^0.6.1" }, "dependencies": { "source-map": { @@ -1638,12 +1638,12 @@ "integrity": "sha512-6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw==", "dev": true, "requires": { - "@types/anymatch": "1.3.1", - "@types/node": "10.17.35", - "@types/tapable": "1.0.6", - "@types/uglify-js": "3.11.0", - "@types/webpack-sources": "2.0.0", - "source-map": "0.6.1" + "@types/anymatch": "*", + "@types/node": "*", + "@types/tapable": "*", + "@types/uglify-js": "*", + "@types/webpack-sources": "*", + "source-map": "^0.6.0" }, "dependencies": { "source-map": { @@ -1660,7 +1660,7 @@ "integrity": "sha512-Ah6FbkXLAVUNI/ExXHsTS90iRS/Efplh333NySjhGx09oeH9qXf57NMUfl4RADTL5a89hQaq/nbT4eb0LwsQJw==", "dev": true, "requires": { - "@types/webpack": "4.41.17" + "@types/webpack": "*" } }, "@types/webpack-dev-server": { @@ -1669,11 +1669,11 @@ "integrity": "sha512-3+86AgSzl18n5P1iUP9/lz3G3GMztCp+wxdDvVuNhx1sr1jE79GpYfKHL8k+Vht3N74K2n98CuAEw4YPJCYtDA==", "dev": true, "requires": { - "@types/connect-history-api-fallback": "1.3.3", - "@types/express": "4.17.6", - "@types/http-proxy-middleware": "0.19.3", - "@types/serve-static": "1.13.5", - "@types/webpack": "4.41.17" + "@types/connect-history-api-fallback": "*", + "@types/express": "*", + "@types/http-proxy-middleware": "*", + "@types/serve-static": "*", + "@types/webpack": "*" } }, "@types/webpack-sources": { @@ -1682,9 +1682,9 @@ "integrity": "sha512-a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==", "dev": true, "requires": { - "@types/node": "10.17.35", - "@types/source-list-map": "0.1.2", - "source-map": "0.7.3" + "@types/node": "*", + "@types/source-list-map": "*", + "source-map": "^0.7.3" }, "dependencies": { "source-map": { @@ -1702,11 +1702,11 @@ "dev": true, "requires": { "@typescript-eslint/experimental-utils": "3.10.1", - "debug": "4.2.0", - "functional-red-black-tree": "1.0.1", - "regexpp": "3.1.0", - "semver": "7.3.2", - "tsutils": "3.17.1" + "debug": "^4.1.1", + "functional-red-black-tree": "^1.0.1", + "regexpp": "^3.0.0", + "semver": "^7.3.2", + "tsutils": "^3.17.1" }, "dependencies": { "debug": { @@ -1732,11 +1732,11 @@ "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==", "dev": true, "requires": { - "@types/json-schema": "7.0.6", + "@types/json-schema": "^7.0.3", "@typescript-eslint/types": "3.10.1", "@typescript-eslint/typescript-estree": "3.10.1", - "eslint-scope": "5.1.1", - "eslint-utils": "2.1.0" + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0" }, "dependencies": { "eslint-scope": { @@ -1745,8 +1745,8 @@ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "esrecurse": "4.3.0", - "estraverse": "4.3.0" + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" } } } @@ -1757,11 +1757,11 @@ "integrity": "sha512-Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==", "dev": true, "requires": { - "@types/eslint-visitor-keys": "1.0.0", + "@types/eslint-visitor-keys": "^1.0.0", "@typescript-eslint/experimental-utils": "3.10.1", "@typescript-eslint/types": "3.10.1", "@typescript-eslint/typescript-estree": "3.10.1", - "eslint-visitor-keys": "1.3.0" + "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/types": { @@ -1778,12 +1778,12 @@ "requires": { "@typescript-eslint/types": "3.10.1", "@typescript-eslint/visitor-keys": "3.10.1", - "debug": "4.2.0", - "glob": "7.1.6", - "is-glob": "4.0.1", - "lodash": "4.17.20", - "semver": "7.3.2", - "tsutils": "3.17.1" + "debug": "^4.1.1", + "glob": "^7.1.6", + "is-glob": "^4.0.1", + "lodash": "^4.17.15", + "semver": "^7.3.2", + "tsutils": "^3.17.1" }, "dependencies": { "debug": { @@ -1809,7 +1809,7 @@ "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==", "dev": true, "requires": { - "eslint-visitor-keys": "1.3.0" + "eslint-visitor-keys": "^1.1.0" } }, "@vue/component-compiler-utils": { @@ -1818,15 +1818,15 @@ "integrity": "sha512-lejBLa7xAMsfiZfNp7Kv51zOzifnb29FwdnMLa96z26kXErPFioSf9BMcePVIQ6/Gc6/mC0UrPpxAWIHyae0vw==", "dev": true, "requires": { - "consolidate": "0.15.1", - "hash-sum": "1.0.2", - "lru-cache": "4.1.5", - "merge-source-map": "1.1.0", - "postcss": "7.0.35", - "postcss-selector-parser": "6.0.4", - "prettier": "1.19.1", - "source-map": "0.6.1", - "vue-template-es2015-compiler": "1.9.1" + "consolidate": "^0.15.1", + "hash-sum": "^1.0.2", + "lru-cache": "^4.1.2", + "merge-source-map": "^1.1.0", + "postcss": "^7.0.14", + "postcss-selector-parser": "^6.0.2", + "prettier": "^1.18.2", + "source-map": "~0.6.1", + "vue-template-es2015-compiler": "^1.9.0" }, "dependencies": { "lru-cache": { @@ -1858,7 +1858,7 @@ "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-0.6.7.tgz", "integrity": "sha512-WAWEQK4urEsMNe3OyOp7VnMmegRZT2yRB3fDGLRXPMdfuo4+nM+uMEhUgDiUg9LFSXfLWhjwuFOJ2hnS2X7AUw==", "requires": { - "tslib": "2.0.1" + "tslib": "^2.0.0" } }, "@webassemblyjs/ast": { @@ -1938,7 +1938,7 @@ "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==", "dev": true, "requires": { - "@xtuc/ieee754": "1.2.0" + "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { @@ -2060,7 +2060,7 @@ "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", "dev": true, "requires": { - "mime-types": "2.1.27", + "mime-types": "~2.1.24", "negotiator": "0.6.2" } }, @@ -2088,8 +2088,8 @@ "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, "requires": { - "clean-stack": "2.2.0", - "indent-string": "4.0.0" + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" } }, "ajv": { @@ -2098,10 +2098,10 @@ "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", "dev": true, "requires": { - "fast-deep-equal": "3.1.3", - "fast-json-stable-stringify": "2.1.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.4.0" + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" } }, "ajv-errors": { @@ -2140,7 +2140,7 @@ "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", "dev": true, "requires": { - "type-fest": "0.11.0" + "type-fest": "^0.11.0" }, "dependencies": { "type-fest": { @@ -2169,7 +2169,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "anymatch": { @@ -2178,8 +2178,8 @@ "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", "dev": true, "requires": { - "normalize-path": "3.0.0", - "picomatch": "2.2.2" + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" } }, "aproba": { @@ -2194,13 +2194,13 @@ "integrity": "sha512-AEWhJz6Yi6hWtN1Sqy/H4sZo/lLMJ/NftXxGaDy/TnOMmmjsRaZc/Ts+U4BsPoBQkuunTN6t8hk7iU9A+HBxLw==", "dev": true, "requires": { - "archiver-utils": "2.1.0", - "async": "3.2.0", - "buffer-crc32": "0.2.13", - "readable-stream": "3.6.0", - "readdir-glob": "1.1.0", - "tar-stream": "2.1.4", - "zip-stream": "4.0.2" + "archiver-utils": "^2.1.0", + "async": "^3.2.0", + "buffer-crc32": "^0.2.1", + "readable-stream": "^3.6.0", + "readdir-glob": "^1.0.0", + "tar-stream": "^2.1.2", + "zip-stream": "^4.0.0" } }, "archiver-utils": { @@ -2209,16 +2209,16 @@ "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", "dev": true, "requires": { - "glob": "7.1.6", - "graceful-fs": "4.2.4", - "lazystream": "1.0.0", - "lodash.defaults": "4.2.0", - "lodash.difference": "4.5.0", - "lodash.flatten": "4.4.0", - "lodash.isplainobject": "4.0.6", - "lodash.union": "4.6.0", - "normalize-path": "3.0.0", - "readable-stream": "2.3.7" + "glob": "^7.1.4", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", + "readable-stream": "^2.0.0" }, "dependencies": { "readable-stream": { @@ -2227,13 +2227,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -2244,8 +2244,8 @@ "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.7" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" }, "dependencies": { "readable-stream": { @@ -2254,13 +2254,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -2271,7 +2271,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" }, "dependencies": { "sprintf-js": { @@ -2336,7 +2336,7 @@ "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "~2.1.0" } }, "asn1.js": { @@ -2345,10 +2345,10 @@ "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", "dev": true, "requires": { - "bn.js": "4.11.9", - "inherits": "2.0.4", - "minimalistic-assert": "1.0.1", - "safer-buffer": "2.1.2" + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" }, "dependencies": { "bn.js": { @@ -2365,7 +2365,7 @@ "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", "dev": true, "requires": { - "object-assign": "4.1.1", + "object-assign": "^4.1.1", "util": "0.10.3" }, "dependencies": { @@ -2452,13 +2452,13 @@ "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==", "dev": true, "requires": { - "browserslist": "4.14.5", - "caniuse-lite": "1.0.30001142", - "colorette": "1.2.1", - "normalize-range": "0.1.2", - "num2fraction": "1.2.2", - "postcss": "7.0.35", - "postcss-value-parser": "4.1.0" + "browserslist": "^4.12.0", + "caniuse-lite": "^1.0.30001109", + "colorette": "^1.2.1", + "normalize-range": "^0.1.2", + "num2fraction": "^1.2.2", + "postcss": "^7.0.32", + "postcss-value-parser": "^4.1.0" } }, "aws-sign2": { @@ -2479,7 +2479,7 @@ "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==", "requires": { "follow-redirects": "1.5.10", - "is-buffer": "2.0.4" + "is-buffer": "^2.0.2" } }, "babel-eslint": { @@ -2488,12 +2488,12 @@ "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==", "dev": true, "requires": { - "@babel/code-frame": "7.10.4", - "@babel/parser": "7.11.5", - "@babel/traverse": "7.11.5", - "@babel/types": "7.11.5", - "eslint-visitor-keys": "1.3.0", - "resolve": "1.17.0" + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.0", + "@babel/traverse": "^7.7.0", + "@babel/types": "^7.7.0", + "eslint-visitor-keys": "^1.0.0", + "resolve": "^1.12.0" } }, "babel-loader": { @@ -2502,11 +2502,11 @@ "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==", "dev": true, "requires": { - "find-cache-dir": "2.1.0", - "loader-utils": "1.4.0", - "mkdirp": "0.5.5", - "pify": "4.0.1", - "schema-utils": "2.7.1" + "find-cache-dir": "^2.1.0", + "loader-utils": "^1.4.0", + "mkdirp": "^0.5.3", + "pify": "^4.0.1", + "schema-utils": "^2.6.5" } }, "babel-plugin-dynamic-import-node": { @@ -2515,7 +2515,7 @@ "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", "dev": true, "requires": { - "object.assign": "4.1.1" + "object.assign": "^4.1.0" } }, "babel-plugin-module-resolver": { @@ -2524,11 +2524,11 @@ "integrity": "sha512-3pdEq3PXALilSJ6dnC4wMWr0AZixHRM4utpdpBR9g5QG7B7JwWyukQv7a9hVxkbGFl+nQbrHDqqQOIBtTXTP/Q==", "dev": true, "requires": { - "find-babel-config": "1.2.0", - "glob": "7.1.6", - "pkg-up": "3.1.0", - "reselect": "4.0.0", - "resolve": "1.17.0" + "find-babel-config": "^1.2.0", + "glob": "^7.1.6", + "pkg-up": "^3.1.0", + "reselect": "^4.0.0", + "resolve": "^1.13.1" } }, "balanced-match": { @@ -2543,13 +2543,13 @@ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.3.0", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.2", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { @@ -2558,7 +2558,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -2567,7 +2567,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -2576,7 +2576,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -2585,9 +2585,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.3" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -2610,7 +2610,7 @@ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "bfj": { @@ -2619,10 +2619,10 @@ "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==", "dev": true, "requires": { - "bluebird": "3.7.2", - "check-types": "8.0.3", - "hoopy": "0.1.4", - "tryer": "1.0.1" + "bluebird": "^3.5.5", + "check-types": "^8.0.3", + "hoopy": "^0.1.4", + "tryer": "^1.0.1" } }, "big.js": { @@ -2643,9 +2643,9 @@ "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==", "dev": true, "requires": { - "buffer": "5.6.0", - "inherits": "2.0.4", - "readable-stream": "3.6.0" + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" } }, "block-stream": { @@ -2654,7 +2654,7 @@ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "dev": true, "requires": { - "inherits": "2.0.4" + "inherits": "~2.0.0" } }, "bluebird": { @@ -2676,15 +2676,15 @@ "dev": true, "requires": { "bytes": "3.1.0", - "content-type": "1.0.4", + "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "1.1.2", + "depd": "~1.1.2", "http-errors": "1.7.2", "iconv-lite": "0.4.24", - "on-finished": "2.3.0", + "on-finished": "~2.3.0", "qs": "6.7.0", "raw-body": "2.4.0", - "type-is": "1.6.18" + "type-is": "~1.6.17" }, "dependencies": { "debug": { @@ -2704,12 +2704,12 @@ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { - "array-flatten": "2.1.2", - "deep-equal": "1.1.1", - "dns-equal": "1.0.0", - "dns-txt": "2.0.2", - "multicast-dns": "6.2.3", - "multicast-dns-service-types": "1.1.0" + "array-flatten": "^2.1.0", + "deep-equal": "^1.0.1", + "dns-equal": "^1.0.0", + "dns-txt": "^2.0.2", + "multicast-dns": "^6.0.1", + "multicast-dns-service-types": "^1.1.0" }, "dependencies": { "array-flatten": { @@ -2730,7 +2730,8 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==", - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", @@ -2738,7 +2739,7 @@ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -2748,7 +2749,7 @@ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "fill-range": "7.0.1" + "fill-range": "^7.0.1" } }, "brorand": { @@ -2763,12 +2764,12 @@ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { - "buffer-xor": "1.0.3", - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "browserify-cipher": { @@ -2777,9 +2778,9 @@ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", "dev": true, "requires": { - "browserify-aes": "1.2.0", - "browserify-des": "1.0.2", - "evp_bytestokey": "1.0.3" + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" } }, "browserify-des": { @@ -2788,10 +2789,10 @@ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", "dev": true, "requires": { - "cipher-base": "1.0.4", - "des.js": "1.0.1", - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "browserify-rsa": { @@ -2800,8 +2801,8 @@ "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { - "bn.js": "4.11.9", - "randombytes": "2.1.0" + "bn.js": "^4.1.0", + "randombytes": "^2.0.1" }, "dependencies": { "bn.js": { @@ -2818,15 +2819,15 @@ "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "dev": true, "requires": { - "bn.js": "5.1.3", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "elliptic": "6.5.3", - "inherits": "2.0.4", - "parse-asn1": "5.1.6", - "readable-stream": "3.6.0", - "safe-buffer": "5.2.1" + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "elliptic": "^6.5.3", + "inherits": "^2.0.4", + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" }, "dependencies": { "safe-buffer": { @@ -2843,7 +2844,7 @@ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, "requires": { - "pako": "1.0.11" + "pako": "~1.0.5" } }, "browserslist": { @@ -2852,10 +2853,10 @@ "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==", "dev": true, "requires": { - "caniuse-lite": "1.0.30001142", - "electron-to-chromium": "1.3.576", - "escalade": "3.1.0", - "node-releases": "1.1.61" + "caniuse-lite": "^1.0.30001135", + "electron-to-chromium": "^1.3.571", + "escalade": "^3.1.0", + "node-releases": "^1.1.61" } }, "buffer": { @@ -2864,8 +2865,8 @@ "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", "dev": true, "requires": { - "base64-js": "1.3.1", - "ieee754": "1.1.13" + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" } }, "buffer-alloc": { @@ -2874,8 +2875,8 @@ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "dev": true, "requires": { - "buffer-alloc-unsafe": "1.1.0", - "buffer-fill": "1.0.0" + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" } }, "buffer-alloc-unsafe": { @@ -2932,23 +2933,23 @@ "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==", "dev": true, "requires": { - "@npmcli/move-file": "1.0.1", - "chownr": "2.0.0", - "fs-minipass": "2.1.0", - "glob": "7.1.6", - "infer-owner": "1.0.4", - "lru-cache": "6.0.0", - "minipass": "3.1.3", - "minipass-collect": "1.0.2", - "minipass-flush": "1.0.5", - "minipass-pipeline": "1.2.4", - "mkdirp": "1.0.4", - "p-map": "4.0.0", - "promise-inflight": "1.0.1", - "rimraf": "3.0.2", - "ssri": "8.0.0", - "tar": "6.0.5", - "unique-filename": "1.1.1" + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "glob": "^7.1.4", + "infer-owner": "^1.0.4", + "lru-cache": "^6.0.0", + "minipass": "^3.1.1", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.2", + "mkdirp": "^1.0.3", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^8.0.0", + "tar": "^6.0.2", + "unique-filename": "^1.1.1" }, "dependencies": { "mkdirp": { @@ -2965,15 +2966,15 @@ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.3.0", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.1", - "to-object-path": "0.3.0", - "union-value": "1.0.1", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, "cacheable-request": { @@ -2982,13 +2983,13 @@ "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", "dev": true, "requires": { - "clone-response": "1.0.2", - "get-stream": "5.2.0", - "http-cache-semantics": "4.1.0", - "keyv": "3.1.0", - "lowercase-keys": "2.0.0", - "normalize-url": "4.5.0", - "responselike": "1.0.2" + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^3.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^4.1.0", + "responselike": "^1.0.2" }, "dependencies": { "get-stream": { @@ -2997,7 +2998,7 @@ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, "requires": { - "pump": "3.0.0" + "pump": "^3.0.0" } }, "lowercase-keys": { @@ -3014,7 +3015,7 @@ "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", "dev": true, "requires": { - "callsites": "2.0.0" + "callsites": "^2.0.0" } }, "caller-path": { @@ -3023,7 +3024,7 @@ "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", "dev": true, "requires": { - "caller-callsite": "2.0.0" + "caller-callsite": "^2.0.0" } }, "callsites": { @@ -3038,8 +3039,8 @@ "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", "dev": true, "requires": { - "no-case": "2.3.2", - "upper-case": "1.1.3" + "no-case": "^2.2.0", + "upper-case": "^1.1.1" } }, "camelcase": { @@ -3054,8 +3055,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" }, "dependencies": { "camelcase": { @@ -3072,10 +3073,10 @@ "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", "dev": true, "requires": { - "browserslist": "4.14.5", - "caniuse-lite": "1.0.30001142", - "lodash.memoize": "4.1.2", - "lodash.uniq": "4.5.0" + "browserslist": "^4.0.0", + "caniuse-lite": "^1.0.0", + "lodash.memoize": "^4.1.2", + "lodash.uniq": "^4.5.0" } }, "caniuse-lite": { @@ -3096,8 +3097,8 @@ "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { - "ansi-styles": "4.2.1", - "supports-color": "7.2.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "dependencies": { "ansi-styles": { @@ -3106,8 +3107,8 @@ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/color-name": "1.1.1", - "color-convert": "2.0.1" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, "color-convert": { @@ -3116,7 +3117,7 @@ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "color-name": "1.1.4" + "color-name": "~1.1.4" } }, "color-name": { @@ -3137,7 +3138,7 @@ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { - "has-flag": "4.0.0" + "has-flag": "^4.0.0" } } } @@ -3160,14 +3161,14 @@ "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", "dev": true, "requires": { - "anymatch": "3.1.1", - "braces": "3.0.2", - "fsevents": "2.1.3", - "glob-parent": "5.1.1", - "is-binary-path": "2.1.0", - "is-glob": "4.0.1", - "normalize-path": "3.0.0", - "readdirp": "3.4.0" + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.4.0" } }, "chownr": { @@ -3182,7 +3183,7 @@ "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", "dev": true, "requires": { - "tslib": "1.13.0" + "tslib": "^1.9.0" }, "dependencies": { "tslib": { @@ -3205,8 +3206,8 @@ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "dev": true, "requires": { - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "class-utils": { @@ -3215,10 +3216,10 @@ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { @@ -3227,7 +3228,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -3238,7 +3239,7 @@ "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "~0.6.0" }, "dependencies": { "source-map": { @@ -3261,7 +3262,7 @@ "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, "requires": { - "restore-cursor": "3.1.0" + "restore-cursor": "^3.1.0" } }, "cli-width": { @@ -3276,9 +3277,9 @@ "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "dev": true, "requires": { - "string-width": "3.1.0", - "strip-ansi": "5.2.0", - "wrap-ansi": "5.1.0" + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" }, "dependencies": { "ansi-regex": { @@ -3299,9 +3300,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "7.0.3", - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "5.2.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } }, "strip-ansi": { @@ -3310,7 +3311,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.1.0" + "ansi-regex": "^4.1.0" } }, "wrap-ansi": { @@ -3319,9 +3320,9 @@ "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "string-width": "3.1.0", - "strip-ansi": "5.2.0" + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" } } } @@ -3332,9 +3333,9 @@ "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, "requires": { - "is-plain-object": "2.0.4", - "kind-of": "6.0.3", - "shallow-clone": "3.0.1" + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" } }, "clone-response": { @@ -3343,7 +3344,7 @@ "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", "dev": true, "requires": { - "mimic-response": "1.0.1" + "mimic-response": "^1.0.0" } }, "coa": { @@ -3352,9 +3353,9 @@ "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==", "dev": true, "requires": { - "@types/q": "1.5.4", - "chalk": "2.4.2", - "q": "1.5.1" + "@types/q": "^1.5.1", + "chalk": "^2.4.1", + "q": "^1.1.2" }, "dependencies": { "chalk": { @@ -3363,9 +3364,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -3382,8 +3383,8 @@ "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "color": { @@ -3392,8 +3393,8 @@ "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==", "dev": true, "requires": { - "color-convert": "1.9.3", - "color-string": "1.5.3" + "color-convert": "^1.9.1", + "color-string": "^1.5.2" } }, "color-convert": { @@ -3417,8 +3418,8 @@ "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", "dev": true, "requires": { - "color-name": "1.1.3", - "simple-swizzle": "0.2.2" + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" } }, "colorette": { @@ -3439,7 +3440,7 @@ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { @@ -3472,10 +3473,10 @@ "integrity": "sha512-xZm9o6iikekkI0GnXCmAl3LQGZj5TBDj0zLowsqi7tJtEa3FMGSEcHcqrSJIrOAk1UG/NBbDn/F1q+MG/p/EsA==", "dev": true, "requires": { - "buffer-crc32": "0.2.13", - "crc32-stream": "4.0.0", - "normalize-path": "3.0.0", - "readable-stream": "3.6.0" + "buffer-crc32": "^0.2.13", + "crc32-stream": "^4.0.0", + "normalize-path": "^3.0.0", + "readable-stream": "^3.6.0" } }, "compressible": { @@ -3484,7 +3485,7 @@ "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, "requires": { - "mime-db": "1.44.0" + "mime-db": ">= 1.43.0 < 2" } }, "compression": { @@ -3493,13 +3494,13 @@ "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.5", "bytes": "3.0.0", - "compressible": "2.0.18", + "compressible": "~2.0.16", "debug": "2.6.9", - "on-headers": "1.0.2", + "on-headers": "~1.0.2", "safe-buffer": "5.1.2", - "vary": "1.1.2" + "vary": "~1.1.2" }, "dependencies": { "bytes": { @@ -3525,11 +3526,11 @@ "integrity": "sha512-Wcb99O4UkdDZiM+blEw6h+cUfJYCn2kgK0l3fjLOm72Stso9DVMieQpBD4PVpyI7DLL6+zNh0iJV3p4HDwTinQ==", "dev": true, "requires": { - "cacache": "15.0.5", - "find-cache-dir": "3.3.1", - "schema-utils": "2.7.1", - "serialize-javascript": "4.0.0", - "webpack-sources": "1.4.3" + "cacache": "^15.0.5", + "find-cache-dir": "^3.3.1", + "schema-utils": "^2.7.0", + "serialize-javascript": "^4.0.0", + "webpack-sources": "^1.4.3" }, "dependencies": { "find-cache-dir": { @@ -3538,9 +3539,9 @@ "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "3.1.0", - "pkg-dir": "4.2.0" + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" } }, "find-up": { @@ -3549,8 +3550,8 @@ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "5.0.0", - "path-exists": "4.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "locate-path": { @@ -3559,7 +3560,7 @@ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "4.1.0" + "p-locate": "^4.1.0" } }, "make-dir": { @@ -3568,7 +3569,7 @@ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { - "semver": "6.3.0" + "semver": "^6.0.0" } }, "p-locate": { @@ -3577,7 +3578,7 @@ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "2.3.0" + "p-limit": "^2.2.0" } }, "path-exists": { @@ -3592,7 +3593,7 @@ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "4.1.0" + "find-up": "^4.0.0" } }, "semver": { @@ -3615,10 +3616,10 @@ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "dev": true, "requires": { - "buffer-from": "1.1.1", - "inherits": "2.0.4", - "readable-stream": "2.3.7", - "typedarray": "0.0.6" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" }, "dependencies": { "readable-stream": { @@ -3627,13 +3628,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -3645,8 +3646,8 @@ "dev": true, "optional": true, "requires": { - "ini": "1.3.5", - "proto-list": "1.2.4" + "ini": "^1.3.4", + "proto-list": "~1.2.1" } }, "connect-history-api-fallback": { @@ -3673,7 +3674,7 @@ "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==", "dev": true, "requires": { - "bluebird": "3.7.2" + "bluebird": "^3.1.1" } }, "constants-browserify": { @@ -3703,7 +3704,7 @@ "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.1" } }, "cookie": { @@ -3724,12 +3725,12 @@ "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", "dev": true, "requires": { - "aproba": "1.2.0", - "fs-write-stream-atomic": "1.0.10", - "iferr": "0.1.5", - "mkdirp": "0.5.5", - "rimraf": "2.7.1", - "run-queue": "1.0.3" + "aproba": "^1.1.1", + "fs-write-stream-atomic": "^1.0.8", + "iferr": "^0.1.5", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.0" }, "dependencies": { "rimraf": { @@ -3738,7 +3739,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } } } @@ -3755,17 +3756,17 @@ "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==", "dev": true, "requires": { - "cacache": "15.0.5", - "fast-glob": "3.2.4", - "find-cache-dir": "3.3.1", - "glob-parent": "5.1.1", - "globby": "11.0.1", - "loader-utils": "2.0.0", - "normalize-path": "3.0.0", - "p-limit": "3.0.2", - "schema-utils": "2.7.1", - "serialize-javascript": "4.0.0", - "webpack-sources": "1.4.3" + "cacache": "^15.0.4", + "fast-glob": "^3.2.4", + "find-cache-dir": "^3.3.1", + "glob-parent": "^5.1.1", + "globby": "^11.0.1", + "loader-utils": "^2.0.0", + "normalize-path": "^3.0.0", + "p-limit": "^3.0.1", + "schema-utils": "^2.7.0", + "serialize-javascript": "^4.0.0", + "webpack-sources": "^1.4.3" }, "dependencies": { "find-cache-dir": { @@ -3774,9 +3775,9 @@ "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "3.1.0", - "pkg-dir": "4.2.0" + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" } }, "find-up": { @@ -3785,8 +3786,8 @@ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "5.0.0", - "path-exists": "4.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "loader-utils": { @@ -3795,9 +3796,9 @@ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { - "big.js": "5.2.2", - "emojis-list": "3.0.0", - "json5": "2.1.3" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" } }, "locate-path": { @@ -3806,7 +3807,7 @@ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "4.1.0" + "p-locate": "^4.1.0" } }, "make-dir": { @@ -3815,7 +3816,7 @@ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { - "semver": "6.3.0" + "semver": "^6.0.0" } }, "p-limit": { @@ -3824,7 +3825,7 @@ "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -3833,7 +3834,7 @@ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "2.3.0" + "p-limit": "^2.2.0" }, "dependencies": { "p-limit": { @@ -3842,7 +3843,7 @@ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } } } @@ -3859,7 +3860,7 @@ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "4.1.0" + "find-up": "^4.0.0" } }, "semver": { @@ -3881,7 +3882,7 @@ "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==", "dev": true, "requires": { - "browserslist": "4.14.5", + "browserslist": "^4.8.5", "semver": "7.0.0" }, "dependencies": { @@ -3905,10 +3906,10 @@ "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", "dev": true, "requires": { - "import-fresh": "2.0.0", - "is-directory": "0.3.1", - "js-yaml": "3.14.0", - "parse-json": "4.0.0" + "import-fresh": "^2.0.0", + "is-directory": "^0.3.1", + "js-yaml": "^3.13.1", + "parse-json": "^4.0.0" } }, "crc": { @@ -3917,7 +3918,7 @@ "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", "dev": true, "requires": { - "buffer": "5.6.0" + "buffer": "^5.1.0" } }, "crc32-stream": { @@ -3926,8 +3927,8 @@ "integrity": "sha512-tyMw2IeUX6t9jhgXI6um0eKfWq4EIDpfv5m7GX4Jzp7eVelQ360xd8EPXJhp2mHwLQIkqlnMLjzqSZI3a+0wRw==", "dev": true, "requires": { - "crc": "3.8.0", - "readable-stream": "3.6.0" + "crc": "^3.4.4", + "readable-stream": "^3.4.0" } }, "create-ecdh": { @@ -3936,8 +3937,8 @@ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", "dev": true, "requires": { - "bn.js": "4.11.9", - "elliptic": "6.5.3" + "bn.js": "^4.1.0", + "elliptic": "^6.5.3" }, "dependencies": { "bn.js": { @@ -3954,11 +3955,11 @@ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { - "cipher-base": "1.0.4", - "inherits": "2.0.4", - "md5.js": "1.3.5", - "ripemd160": "2.0.2", - "sha.js": "2.4.11" + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" } }, "create-hmac": { @@ -3967,12 +3968,12 @@ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "inherits": "2.0.4", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "cross-spawn": { @@ -3981,9 +3982,9 @@ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "requires": { - "path-key": "3.1.1", - "shebang-command": "2.0.0", - "which": "2.0.2" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, "crypto-browserify": { @@ -3992,17 +3993,17 @@ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "dev": true, "requires": { - "browserify-cipher": "1.0.1", - "browserify-sign": "4.2.1", - "create-ecdh": "4.0.4", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "diffie-hellman": "5.0.3", - "inherits": "2.0.4", - "pbkdf2": "3.1.1", - "public-encrypt": "4.0.3", - "randombytes": "2.1.0", - "randomfill": "1.0.4" + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" } }, "css": { @@ -4011,10 +4012,10 @@ "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", "dev": true, "requires": { - "inherits": "2.0.4", - "source-map": "0.6.1", - "source-map-resolve": "0.5.3", - "urix": "0.1.0" + "inherits": "^2.0.3", + "source-map": "^0.6.1", + "source-map-resolve": "^0.5.2", + "urix": "^0.1.0" }, "dependencies": { "source-map": { @@ -4037,8 +4038,8 @@ "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==", "dev": true, "requires": { - "postcss": "7.0.35", - "timsort": "0.3.0" + "postcss": "^7.0.1", + "timsort": "^0.3.0" } }, "css-loader": { @@ -4047,19 +4048,19 @@ "integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==", "dev": true, "requires": { - "camelcase": "5.3.1", - "cssesc": "3.0.0", - "icss-utils": "4.1.1", - "loader-utils": "1.4.0", - "normalize-path": "3.0.0", - "postcss": "7.0.35", - "postcss-modules-extract-imports": "2.0.0", - "postcss-modules-local-by-default": "3.0.3", - "postcss-modules-scope": "2.2.0", - "postcss-modules-values": "3.0.0", - "postcss-value-parser": "4.1.0", - "schema-utils": "2.7.1", - "semver": "6.3.0" + "camelcase": "^5.3.1", + "cssesc": "^3.0.0", + "icss-utils": "^4.1.1", + "loader-utils": "^1.2.3", + "normalize-path": "^3.0.0", + "postcss": "^7.0.32", + "postcss-modules-extract-imports": "^2.0.0", + "postcss-modules-local-by-default": "^3.0.2", + "postcss-modules-scope": "^2.2.0", + "postcss-modules-values": "^3.0.0", + "postcss-value-parser": "^4.1.0", + "schema-utils": "^2.7.0", + "semver": "^6.3.0" }, "dependencies": { "semver": { @@ -4076,7 +4077,7 @@ "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=", "dev": true, "requires": { - "css": "2.2.4" + "css": "^2.0.0" } }, "css-select": { @@ -4085,10 +4086,10 @@ "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", "dev": true, "requires": { - "boolbase": "1.0.0", - "css-what": "3.4.1", - "domutils": "1.7.0", - "nth-check": "1.0.2" + "boolbase": "^1.0.0", + "css-what": "^3.2.1", + "domutils": "^1.7.0", + "nth-check": "^1.0.2" } }, "css-select-base-adapter": { @@ -4104,7 +4105,7 @@ "dev": true, "requires": { "mdn-data": "2.0.4", - "source-map": "0.6.1" + "source-map": "^0.6.1" }, "dependencies": { "source-map": { @@ -4133,10 +4134,10 @@ "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==", "dev": true, "requires": { - "cosmiconfig": "5.2.1", - "cssnano-preset-default": "4.0.7", - "is-resolvable": "1.1.0", - "postcss": "7.0.35" + "cosmiconfig": "^5.0.0", + "cssnano-preset-default": "^4.0.7", + "is-resolvable": "^1.0.0", + "postcss": "^7.0.0" } }, "cssnano-preset-default": { @@ -4145,36 +4146,36 @@ "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==", "dev": true, "requires": { - "css-declaration-sorter": "4.0.1", - "cssnano-util-raw-cache": "4.0.1", - "postcss": "7.0.35", - "postcss-calc": "7.0.4", - "postcss-colormin": "4.0.3", - "postcss-convert-values": "4.0.1", - "postcss-discard-comments": "4.0.2", - "postcss-discard-duplicates": "4.0.2", - "postcss-discard-empty": "4.0.1", - "postcss-discard-overridden": "4.0.1", - "postcss-merge-longhand": "4.0.11", - "postcss-merge-rules": "4.0.3", - "postcss-minify-font-values": "4.0.2", - "postcss-minify-gradients": "4.0.2", - "postcss-minify-params": "4.0.2", - "postcss-minify-selectors": "4.0.2", - "postcss-normalize-charset": "4.0.1", - "postcss-normalize-display-values": "4.0.2", - "postcss-normalize-positions": "4.0.2", - "postcss-normalize-repeat-style": "4.0.2", - "postcss-normalize-string": "4.0.2", - "postcss-normalize-timing-functions": "4.0.2", - "postcss-normalize-unicode": "4.0.1", - "postcss-normalize-url": "4.0.1", - "postcss-normalize-whitespace": "4.0.2", - "postcss-ordered-values": "4.1.2", - "postcss-reduce-initial": "4.0.3", - "postcss-reduce-transforms": "4.0.2", - "postcss-svgo": "4.0.2", - "postcss-unique-selectors": "4.0.1" + "css-declaration-sorter": "^4.0.1", + "cssnano-util-raw-cache": "^4.0.1", + "postcss": "^7.0.0", + "postcss-calc": "^7.0.1", + "postcss-colormin": "^4.0.3", + "postcss-convert-values": "^4.0.1", + "postcss-discard-comments": "^4.0.2", + "postcss-discard-duplicates": "^4.0.2", + "postcss-discard-empty": "^4.0.1", + "postcss-discard-overridden": "^4.0.1", + "postcss-merge-longhand": "^4.0.11", + "postcss-merge-rules": "^4.0.3", + "postcss-minify-font-values": "^4.0.2", + "postcss-minify-gradients": "^4.0.2", + "postcss-minify-params": "^4.0.2", + "postcss-minify-selectors": "^4.0.2", + "postcss-normalize-charset": "^4.0.1", + "postcss-normalize-display-values": "^4.0.2", + "postcss-normalize-positions": "^4.0.2", + "postcss-normalize-repeat-style": "^4.0.2", + "postcss-normalize-string": "^4.0.2", + "postcss-normalize-timing-functions": "^4.0.2", + "postcss-normalize-unicode": "^4.0.1", + "postcss-normalize-url": "^4.0.1", + "postcss-normalize-whitespace": "^4.0.2", + "postcss-ordered-values": "^4.1.2", + "postcss-reduce-initial": "^4.0.3", + "postcss-reduce-transforms": "^4.0.2", + "postcss-svgo": "^4.0.2", + "postcss-unique-selectors": "^4.0.1" } }, "cssnano-util-get-arguments": { @@ -4195,7 +4196,7 @@ "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.0" } }, "cssnano-util-same-parent": { @@ -4220,7 +4221,7 @@ "dev": true, "requires": { "mdn-data": "2.0.6", - "source-map": "0.6.1" + "source-map": "^0.6.1" } }, "mdn-data": { @@ -4243,7 +4244,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "cyclist": { @@ -4258,7 +4259,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "de-indent": { @@ -4293,7 +4294,7 @@ "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, "requires": { - "mimic-response": "1.0.1" + "mimic-response": "^1.0.0" } }, "deep-equal": { @@ -4302,12 +4303,12 @@ "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", "dev": true, "requires": { - "is-arguments": "1.0.4", - "is-date-object": "1.0.2", - "is-regex": "1.1.1", - "object-is": "1.1.3", - "object-keys": "1.1.1", - "regexp.prototype.flags": "1.3.0" + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" } }, "deep-is": { @@ -4328,8 +4329,8 @@ "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", "dev": true, "requires": { - "execa": "1.0.0", - "ip-regex": "2.1.0" + "execa": "^1.0.0", + "ip-regex": "^2.1.0" } }, "defer-to-connect": { @@ -4344,7 +4345,7 @@ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "dev": true, "requires": { - "object-keys": "1.1.1" + "object-keys": "^1.0.12" } }, "define-property": { @@ -4353,8 +4354,8 @@ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -4363,7 +4364,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -4372,7 +4373,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -4381,9 +4382,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.3" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -4394,13 +4395,13 @@ "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", "dev": true, "requires": { - "@types/glob": "7.1.3", - "globby": "6.1.0", - "is-path-cwd": "2.2.0", - "is-path-in-cwd": "2.1.0", - "p-map": "2.1.0", - "pify": "4.0.1", - "rimraf": "2.7.1" + "@types/glob": "^7.1.1", + "globby": "^6.1.0", + "is-path-cwd": "^2.0.0", + "is-path-in-cwd": "^2.0.0", + "p-map": "^2.0.0", + "pify": "^4.0.1", + "rimraf": "^2.6.3" }, "dependencies": { "array-union": { @@ -4409,7 +4410,7 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { - "array-uniq": "1.0.3" + "array-uniq": "^1.0.1" } }, "globby": { @@ -4418,11 +4419,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.6", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" }, "dependencies": { "pify": { @@ -4445,7 +4446,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } } } @@ -4474,8 +4475,8 @@ "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", "dev": true, "requires": { - "inherits": "2.0.4", - "minimalistic-assert": "1.0.1" + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" } }, "destroy": { @@ -4496,9 +4497,9 @@ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { - "bn.js": "4.11.9", - "miller-rabin": "4.0.1", - "randombytes": "2.1.0" + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" }, "dependencies": { "bn.js": { @@ -4515,7 +4516,7 @@ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, "requires": { - "path-type": "4.0.0" + "path-type": "^4.0.0" } }, "dns-equal": { @@ -4530,8 +4531,8 @@ "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", "dev": true, "requires": { - "ip": "1.1.5", - "safe-buffer": "5.1.2" + "ip": "^1.1.0", + "safe-buffer": "^5.0.1" } }, "dns-txt": { @@ -4540,7 +4541,7 @@ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { - "buffer-indexof": "1.1.1" + "buffer-indexof": "^1.0.0" } }, "doctrine": { @@ -4549,7 +4550,7 @@ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, "requires": { - "esutils": "2.0.3" + "esutils": "^2.0.2" } }, "dom-converter": { @@ -4558,7 +4559,7 @@ "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", "dev": true, "requires": { - "utila": "0.4.0" + "utila": "~0.4" } }, "dom-serializer": { @@ -4567,8 +4568,8 @@ "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", "dev": true, "requires": { - "domelementtype": "2.0.2", - "entities": "2.0.3" + "domelementtype": "^2.0.1", + "entities": "^2.0.0" }, "dependencies": { "domelementtype": { @@ -4597,7 +4598,7 @@ "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, "requires": { - "domelementtype": "1.3.1" + "domelementtype": "1" } }, "domutils": { @@ -4606,8 +4607,8 @@ "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", "dev": true, "requires": { - "dom-serializer": "0.2.2", - "domelementtype": "1.3.1" + "dom-serializer": "0", + "domelementtype": "1" } }, "dot-case": { @@ -4616,8 +4617,8 @@ "integrity": "sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==", "dev": true, "requires": { - "no-case": "3.0.3", - "tslib": "1.13.0" + "no-case": "^3.0.3", + "tslib": "^1.10.0" }, "dependencies": { "lower-case": { @@ -4626,7 +4627,7 @@ "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==", "dev": true, "requires": { - "tslib": "1.13.0" + "tslib": "^1.10.0" } }, "no-case": { @@ -4635,8 +4636,8 @@ "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==", "dev": true, "requires": { - "lower-case": "2.0.1", - "tslib": "1.13.0" + "lower-case": "^2.0.1", + "tslib": "^1.10.0" } }, "tslib": { @@ -4653,7 +4654,7 @@ "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", "dev": true, "requires": { - "is-obj": "2.0.0" + "is-obj": "^2.0.0" } }, "duplexer": { @@ -4674,10 +4675,10 @@ "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "inherits": "2.0.4", - "readable-stream": "2.3.7", - "stream-shift": "1.0.1" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" }, "dependencies": { "readable-stream": { @@ -4686,13 +4687,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -4703,8 +4704,8 @@ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "dev": true, "requires": { - "jsbn": "0.1.1", - "safer-buffer": "2.1.2" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, "ee-first": { @@ -4725,8 +4726,8 @@ "integrity": "sha512-TpKfJcz4LXl5jiGvZTs5fbEx+wUFXV5u8voeG5WCHWfY/cdgdD8lDZIZRqLVOtR3VO+drgJ9aiSHIO9TYn/fKg==", "dev": true, "requires": { - "debug": "4.2.0", - "fs-extra": "8.1.0" + "debug": "^4.1.1", + "fs-extra": "^8.0.1" }, "dependencies": { "debug": { @@ -4744,9 +4745,9 @@ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "ms": { @@ -4763,12 +4764,12 @@ "integrity": "sha512-wUJPmZJQCs1zgdlQgeIpRcvrf7M5/COQaOV68Va1J/SgmWx5KL2otgg+fAae7luw6qz9R8Gvu/Qpe9tAOu/3xQ==", "dev": true, "requires": { - "bluebird": "3.7.2", - "compare-version": "0.1.2", - "debug": "2.6.9", - "isbinaryfile": "3.0.3", - "minimist": "1.2.5", - "plist": "3.0.1" + "bluebird": "^3.5.0", + "compare-version": "^0.1.2", + "debug": "^2.6.8", + "isbinaryfile": "^3.0.2", + "minimist": "^1.2.0", + "plist": "^3.0.1" }, "dependencies": { "debug": { @@ -4786,7 +4787,7 @@ "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", "dev": true, "requires": { - "buffer-alloc": "1.2.0" + "buffer-alloc": "^1.2.0" } } } @@ -4820,13 +4821,13 @@ "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", "dev": true, "requires": { - "bn.js": "4.11.9", - "brorand": "1.1.0", - "hash.js": "1.1.7", - "hmac-drbg": "1.0.1", - "inherits": "2.0.4", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" }, "dependencies": { "bn.js": { @@ -4861,7 +4862,7 @@ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "dev": true, "requires": { - "once": "1.4.0" + "once": "^1.4.0" } }, "enhanced-resolve": { @@ -4870,9 +4871,9 @@ "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "memory-fs": "0.5.0", - "tapable": "1.1.3" + "graceful-fs": "^4.1.2", + "memory-fs": "^0.5.0", + "tapable": "^1.0.0" } }, "entities": { @@ -4893,7 +4894,7 @@ "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", "dev": true, "requires": { - "prr": "1.0.1" + "prr": "~1.0.1" } }, "error-ex": { @@ -4902,7 +4903,7 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "error-stack-parser": { @@ -4911,7 +4912,7 @@ "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==", "dev": true, "requires": { - "stackframe": "1.2.0" + "stackframe": "^1.1.1" } }, "es-abstract": { @@ -4920,18 +4921,18 @@ "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", "dev": true, "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-negative-zero": "2.0.0", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } }, "es-to-primitive": { @@ -4940,9 +4941,9 @@ "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "requires": { - "is-callable": "1.2.2", - "is-date-object": "1.0.2", - "is-symbol": "1.0.3" + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" } }, "es6-error": { @@ -4976,43 +4977,43 @@ "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==", "dev": true, "requires": { - "@babel/code-frame": "7.10.4", - "ajv": "6.12.5", - "chalk": "2.4.2", - "cross-spawn": "6.0.5", - "debug": "4.2.0", - "doctrine": "3.0.0", - "eslint-scope": "5.1.1", - "eslint-utils": "1.4.3", - "eslint-visitor-keys": "1.3.0", - "espree": "6.2.1", - "esquery": "1.3.1", - "esutils": "2.0.3", - "file-entry-cache": "5.0.1", - "functional-red-black-tree": "1.0.1", - "glob-parent": "5.1.1", - "globals": "12.4.0", - "ignore": "4.0.6", - "import-fresh": "3.2.1", - "imurmurhash": "0.1.4", - "inquirer": "7.3.3", - "is-glob": "4.0.1", - "js-yaml": "3.14.0", - "json-stable-stringify-without-jsonify": "1.0.1", - "levn": "0.3.0", - "lodash": "4.17.20", - "minimatch": "3.0.4", - "mkdirp": "0.5.5", - "natural-compare": "1.4.0", - "optionator": "0.8.3", - "progress": "2.0.3", - "regexpp": "2.0.1", - "semver": "6.3.0", - "strip-ansi": "5.2.0", - "strip-json-comments": "3.1.1", - "table": "5.4.6", - "text-table": "0.2.0", - "v8-compile-cache": "2.1.1" + "@babel/code-frame": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^1.4.3", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.1.2", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.0.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^7.0.0", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.14", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.3", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^6.1.2", + "strip-ansi": "^5.2.0", + "strip-json-comments": "^3.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" }, "dependencies": { "ansi-regex": { @@ -5027,9 +5028,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "cross-spawn": { @@ -5038,11 +5039,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.7.1", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" }, "dependencies": { "semver": { @@ -5068,8 +5069,8 @@ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "esrecurse": "4.3.0", - "estraverse": "4.3.0" + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" } }, "eslint-utils": { @@ -5078,7 +5079,7 @@ "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", "dev": true, "requires": { - "eslint-visitor-keys": "1.3.0" + "eslint-visitor-keys": "^1.1.0" } }, "globals": { @@ -5087,7 +5088,7 @@ "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", "dev": true, "requires": { - "type-fest": "0.8.1" + "type-fest": "^0.8.1" } }, "ignore": { @@ -5142,7 +5143,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -5157,7 +5158,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.1.0" + "ansi-regex": "^4.1.0" } }, "strip-json-comments": { @@ -5178,7 +5179,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } } } @@ -5189,7 +5190,7 @@ "integrity": "sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw==", "dev": true, "requires": { - "get-stdin": "6.0.0" + "get-stdin": "^6.0.0" }, "dependencies": { "get-stdin": { @@ -5206,11 +5207,11 @@ "integrity": "sha512-I496aBd+Hi23Y0Cx+sKvw+VwlJre4ScIRlkrvTO6Scq68X/UXbN6F3lAhN8b0Zv8atAyprkyrA42K5QBJtCyaw==", "dev": true, "requires": { - "fs-extra": "8.1.0", - "loader-fs-cache": "1.0.3", - "loader-utils": "1.4.0", - "object-hash": "2.0.3", - "schema-utils": "2.7.1" + "fs-extra": "^8.1.0", + "loader-fs-cache": "^1.0.3", + "loader-utils": "^1.2.3", + "object-hash": "^2.0.3", + "schema-utils": "^2.6.5" }, "dependencies": { "fs-extra": { @@ -5219,9 +5220,9 @@ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } } } @@ -5232,9 +5233,9 @@ "integrity": "sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==", "dev": true, "requires": { - "natural-compare": "1.4.0", - "semver": "5.7.1", - "vue-eslint-parser": "7.1.0" + "natural-compare": "^1.4.0", + "semver": "^5.6.0", + "vue-eslint-parser": "^7.0.0" }, "dependencies": { "semver": { @@ -5251,8 +5252,8 @@ "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", "dev": true, "requires": { - "esrecurse": "4.3.0", - "estraverse": "4.3.0" + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "eslint-utils": { @@ -5261,7 +5262,7 @@ "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, "requires": { - "eslint-visitor-keys": "1.3.0" + "eslint-visitor-keys": "^1.1.0" } }, "eslint-visitor-keys": { @@ -5276,9 +5277,9 @@ "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", "dev": true, "requires": { - "acorn": "7.4.0", - "acorn-jsx": "5.3.1", - "eslint-visitor-keys": "1.3.0" + "acorn": "^7.1.1", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.1.0" }, "dependencies": { "acorn": { @@ -5301,7 +5302,7 @@ "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", "dev": true, "requires": { - "estraverse": "5.2.0" + "estraverse": "^5.1.0" }, "dependencies": { "estraverse": { @@ -5318,7 +5319,7 @@ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, "requires": { - "estraverse": "5.2.0" + "estraverse": "^5.2.0" }, "dependencies": { "estraverse": { @@ -5365,7 +5366,7 @@ "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", "dev": true, "requires": { - "original": "1.0.2" + "original": "^1.0.0" } }, "evp_bytestokey": { @@ -5374,8 +5375,8 @@ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", "dev": true, "requires": { - "md5.js": "1.3.5", - "safe-buffer": "5.1.2" + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" } }, "execa": { @@ -5384,13 +5385,13 @@ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "6.0.5", - "get-stream": "4.1.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.3", - "strip-eof": "1.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "dependencies": { "cross-spawn": { @@ -5399,11 +5400,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.7.1", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "path-key": { @@ -5424,7 +5425,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -5439,7 +5440,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } } } @@ -5450,13 +5451,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "debug": { @@ -5474,7 +5475,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -5483,7 +5484,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -5494,36 +5495,36 @@ "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.7", "array-flatten": "1.1.1", "body-parser": "1.19.0", "content-disposition": "0.5.3", - "content-type": "1.0.4", + "content-type": "~1.0.4", "cookie": "0.4.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "1.1.2", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", - "finalhandler": "1.1.2", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", "fresh": "0.5.2", "merge-descriptors": "1.0.1", - "methods": "1.1.2", - "on-finished": "2.3.0", - "parseurl": "1.3.3", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "2.0.6", + "proxy-addr": "~2.0.5", "qs": "6.7.0", - "range-parser": "1.2.1", + "range-parser": "~1.2.1", "safe-buffer": "5.1.2", "send": "0.17.1", "serve-static": "1.14.1", "setprototypeof": "1.1.1", - "statuses": "1.5.0", - "type-is": "1.6.18", + "statuses": "~1.5.0", + "type-is": "~1.6.18", "utils-merge": "1.0.1", - "vary": "1.1.2" + "vary": "~1.1.2" }, "dependencies": { "debug": { @@ -5549,8 +5550,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -5559,7 +5560,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -5570,9 +5571,9 @@ "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, "requires": { - "chardet": "0.7.0", - "iconv-lite": "0.4.24", - "tmp": "0.0.33" + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" } }, "extglob": { @@ -5581,14 +5582,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -5597,7 +5598,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -5606,7 +5607,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -5615,7 +5616,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -5624,7 +5625,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -5633,9 +5634,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.3" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -5658,12 +5659,12 @@ "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", "dev": true, "requires": { - "@nodelib/fs.stat": "2.0.3", - "@nodelib/fs.walk": "1.2.4", - "glob-parent": "5.1.1", - "merge2": "1.4.1", - "micromatch": "4.0.2", - "picomatch": "2.2.2" + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" } }, "fast-json-stable-stringify": { @@ -5684,7 +5685,7 @@ "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", "dev": true, "requires": { - "reusify": "1.0.4" + "reusify": "^1.0.4" } }, "faye-websocket": { @@ -5693,7 +5694,7 @@ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { - "websocket-driver": "0.6.5" + "websocket-driver": ">=0.5.1" } }, "figgy-pudding": { @@ -5708,7 +5709,7 @@ "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.5" } }, "file-entry-cache": { @@ -5717,7 +5718,7 @@ "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", "dev": true, "requires": { - "flat-cache": "2.0.1" + "flat-cache": "^2.0.1" } }, "file-loader": { @@ -5726,8 +5727,8 @@ "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==", "dev": true, "requires": { - "loader-utils": "2.0.0", - "schema-utils": "2.7.1" + "loader-utils": "^2.0.0", + "schema-utils": "^2.6.5" }, "dependencies": { "loader-utils": { @@ -5736,9 +5737,9 @@ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { - "big.js": "5.2.2", - "emojis-list": "3.0.0", - "json5": "2.1.3" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" } } } @@ -5755,7 +5756,7 @@ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, "requires": { - "to-regex-range": "5.0.1" + "to-regex-range": "^5.0.1" } }, "finalhandler": { @@ -5765,12 +5766,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.3", - "statuses": "1.5.0", - "unpipe": "1.0.0" + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" }, "dependencies": { "debug": { @@ -5790,8 +5791,8 @@ "integrity": "sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==", "dev": true, "requires": { - "json5": "0.5.1", - "path-exists": "3.0.0" + "json5": "^0.5.1", + "path-exists": "^3.0.0" }, "dependencies": { "json5": { @@ -5808,9 +5809,9 @@ "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "2.1.0", - "pkg-dir": "3.0.0" + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" } }, "find-up": { @@ -5819,7 +5820,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "findup": { @@ -5828,8 +5829,8 @@ "integrity": "sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs=", "dev": true, "requires": { - "colors": "0.6.2", - "commander": "2.1.0" + "colors": "~0.6.0-1", + "commander": "~2.1.0" }, "dependencies": { "commander": { @@ -5846,7 +5847,7 @@ "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", "dev": true, "requires": { - "flatted": "2.0.2", + "flatted": "^2.0.0", "rimraf": "2.6.3", "write": "1.0.3" }, @@ -5857,7 +5858,7 @@ "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } } } @@ -5874,8 +5875,8 @@ "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "dev": true, "requires": { - "inherits": "2.0.4", - "readable-stream": "2.3.7" + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" }, "dependencies": { "readable-stream": { @@ -5884,13 +5885,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -5900,7 +5901,7 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", "requires": { - "debug": "3.1.0" + "debug": "=3.1.0" } }, "for-in": { @@ -5921,13 +5922,13 @@ "integrity": "sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==", "dev": true, "requires": { - "@babel/code-frame": "7.10.4", - "chalk": "2.4.2", - "micromatch": "3.1.10", - "minimatch": "3.0.4", - "semver": "5.7.1", - "tapable": "1.1.3", - "worker-rpc": "0.1.1" + "@babel/code-frame": "^7.5.5", + "chalk": "^2.4.1", + "micromatch": "^3.1.10", + "minimatch": "^3.0.4", + "semver": "^5.6.0", + "tapable": "^1.0.0", + "worker-rpc": "^0.1.0" }, "dependencies": { "braces": { @@ -5936,16 +5937,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -5954,7 +5955,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -5965,9 +5966,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "fill-range": { @@ -5976,10 +5977,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -5988,7 +5989,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -6005,7 +6006,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6014,7 +6015,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6025,19 +6026,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.3", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "semver": { @@ -6052,8 +6053,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } } } @@ -6064,9 +6065,9 @@ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "dev": true, "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.8", - "mime-types": "2.1.27" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" } }, "forwarded": { @@ -6081,7 +6082,7 @@ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "fresh": { @@ -6096,9 +6097,9 @@ "integrity": "sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw==", "dev": true, "requires": { - "chalk": "1.1.3", - "error-stack-parser": "2.0.6", - "string-width": "2.1.1" + "chalk": "^1.1.3", + "error-stack-parser": "^2.0.0", + "string-width": "^2.0.0" }, "dependencies": { "ansi-styles": { @@ -6113,11 +6114,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "strip-ansi": { @@ -6126,7 +6127,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "supports-color": { @@ -6143,8 +6144,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "2.0.4", - "readable-stream": "2.3.7" + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" }, "dependencies": { "readable-stream": { @@ -6153,13 +6154,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -6176,10 +6177,10 @@ "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", "dev": true, "requires": { - "at-least-node": "1.0.0", - "graceful-fs": "4.2.4", - "jsonfile": "6.0.1", - "universalify": "1.0.0" + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" }, "dependencies": { "jsonfile": { @@ -6188,8 +6189,8 @@ "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "universalify": "1.0.0" + "graceful-fs": "^4.1.6", + "universalify": "^1.0.0" } }, "universalify": { @@ -6206,7 +6207,7 @@ "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dev": true, "requires": { - "minipass": "3.1.3" + "minipass": "^3.0.0" } }, "fs-write-stream-atomic": { @@ -6215,10 +6216,10 @@ "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "iferr": "0.1.5", - "imurmurhash": "0.1.4", - "readable-stream": "2.3.7" + "graceful-fs": "^4.1.2", + "iferr": "^0.1.5", + "imurmurhash": "^0.1.4", + "readable-stream": "1 || 2" }, "dependencies": { "readable-stream": { @@ -6227,13 +6228,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -6257,10 +6258,10 @@ "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "inherits": "2.0.4", - "mkdirp": "0.5.5", - "rimraf": "2.7.1" + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" }, "dependencies": { "rimraf": { @@ -6269,7 +6270,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } } } @@ -6292,14 +6293,14 @@ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.3", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.3" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" }, "dependencies": { "is-fullwidth-code-point": { @@ -6308,7 +6309,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "string-width": { @@ -6317,9 +6318,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "strip-ansi": { @@ -6328,7 +6329,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } } } @@ -6339,7 +6340,7 @@ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { - "globule": "1.3.2" + "globule": "^1.0.0" } }, "gensync": { @@ -6366,7 +6367,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "3.0.0" + "pump": "^3.0.0" } }, "get-value": { @@ -6381,7 +6382,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "glob": { @@ -6390,12 +6391,12 @@ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.4", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-parent": { @@ -6404,7 +6405,7 @@ "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "dev": true, "requires": { - "is-glob": "4.0.1" + "is-glob": "^4.0.1" } }, "global-agent": { @@ -6414,13 +6415,13 @@ "dev": true, "optional": true, "requires": { - "boolean": "3.0.1", - "core-js": "3.6.5", - "es6-error": "4.1.1", - "matcher": "3.0.0", - "roarr": "2.15.4", - "semver": "7.3.2", - "serialize-error": "7.0.1" + "boolean": "^3.0.1", + "core-js": "^3.6.5", + "es6-error": "^4.1.1", + "matcher": "^3.0.0", + "roarr": "^2.15.3", + "semver": "^7.3.2", + "serialize-error": "^7.0.1" } }, "global-tunnel-ng": { @@ -6430,10 +6431,10 @@ "dev": true, "optional": true, "requires": { - "encodeurl": "1.0.2", - "lodash": "4.17.20", - "npm-conf": "1.1.3", - "tunnel": "0.0.6" + "encodeurl": "^1.0.2", + "lodash": "^4.17.10", + "npm-conf": "^1.1.3", + "tunnel": "^0.0.6" } }, "globals": { @@ -6449,7 +6450,7 @@ "dev": true, "optional": true, "requires": { - "define-properties": "1.1.3" + "define-properties": "^1.1.3" } }, "globby": { @@ -6458,12 +6459,12 @@ "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==", "dev": true, "requires": { - "array-union": "2.1.0", - "dir-glob": "3.0.1", - "fast-glob": "3.2.4", - "ignore": "5.1.8", - "merge2": "1.4.1", - "slash": "3.0.0" + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" } }, "globule": { @@ -6472,9 +6473,9 @@ "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==", "dev": true, "requires": { - "glob": "7.1.6", - "lodash": "4.17.20", - "minimatch": "3.0.4" + "glob": "~7.1.1", + "lodash": "~4.17.10", + "minimatch": "~3.0.2" } }, "got": { @@ -6483,17 +6484,17 @@ "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", "dev": true, "requires": { - "@sindresorhus/is": "0.14.0", - "@szmarczak/http-timer": "1.1.2", - "cacheable-request": "6.1.0", - "decompress-response": "3.3.0", - "duplexer3": "0.1.4", - "get-stream": "4.1.0", - "lowercase-keys": "1.0.1", - "mimic-response": "1.0.1", - "p-cancelable": "1.1.0", - "to-readable-stream": "1.0.0", - "url-parse-lax": "3.0.0" + "@sindresorhus/is": "^0.14.0", + "@szmarczak/http-timer": "^1.1.2", + "cacheable-request": "^6.0.0", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^4.1.0", + "lowercase-keys": "^1.0.1", + "mimic-response": "^1.0.1", + "p-cancelable": "^1.0.0", + "to-readable-stream": "^1.0.0", + "url-parse-lax": "^3.0.0" } }, "graceful-fs": { @@ -6508,8 +6509,8 @@ "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==", "dev": true, "requires": { - "duplexer": "0.1.2", - "pify": "4.0.1" + "duplexer": "^0.1.1", + "pify": "^4.0.1" } }, "handle-thing": { @@ -6530,8 +6531,8 @@ "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "dev": true, "requires": { - "ajv": "6.12.5", - "har-schema": "2.0.0" + "ajv": "^6.12.3", + "har-schema": "^2.0.0" } }, "has": { @@ -6540,7 +6541,7 @@ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dev": true, "requires": { - "function-bind": "1.1.1" + "function-bind": "^1.1.1" } }, "has-ansi": { @@ -6549,7 +6550,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-flag": { @@ -6576,9 +6577,9 @@ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { @@ -6587,8 +6588,8 @@ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "is-buffer": { @@ -6603,7 +6604,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6612,7 +6613,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6623,7 +6624,7 @@ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6634,9 +6635,9 @@ "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", "dev": true, "requires": { - "inherits": "2.0.4", - "readable-stream": "3.6.0", - "safe-buffer": "5.2.1" + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" }, "dependencies": { "safe-buffer": { @@ -6659,8 +6660,8 @@ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", "dev": true, "requires": { - "inherits": "2.0.4", - "minimalistic-assert": "1.0.1" + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" } }, "he": { @@ -6681,9 +6682,9 @@ "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "1.1.7", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" } }, "hoopy": { @@ -6704,10 +6705,10 @@ "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, "requires": { - "inherits": "2.0.4", - "obuf": "1.1.2", - "readable-stream": "2.3.7", - "wbuf": "1.7.3" + "inherits": "^2.0.1", + "obuf": "^1.0.0", + "readable-stream": "^2.0.1", + "wbuf": "^1.1.0" }, "dependencies": { "readable-stream": { @@ -6716,13 +6717,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -6757,13 +6758,13 @@ "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", "dev": true, "requires": { - "camel-case": "3.0.0", - "clean-css": "4.2.3", - "commander": "2.20.3", - "he": "1.2.0", - "param-case": "2.1.1", - "relateurl": "0.2.7", - "uglify-js": "3.11.0" + "camel-case": "^3.0.0", + "clean-css": "^4.2.1", + "commander": "^2.19.0", + "he": "^1.2.0", + "param-case": "^2.1.1", + "relateurl": "^0.2.7", + "uglify-js": "^3.5.1" } }, "html-minifier-terser": { @@ -6772,13 +6773,13 @@ "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==", "dev": true, "requires": { - "camel-case": "4.1.1", - "clean-css": "4.2.3", - "commander": "4.1.1", - "he": "1.2.0", - "param-case": "3.0.3", - "relateurl": "0.2.7", - "terser": "4.8.0" + "camel-case": "^4.1.1", + "clean-css": "^4.2.3", + "commander": "^4.1.1", + "he": "^1.2.0", + "param-case": "^3.0.3", + "relateurl": "^0.2.7", + "terser": "^4.6.3" }, "dependencies": { "camel-case": { @@ -6787,8 +6788,8 @@ "integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==", "dev": true, "requires": { - "pascal-case": "3.1.1", - "tslib": "1.13.0" + "pascal-case": "^3.1.1", + "tslib": "^1.10.0" } }, "commander": { @@ -6803,8 +6804,8 @@ "integrity": "sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==", "dev": true, "requires": { - "dot-case": "3.0.3", - "tslib": "1.13.0" + "dot-case": "^3.0.3", + "tslib": "^1.10.0" } }, "tslib": { @@ -6821,14 +6822,14 @@ "integrity": "sha512-C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w==", "dev": true, "requires": { - "@types/html-minifier-terser": "5.1.1", - "@types/tapable": "1.0.6", - "@types/webpack": "4.41.17", - "html-minifier-terser": "5.1.1", - "loader-utils": "1.4.0", - "lodash": "4.17.20", - "pretty-error": "2.1.1", - "tapable": "1.1.3", + "@types/html-minifier-terser": "^5.0.0", + "@types/tapable": "^1.0.5", + "@types/webpack": "^4.41.8", + "html-minifier-terser": "^5.0.1", + "loader-utils": "^1.2.3", + "lodash": "^4.17.15", + "pretty-error": "^2.1.1", + "tapable": "^1.1.3", "util.promisify": "1.0.0" }, "dependencies": { @@ -6850,12 +6851,12 @@ "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", "dev": true, "requires": { - "domelementtype": "1.3.1", - "domhandler": "2.4.2", - "domutils": "1.7.0", - "entities": "1.1.2", - "inherits": "2.0.4", - "readable-stream": "3.6.0" + "domelementtype": "^1.3.1", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^3.1.1" }, "dependencies": { "entities": { @@ -6884,10 +6885,10 @@ "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", "dev": true, "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.1", - "statuses": "1.5.0", + "statuses": ">= 1.5.0 < 2", "toidentifier": "1.0.0" }, "dependencies": { @@ -6905,9 +6906,9 @@ "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { - "eventemitter3": "4.0.7", - "follow-redirects": "1.5.10", - "requires-port": "1.0.0" + "eventemitter3": "^4.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" } }, "http-proxy-middleware": { @@ -6916,10 +6917,10 @@ "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", "dev": true, "requires": { - "http-proxy": "1.18.1", - "is-glob": "4.0.1", - "lodash": "4.17.20", - "micromatch": "3.1.10" + "http-proxy": "^1.17.0", + "is-glob": "^4.0.0", + "lodash": "^4.17.11", + "micromatch": "^3.1.10" }, "dependencies": { "braces": { @@ -6928,16 +6929,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -6946,7 +6947,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -6957,10 +6958,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -6969,7 +6970,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -6986,7 +6987,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6995,7 +6996,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7006,19 +7007,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.3", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "to-regex-range": { @@ -7027,8 +7028,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } } } @@ -7039,9 +7040,9 @@ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.16.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "https-browserify": { @@ -7056,7 +7057,7 @@ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "icss-utils": { @@ -7065,7 +7066,7 @@ "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.14" } }, "ieee754": { @@ -7092,7 +7093,7 @@ "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", "dev": true, "requires": { - "import-from": "2.1.0" + "import-from": "^2.1.0" } }, "import-fresh": { @@ -7101,8 +7102,8 @@ "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", "dev": true, "requires": { - "caller-path": "2.0.0", - "resolve-from": "3.0.0" + "caller-path": "^2.0.0", + "resolve-from": "^3.0.0" } }, "import-from": { @@ -7111,7 +7112,7 @@ "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "import-local": { @@ -7120,8 +7121,8 @@ "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", "dev": true, "requires": { - "pkg-dir": "3.0.0", - "resolve-cwd": "2.0.0" + "pkg-dir": "^3.0.0", + "resolve-cwd": "^2.0.0" } }, "imurmurhash": { @@ -7160,8 +7161,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -7183,19 +7184,19 @@ "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", "dev": true, "requires": { - "ansi-escapes": "4.3.1", - "chalk": "4.1.0", - "cli-cursor": "3.1.0", - "cli-width": "3.0.0", - "external-editor": "3.1.0", - "figures": "3.2.0", - "lodash": "4.17.20", + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.19", "mute-stream": "0.0.8", - "run-async": "2.4.1", - "rxjs": "6.6.3", - "string-width": "4.2.0", - "strip-ansi": "6.0.0", - "through": "2.3.8" + "run-async": "^2.4.0", + "rxjs": "^6.6.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" }, "dependencies": { "is-fullwidth-code-point": { @@ -7210,9 +7211,9 @@ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "emoji-regex": "8.0.0", - "is-fullwidth-code-point": "3.0.0", - "strip-ansi": "6.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } } } @@ -7223,8 +7224,8 @@ "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==", "dev": true, "requires": { - "default-gateway": "4.2.0", - "ipaddr.js": "1.9.1" + "default-gateway": "^4.2.0", + "ipaddr.js": "^1.9.0" } }, "invariant": { @@ -7233,7 +7234,7 @@ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { - "loose-envify": "1.4.0" + "loose-envify": "^1.0.0" } }, "ip": { @@ -7266,7 +7267,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "is-buffer": { @@ -7281,7 +7282,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7304,7 +7305,7 @@ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, "requires": { - "binary-extensions": "2.1.0" + "binary-extensions": "^2.0.0" } }, "is-buffer": { @@ -7324,12 +7325,12 @@ "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=", "dev": true, "requires": { - "css-color-names": "0.0.4", - "hex-color-regex": "1.1.0", - "hsl-regex": "1.0.0", - "hsla-regex": "1.0.0", - "rgb-regex": "1.0.1", - "rgba-regex": "1.0.0" + "css-color-names": "^0.0.4", + "hex-color-regex": "^1.1.0", + "hsl-regex": "^1.0.0", + "hsla-regex": "^1.0.0", + "rgb-regex": "^1.0.1", + "rgba-regex": "^1.0.0" } }, "is-data-descriptor": { @@ -7338,7 +7339,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "is-buffer": { @@ -7353,7 +7354,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7370,9 +7371,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { @@ -7425,7 +7426,7 @@ "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.1" } }, "is-negative-zero": { @@ -7458,7 +7459,7 @@ "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", "dev": true, "requires": { - "is-path-inside": "2.1.0" + "is-path-inside": "^2.1.0" } }, "is-path-inside": { @@ -7467,7 +7468,7 @@ "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.2" } }, "is-plain-obj": { @@ -7482,7 +7483,7 @@ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "is-regex": { @@ -7491,7 +7492,7 @@ "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", "dev": true, "requires": { - "has-symbols": "1.0.1" + "has-symbols": "^1.0.1" } }, "is-resolvable": { @@ -7512,7 +7513,7 @@ "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==", "dev": true, "requires": { - "html-comment-regex": "1.1.2" + "html-comment-regex": "^1.1.0" } }, "is-symbol": { @@ -7521,7 +7522,7 @@ "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", "dev": true, "requires": { - "has-symbols": "1.0.1" + "has-symbols": "^1.0.1" } }, "is-typedarray": { @@ -7548,7 +7549,7 @@ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, "requires": { - "is-docker": "2.1.1" + "is-docker": "^2.0.0" } }, "isarray": { @@ -7593,9 +7594,9 @@ "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==", "dev": true, "requires": { - "@types/node": "10.17.35", - "merge-stream": "2.0.0", - "supports-color": "7.2.0" + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^7.0.0" }, "dependencies": { "has-flag": { @@ -7610,7 +7611,7 @@ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { - "has-flag": "4.0.0" + "has-flag": "^4.0.0" } } } @@ -7633,8 +7634,8 @@ "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", "dev": true, "requires": { - "argparse": "1.0.10", - "esprima": "4.0.1" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "jsbn": { @@ -7697,7 +7698,7 @@ "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "dev": true, "requires": { - "minimist": "1.2.5" + "minimist": "^1.2.5" } }, "jsonfile": { @@ -7706,7 +7707,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "4.2.4" + "graceful-fs": "^4.1.6" } }, "jsprim": { @@ -7748,8 +7749,8 @@ "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==", "dev": true, "requires": { - "lodash": "4.17.20", - "webpack-sources": "1.4.3" + "lodash": "^4.17.5", + "webpack-sources": "^1.1.0" } }, "launch-editor": { @@ -7758,8 +7759,8 @@ "integrity": "sha512-On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw==", "dev": true, "requires": { - "chalk": "2.4.2", - "shell-quote": "1.7.2" + "chalk": "^2.3.0", + "shell-quote": "^1.6.1" }, "dependencies": { "chalk": { @@ -7768,9 +7769,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -7781,7 +7782,7 @@ "integrity": "sha512-s0UO2/gEGiCgei3/2UN3SMuUj1phjQN8lcpnvgLSz26fAzNWPQ6Nf/kF5IFClnfU2ehp6LrmKdMU/beveO+2jg==", "dev": true, "requires": { - "launch-editor": "2.2.1" + "launch-editor": "^2.2.1" } }, "lazystream": { @@ -7790,7 +7791,7 @@ "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", "dev": true, "requires": { - "readable-stream": "2.3.7" + "readable-stream": "^2.0.5" }, "dependencies": { "readable-stream": { @@ -7799,13 +7800,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -7822,7 +7823,7 @@ "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==", "dev": true, "requires": { - "leven": "3.1.0" + "leven": "^3.1.0" } }, "levn": { @@ -7831,8 +7832,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "load-json-file": { @@ -7841,11 +7842,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" }, "dependencies": { "parse-json": { @@ -7854,7 +7855,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.2" + "error-ex": "^1.2.0" } }, "pify": { @@ -7871,8 +7872,8 @@ "integrity": "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==", "dev": true, "requires": { - "find-cache-dir": "0.1.1", - "mkdirp": "0.5.5" + "find-cache-dir": "^0.1.1", + "mkdirp": "^0.5.1" }, "dependencies": { "find-cache-dir": { @@ -7881,9 +7882,9 @@ "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", "dev": true, "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.5", - "pkg-dir": "1.0.0" + "commondir": "^1.0.1", + "mkdirp": "^0.5.1", + "pkg-dir": "^1.0.0" } }, "find-up": { @@ -7892,8 +7893,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "path-exists": { @@ -7902,7 +7903,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "pkg-dir": { @@ -7911,7 +7912,7 @@ "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { - "find-up": "1.1.2" + "find-up": "^1.0.0" } } } @@ -7928,9 +7929,9 @@ "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", "dev": true, "requires": { - "big.js": "5.2.2", - "emojis-list": "3.0.0", - "json5": "1.0.1" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" }, "dependencies": { "json5": { @@ -7939,7 +7940,7 @@ "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "requires": { - "minimist": "1.2.5" + "minimist": "^1.2.0" } } } @@ -7950,8 +7951,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "lodash": { @@ -8014,8 +8015,8 @@ "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.templatesettings": "4.2.0" + "lodash._reinterpolate": "^3.0.0", + "lodash.templatesettings": "^4.0.0" } }, "lodash.templatesettings": { @@ -8024,7 +8025,7 @@ "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0" + "lodash._reinterpolate": "^3.0.0" } }, "lodash.throttle": { @@ -8051,10 +8052,10 @@ "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", "dev": true, "requires": { - "ansi-escapes": "4.3.1", - "cli-cursor": "3.1.0", - "slice-ansi": "4.0.0", - "wrap-ansi": "6.2.0" + "ansi-escapes": "^4.3.0", + "cli-cursor": "^3.1.0", + "slice-ansi": "^4.0.0", + "wrap-ansi": "^6.2.0" } }, "loglevel": { @@ -8069,7 +8070,7 @@ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "dev": true, "requires": { - "js-tokens": "4.0.0" + "js-tokens": "^3.0.0 || ^4.0.0" } }, "loud-rejection": { @@ -8078,8 +8079,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.3" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "lower-case": { @@ -8100,7 +8101,7 @@ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { - "yallist": "4.0.0" + "yallist": "^4.0.0" } }, "make-dir": { @@ -8109,8 +8110,8 @@ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, "requires": { - "pify": "4.0.1", - "semver": "5.7.1" + "pify": "^4.0.1", + "semver": "^5.6.0" }, "dependencies": { "semver": { @@ -8139,7 +8140,7 @@ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "matcher": { @@ -8149,7 +8150,7 @@ "dev": true, "optional": true, "requires": { - "escape-string-regexp": "4.0.0" + "escape-string-regexp": "^4.0.0" }, "dependencies": { "escape-string-regexp": { @@ -8167,9 +8168,9 @@ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", "dev": true, "requires": { - "hash-base": "3.1.0", - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "mdn-data": { @@ -8190,8 +8191,8 @@ "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", "dev": true, "requires": { - "errno": "0.1.7", - "readable-stream": "2.3.7" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" }, "dependencies": { "readable-stream": { @@ -8200,13 +8201,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -8217,16 +8218,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.5", - "normalize-package-data": "2.5.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" } }, "merge-descriptors": { @@ -8241,7 +8242,7 @@ "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "^0.6.1" }, "dependencies": { "source-map": { @@ -8282,8 +8283,8 @@ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", "dev": true, "requires": { - "braces": "3.0.2", - "picomatch": "2.2.2" + "braces": "^3.0.1", + "picomatch": "^2.0.5" } }, "miller-rabin": { @@ -8292,8 +8293,8 @@ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", "dev": true, "requires": { - "bn.js": "4.11.9", - "brorand": "1.1.0" + "bn.js": "^4.0.0", + "brorand": "^1.0.1" }, "dependencies": { "bn.js": { @@ -8343,10 +8344,10 @@ "integrity": "sha512-QgKgJBjaJhxVPwrLNqqwNS0AGkuQQ31Hp4xGXEK/P7wehEg6qmNtReHKai3zRXqY60wGVWLYcOMJK2b98aGc3A==", "dev": true, "requires": { - "loader-utils": "1.4.0", + "loader-utils": "^1.1.0", "normalize-url": "1.9.1", - "schema-utils": "1.0.0", - "webpack-sources": "1.4.3" + "schema-utils": "^1.0.0", + "webpack-sources": "^1.1.0" }, "dependencies": { "normalize-url": { @@ -8398,7 +8399,7 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -8413,7 +8414,7 @@ "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==", "dev": true, "requires": { - "yallist": "4.0.0" + "yallist": "^4.0.0" } }, "minipass-collect": { @@ -8422,7 +8423,7 @@ "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", "dev": true, "requires": { - "minipass": "3.1.3" + "minipass": "^3.0.0" } }, "minipass-flush": { @@ -8431,7 +8432,7 @@ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", "dev": true, "requires": { - "minipass": "3.1.3" + "minipass": "^3.0.0" } }, "minipass-pipeline": { @@ -8440,7 +8441,7 @@ "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", "dev": true, "requires": { - "minipass": "3.1.3" + "minipass": "^3.0.0" } }, "minizlib": { @@ -8449,8 +8450,8 @@ "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "dev": true, "requires": { - "minipass": "3.1.3", - "yallist": "4.0.0" + "minipass": "^3.0.0", + "yallist": "^4.0.0" } }, "mississippi": { @@ -8459,16 +8460,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.7.1", - "end-of-stream": "1.4.4", - "flush-write-stream": "1.1.1", - "from2": "2.3.0", - "parallel-transform": "1.2.0", - "pump": "3.0.0", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.5" + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" } }, "mixin-deep": { @@ -8477,8 +8478,8 @@ "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -8487,7 +8488,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -8498,7 +8499,7 @@ "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, "requires": { - "minimist": "1.2.5" + "minimist": "^1.2.5" } }, "moment": { @@ -8513,12 +8514,12 @@ "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "dev": true, "requires": { - "aproba": "1.2.0", - "copy-concurrently": "1.0.5", - "fs-write-stream-atomic": "1.0.10", - "mkdirp": "0.5.5", - "rimraf": "2.7.1", - "run-queue": "1.0.3" + "aproba": "^1.1.1", + "copy-concurrently": "^1.0.0", + "fs-write-stream-atomic": "^1.0.8", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.3" }, "dependencies": { "rimraf": { @@ -8527,7 +8528,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } } } @@ -8543,8 +8544,8 @@ "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", "dev": true, "requires": { - "dns-packet": "1.3.1", - "thunky": "1.1.0" + "dns-packet": "^1.3.1", + "thunky": "^1.0.2" } }, "multicast-dns-service-types": { @@ -8571,17 +8572,17 @@ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-windows": "1.0.2", - "kind-of": "6.0.3", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" } }, "natural-compare": { @@ -8614,7 +8615,7 @@ "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", "dev": true, "requires": { - "lower-case": "1.1.4" + "lower-case": "^1.1.1" } }, "node-forge": { @@ -8629,18 +8630,18 @@ "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", "dev": true, "requires": { - "fstream": "1.0.12", - "glob": "7.1.6", - "graceful-fs": "4.2.4", - "mkdirp": "0.5.5", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.5", - "request": "2.88.2", - "rimraf": "2.7.1", - "semver": "5.3.0", - "tar": "2.2.2", - "which": "1.3.1" + "fstream": "^1.0.0", + "glob": "^7.0.3", + "graceful-fs": "^4.1.2", + "mkdirp": "^0.5.0", + "nopt": "2 || 3", + "npmlog": "0 || 1 || 2 || 3 || 4", + "osenv": "0", + "request": "^2.87.0", + "rimraf": "2", + "semver": "~5.3.0", + "tar": "^2.0.0", + "which": "1" }, "dependencies": { "rimraf": { @@ -8649,7 +8650,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } }, "semver": { @@ -8664,9 +8665,9 @@ "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", "dev": true, "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.12", - "inherits": "2.0.4" + "block-stream": "*", + "fstream": "^1.0.12", + "inherits": "2" } }, "which": { @@ -8675,7 +8676,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } } } @@ -8686,29 +8687,29 @@ "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", "dev": true, "requires": { - "assert": "1.5.0", - "browserify-zlib": "0.2.0", - "buffer": "4.9.2", - "console-browserify": "1.2.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "domain-browser": "1.2.0", - "events": "3.2.0", - "https-browserify": "1.0.0", - "os-browserify": "0.3.0", + "assert": "^1.1.1", + "browserify-zlib": "^0.2.0", + "buffer": "^4.3.0", + "console-browserify": "^1.1.0", + "constants-browserify": "^1.0.0", + "crypto-browserify": "^3.11.0", + "domain-browser": "^1.1.1", + "events": "^3.0.0", + "https-browserify": "^1.0.0", + "os-browserify": "^0.3.0", "path-browserify": "0.0.1", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.7", - "stream-browserify": "2.0.2", - "stream-http": "2.8.3", - "string_decoder": "1.1.1", - "timers-browserify": "2.0.11", + "process": "^0.11.10", + "punycode": "^1.2.4", + "querystring-es3": "^0.2.0", + "readable-stream": "^2.3.3", + "stream-browserify": "^2.0.1", + "stream-http": "^2.7.2", + "string_decoder": "^1.0.0", + "timers-browserify": "^2.0.4", "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.11.1", - "vm-browserify": "1.1.2" + "url": "^0.11.0", + "util": "^0.11.0", + "vm-browserify": "^1.0.1" }, "dependencies": { "buffer": { @@ -8717,9 +8718,9 @@ "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", "dev": true, "requires": { - "base64-js": "1.3.1", - "ieee754": "1.1.13", - "isarray": "1.0.0" + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" } }, "punycode": { @@ -8734,13 +8735,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -8751,8 +8752,8 @@ "integrity": "sha512-0So+BicZSQaY4sLqeutdkXWiTsmr+QrlGtm5dn4OPJBcnZRmjupFbWnZbDLec95KQTZHAwt8+vk+nEIXzPHxGw==", "dev": true, "requires": { - "loader-utils": "2.0.0", - "schema-utils": "2.7.1" + "loader-utils": "^2.0.0", + "schema-utils": "^2.7.0" }, "dependencies": { "loader-utils": { @@ -8761,9 +8762,9 @@ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { - "big.js": "5.2.2", - "emojis-list": "3.0.0", - "json5": "2.1.3" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" } } } @@ -8780,23 +8781,23 @@ "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", "dev": true, "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.3", - "get-stdin": "4.0.1", - "glob": "7.1.6", - "in-publish": "2.0.1", - "lodash": "4.17.20", - "meow": "3.7.0", - "mkdirp": "0.5.5", - "nan": "2.14.1", - "node-gyp": "3.8.0", - "npmlog": "4.1.2", - "request": "2.88.2", + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^3.0.0", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "in-publish": "^2.0.0", + "lodash": "^4.17.15", + "meow": "^3.7.0", + "mkdirp": "^0.5.1", + "nan": "^2.13.2", + "node-gyp": "^3.8.0", + "npmlog": "^4.0.0", + "request": "^2.88.0", "sass-graph": "2.2.5", - "stdout-stream": "1.4.1", - "true-case-path": "1.0.3" + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" }, "dependencies": { "ansi-styles": { @@ -8811,11 +8812,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "cross-spawn": { @@ -8824,8 +8825,8 @@ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { - "lru-cache": "4.1.5", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, "lru-cache": { @@ -8834,8 +8835,8 @@ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "strip-ansi": { @@ -8844,7 +8845,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "supports-color": { @@ -8859,7 +8860,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "yallist": { @@ -8876,7 +8877,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1.1.1" + "abbrev": "1" } }, "normalize-package-data": { @@ -8885,10 +8886,10 @@ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, "requires": { - "hosted-git-info": "2.8.8", - "resolve": "1.17.0", - "semver": "5.7.1", - "validate-npm-package-license": "3.0.4" + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" }, "dependencies": { "semver": { @@ -8924,8 +8925,8 @@ "dev": true, "optional": true, "requires": { - "config-chain": "1.1.12", - "pify": "3.0.0" + "config-chain": "^1.1.11", + "pify": "^3.0.0" }, "dependencies": { "pify": { @@ -8943,7 +8944,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" }, "dependencies": { "path-key": { @@ -8960,10 +8961,10 @@ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "requires": { - "are-we-there-yet": "1.1.5", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "nth-check": { @@ -8972,7 +8973,7 @@ "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", "dev": true, "requires": { - "boolbase": "1.0.0" + "boolbase": "~1.0.0" } }, "num2fraction": { @@ -9005,9 +9006,9 @@ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { @@ -9016,7 +9017,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "is-buffer": { @@ -9031,7 +9032,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -9054,8 +9055,8 @@ "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.18.0-next.1" + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1" } }, "object-keys": { @@ -9070,7 +9071,7 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" } }, "object.assign": { @@ -9079,10 +9080,10 @@ "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.18.0-next.1", - "has-symbols": "1.0.1", - "object-keys": "1.1.1" + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.0", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" } }, "object.getownpropertydescriptors": { @@ -9091,8 +9092,8 @@ "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.17.7" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" }, "dependencies": { "es-abstract": { @@ -9101,17 +9102,17 @@ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } } } @@ -9122,7 +9123,7 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "object.values": { @@ -9131,10 +9132,10 @@ "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.17.7", - "function-bind": "1.1.1", - "has": "1.0.3" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" }, "dependencies": { "es-abstract": { @@ -9143,17 +9144,17 @@ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } } } @@ -9185,7 +9186,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "onetime": { @@ -9194,7 +9195,7 @@ "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, "requires": { - "mimic-fn": "2.1.0" + "mimic-fn": "^2.1.0" } }, "open": { @@ -9203,8 +9204,8 @@ "integrity": "sha512-lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA==", "dev": true, "requires": { - "is-docker": "2.1.1", - "is-wsl": "2.2.0" + "is-docker": "^2.0.0", + "is-wsl": "^2.1.1" } }, "opener": { @@ -9219,7 +9220,7 @@ "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", "dev": true, "requires": { - "is-wsl": "1.1.0" + "is-wsl": "^1.1.0" }, "dependencies": { "is-wsl": { @@ -9236,8 +9237,8 @@ "integrity": "sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA==", "dev": true, "requires": { - "cssnano": "4.1.10", - "last-call-webpack-plugin": "3.0.0" + "cssnano": "^4.1.10", + "last-call-webpack-plugin": "^3.0.0" } }, "optionator": { @@ -9246,12 +9247,12 @@ "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", "dev": true, "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "word-wrap": "1.2.3" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" } }, "original": { @@ -9260,7 +9261,7 @@ "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", "dev": true, "requires": { - "url-parse": "1.4.7" + "url-parse": "^1.4.3" } }, "os-browserify": { @@ -9287,8 +9288,8 @@ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "ouch": { @@ -9298,9 +9299,9 @@ "dev": true, "requires": { "@positron/stack-trace": "1.0.0", - "ejs": "2.7.4", - "escape-html": "1.0.3", - "lodash": "4.17.20" + "ejs": "^2.3.1", + "escape-html": "^1.0.1", + "lodash": "^4.17.10" } }, "p-cancelable": { @@ -9321,7 +9322,7 @@ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -9330,7 +9331,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.3.0" + "p-limit": "^2.0.0" } }, "p-map": { @@ -9339,7 +9340,7 @@ "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, "requires": { - "aggregate-error": "3.1.0" + "aggregate-error": "^3.0.0" } }, "p-retry": { @@ -9348,7 +9349,7 @@ "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", "dev": true, "requires": { - "retry": "0.12.0" + "retry": "^0.12.0" } }, "p-try": { @@ -9369,9 +9370,9 @@ "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", "dev": true, "requires": { - "cyclist": "1.0.1", - "inherits": "2.0.4", - "readable-stream": "2.3.7" + "cyclist": "^1.0.1", + "inherits": "^2.0.3", + "readable-stream": "^2.1.5" }, "dependencies": { "readable-stream": { @@ -9380,13 +9381,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -9397,7 +9398,7 @@ "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", "dev": true, "requires": { - "no-case": "2.3.2" + "no-case": "^2.2.0" } }, "parent-module": { @@ -9406,7 +9407,7 @@ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, "requires": { - "callsites": "3.1.0" + "callsites": "^3.0.0" }, "dependencies": { "callsites": { @@ -9423,11 +9424,11 @@ "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", "dev": true, "requires": { - "asn1.js": "5.4.1", - "browserify-aes": "1.2.0", - "evp_bytestokey": "1.0.3", - "pbkdf2": "3.1.1", - "safe-buffer": "5.1.2" + "asn1.js": "^5.2.0", + "browserify-aes": "^1.0.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" } }, "parse-json": { @@ -9436,8 +9437,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "1.3.2", - "json-parse-better-errors": "1.0.2" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" } }, "parseurl": { @@ -9452,8 +9453,8 @@ "integrity": "sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==", "dev": true, "requires": { - "no-case": "3.0.3", - "tslib": "1.13.0" + "no-case": "^3.0.3", + "tslib": "^1.10.0" }, "dependencies": { "lower-case": { @@ -9462,7 +9463,7 @@ "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==", "dev": true, "requires": { - "tslib": "1.13.0" + "tslib": "^1.10.0" } }, "no-case": { @@ -9471,8 +9472,8 @@ "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==", "dev": true, "requires": { - "lower-case": "2.0.1", - "tslib": "1.13.0" + "lower-case": "^2.0.1", + "tslib": "^1.10.0" } }, "tslib": { @@ -9549,11 +9550,11 @@ "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==", "dev": true, "requires": { - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "performance-now": { @@ -9586,7 +9587,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { @@ -9595,7 +9596,7 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "3.0.0" + "find-up": "^3.0.0" } }, "pkg-up": { @@ -9604,7 +9605,7 @@ "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", "dev": true, "requires": { - "find-up": "3.0.0" + "find-up": "^3.0.0" } }, "plist": { @@ -9613,9 +9614,9 @@ "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==", "dev": true, "requires": { - "base64-js": "1.3.1", - "xmlbuilder": "9.0.7", - "xmldom": "0.1.31" + "base64-js": "^1.2.3", + "xmlbuilder": "^9.0.7", + "xmldom": "0.1.x" } }, "portfinder": { @@ -9624,9 +9625,9 @@ "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", "dev": true, "requires": { - "async": "2.6.3", - "debug": "3.2.6", - "mkdirp": "0.5.5" + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.5" }, "dependencies": { "async": { @@ -9635,7 +9636,7 @@ "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", "dev": true, "requires": { - "lodash": "4.17.20" + "lodash": "^4.17.14" } }, "debug": { @@ -9667,9 +9668,9 @@ "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", "dev": true, "requires": { - "chalk": "2.4.2", - "source-map": "0.6.1", - "supports-color": "6.1.0" + "chalk": "^2.4.2", + "source-map": "^0.6.1", + "supports-color": "^6.1.0" }, "dependencies": { "chalk": { @@ -9678,9 +9679,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" }, "dependencies": { "supports-color": { @@ -9689,7 +9690,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -9717,9 +9718,9 @@ "integrity": "sha512-0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw==", "dev": true, "requires": { - "postcss": "7.0.35", - "postcss-selector-parser": "6.0.4", - "postcss-value-parser": "4.1.0" + "postcss": "^7.0.27", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.0.2" } }, "postcss-colormin": { @@ -9728,11 +9729,11 @@ "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==", "dev": true, "requires": { - "browserslist": "4.14.5", - "color": "3.1.2", - "has": "1.0.3", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "browserslist": "^4.0.0", + "color": "^3.0.0", + "has": "^1.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9749,8 +9750,8 @@ "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==", "dev": true, "requires": { - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9767,7 +9768,7 @@ "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.0" } }, "postcss-discard-duplicates": { @@ -9776,7 +9777,7 @@ "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.0" } }, "postcss-discard-empty": { @@ -9785,7 +9786,7 @@ "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.0" } }, "postcss-discard-overridden": { @@ -9794,7 +9795,7 @@ "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.0" } }, "postcss-load-config": { @@ -9803,8 +9804,8 @@ "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==", "dev": true, "requires": { - "cosmiconfig": "5.2.1", - "import-cwd": "2.1.0" + "cosmiconfig": "^5.0.0", + "import-cwd": "^2.0.0" } }, "postcss-loader": { @@ -9813,10 +9814,10 @@ "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", "dev": true, "requires": { - "loader-utils": "1.4.0", - "postcss": "7.0.35", - "postcss-load-config": "2.1.2", - "schema-utils": "1.0.0" + "loader-utils": "^1.1.0", + "postcss": "^7.0.0", + "postcss-load-config": "^2.0.0", + "schema-utils": "^1.0.0" }, "dependencies": { "schema-utils": { @@ -9825,9 +9826,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "6.12.5", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.5.2" + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" } } } @@ -9839,9 +9840,9 @@ "dev": true, "requires": { "css-color-names": "0.0.4", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1", - "stylehacks": "4.0.3" + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0", + "stylehacks": "^4.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9858,12 +9859,12 @@ "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==", "dev": true, "requires": { - "browserslist": "4.14.5", - "caniuse-api": "3.0.0", - "cssnano-util-same-parent": "4.0.1", - "postcss": "7.0.35", - "postcss-selector-parser": "3.1.2", - "vendors": "1.0.4" + "browserslist": "^4.0.0", + "caniuse-api": "^3.0.0", + "cssnano-util-same-parent": "^4.0.0", + "postcss": "^7.0.0", + "postcss-selector-parser": "^3.0.0", + "vendors": "^1.0.0" }, "dependencies": { "postcss-selector-parser": { @@ -9872,9 +9873,9 @@ "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "5.2.0", - "indexes-of": "1.0.1", - "uniq": "1.0.1" + "dot-prop": "^5.2.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1" } } } @@ -9885,8 +9886,8 @@ "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==", "dev": true, "requires": { - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9903,10 +9904,10 @@ "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==", "dev": true, "requires": { - "cssnano-util-get-arguments": "4.0.0", - "is-color-stop": "1.1.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-arguments": "^4.0.0", + "is-color-stop": "^1.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9923,12 +9924,12 @@ "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==", "dev": true, "requires": { - "alphanum-sort": "1.0.2", - "browserslist": "4.14.5", - "cssnano-util-get-arguments": "4.0.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1", - "uniqs": "2.0.0" + "alphanum-sort": "^1.0.0", + "browserslist": "^4.0.0", + "cssnano-util-get-arguments": "^4.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0", + "uniqs": "^2.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9945,10 +9946,10 @@ "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==", "dev": true, "requires": { - "alphanum-sort": "1.0.2", - "has": "1.0.3", - "postcss": "7.0.35", - "postcss-selector-parser": "3.1.2" + "alphanum-sort": "^1.0.0", + "has": "^1.0.0", + "postcss": "^7.0.0", + "postcss-selector-parser": "^3.0.0" }, "dependencies": { "postcss-selector-parser": { @@ -9957,9 +9958,9 @@ "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "5.2.0", - "indexes-of": "1.0.1", - "uniq": "1.0.1" + "dot-prop": "^5.2.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1" } } } @@ -9970,7 +9971,7 @@ "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.5" } }, "postcss-modules-local-by-default": { @@ -9979,10 +9980,10 @@ "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==", "dev": true, "requires": { - "icss-utils": "4.1.1", - "postcss": "7.0.35", - "postcss-selector-parser": "6.0.4", - "postcss-value-parser": "4.1.0" + "icss-utils": "^4.1.1", + "postcss": "^7.0.32", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.1.0" } }, "postcss-modules-scope": { @@ -9991,8 +9992,8 @@ "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==", "dev": true, "requires": { - "postcss": "7.0.35", - "postcss-selector-parser": "6.0.4" + "postcss": "^7.0.6", + "postcss-selector-parser": "^6.0.0" } }, "postcss-modules-values": { @@ -10001,8 +10002,8 @@ "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==", "dev": true, "requires": { - "icss-utils": "4.1.1", - "postcss": "7.0.35" + "icss-utils": "^4.0.0", + "postcss": "^7.0.6" } }, "postcss-normalize-charset": { @@ -10011,7 +10012,7 @@ "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.0" } }, "postcss-normalize-display-values": { @@ -10020,9 +10021,9 @@ "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==", "dev": true, "requires": { - "cssnano-util-get-match": "4.0.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-match": "^4.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10039,10 +10040,10 @@ "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==", "dev": true, "requires": { - "cssnano-util-get-arguments": "4.0.0", - "has": "1.0.3", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-arguments": "^4.0.0", + "has": "^1.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10059,10 +10060,10 @@ "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==", "dev": true, "requires": { - "cssnano-util-get-arguments": "4.0.0", - "cssnano-util-get-match": "4.0.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-arguments": "^4.0.0", + "cssnano-util-get-match": "^4.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10079,9 +10080,9 @@ "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==", "dev": true, "requires": { - "has": "1.0.3", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "has": "^1.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10098,9 +10099,9 @@ "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==", "dev": true, "requires": { - "cssnano-util-get-match": "4.0.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-match": "^4.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10117,9 +10118,9 @@ "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==", "dev": true, "requires": { - "browserslist": "4.14.5", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "browserslist": "^4.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10136,10 +10137,10 @@ "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==", "dev": true, "requires": { - "is-absolute-url": "2.1.0", - "normalize-url": "3.3.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "is-absolute-url": "^2.0.0", + "normalize-url": "^3.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "normalize-url": { @@ -10162,8 +10163,8 @@ "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==", "dev": true, "requires": { - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10180,9 +10181,9 @@ "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==", "dev": true, "requires": { - "cssnano-util-get-arguments": "4.0.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-arguments": "^4.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10199,10 +10200,10 @@ "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==", "dev": true, "requires": { - "browserslist": "4.14.5", - "caniuse-api": "3.0.0", - "has": "1.0.3", - "postcss": "7.0.35" + "browserslist": "^4.0.0", + "caniuse-api": "^3.0.0", + "has": "^1.0.0", + "postcss": "^7.0.0" } }, "postcss-reduce-transforms": { @@ -10211,10 +10212,10 @@ "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==", "dev": true, "requires": { - "cssnano-util-get-match": "4.0.0", - "has": "1.0.3", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-match": "^4.0.0", + "has": "^1.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10240,7 +10241,7 @@ "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.26" } }, "postcss-selector-parser": { @@ -10249,10 +10250,10 @@ "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==", "dev": true, "requires": { - "cssesc": "3.0.0", - "indexes-of": "1.0.1", - "uniq": "1.0.1", - "util-deprecate": "1.0.2" + "cssesc": "^3.0.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1", + "util-deprecate": "^1.0.2" } }, "postcss-svgo": { @@ -10261,10 +10262,10 @@ "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==", "dev": true, "requires": { - "is-svg": "3.0.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1", - "svgo": "1.3.2" + "is-svg": "^3.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0", + "svgo": "^1.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10281,9 +10282,9 @@ "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==", "dev": true, "requires": { - "alphanum-sort": "1.0.2", - "postcss": "7.0.35", - "uniqs": "2.0.0" + "alphanum-sort": "^1.0.0", + "postcss": "^7.0.0", + "uniqs": "^2.0.0" } }, "postcss-value-parser": { @@ -10317,8 +10318,8 @@ "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", "dev": true, "requires": { - "renderkid": "2.0.3", - "utila": "0.4.0" + "renderkid": "^2.0.1", + "utila": "~0.4" } }, "process": { @@ -10358,7 +10359,7 @@ "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", "dev": true, "requires": { - "forwarded": "0.1.2", + "forwarded": "~0.1.2", "ipaddr.js": "1.9.1" } }, @@ -10386,12 +10387,12 @@ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", "dev": true, "requires": { - "bn.js": "4.11.9", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "parse-asn1": "5.1.6", - "randombytes": "2.1.0", - "safe-buffer": "5.1.2" + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" }, "dependencies": { "bn.js": { @@ -10408,8 +10409,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "pumpify": { @@ -10418,9 +10419,9 @@ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "dev": true, "requires": { - "duplexify": "3.7.1", - "inherits": "2.0.4", - "pump": "2.0.1" + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" }, "dependencies": { "pump": { @@ -10429,8 +10430,8 @@ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } } } @@ -10464,8 +10465,8 @@ "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", "dev": true, "requires": { - "object-assign": "4.1.1", - "strict-uri-encode": "1.1.0" + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" } }, "querystring": { @@ -10492,7 +10493,7 @@ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.1.0" } }, "randomfill": { @@ -10501,8 +10502,8 @@ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "dev": true, "requires": { - "randombytes": "2.1.0", - "safe-buffer": "5.1.2" + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" } }, "range-parser": { @@ -10529,9 +10530,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.5.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" }, "dependencies": { "path-type": { @@ -10540,9 +10541,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -10559,8 +10560,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" }, "dependencies": { "find-up": { @@ -10569,8 +10570,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "path-exists": { @@ -10579,7 +10580,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } } } @@ -10590,9 +10591,9 @@ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, "requires": { - "inherits": "2.0.4", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } }, "readdir-glob": { @@ -10601,7 +10602,7 @@ "integrity": "sha512-KgT0oXPIDQRRRYFf+06AUaodICTep2Q5635BORLzTEzp7rEqcR14a47j3Vzm3ix7FeI1lp8mYyG7r8lTB06Pyg==", "dev": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "readdirp": { @@ -10610,7 +10611,7 @@ "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", "dev": true, "requires": { - "picomatch": "2.2.2" + "picomatch": "^2.2.1" } }, "redent": { @@ -10619,8 +10620,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" }, "dependencies": { "indent-string": { @@ -10629,7 +10630,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } } } @@ -10646,7 +10647,7 @@ "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", "dev": true, "requires": { - "regenerate": "1.4.1" + "regenerate": "^1.4.0" } }, "regenerator-runtime": { @@ -10661,7 +10662,7 @@ "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", "dev": true, "requires": { - "@babel/runtime": "7.11.2" + "@babel/runtime": "^7.8.4" } }, "regex-not": { @@ -10670,8 +10671,8 @@ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "dev": true, "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, "regexp.prototype.flags": { @@ -10680,8 +10681,8 @@ "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.17.7" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" }, "dependencies": { "es-abstract": { @@ -10690,17 +10691,17 @@ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } } } @@ -10717,12 +10718,12 @@ "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==", "dev": true, "requires": { - "regenerate": "1.4.1", - "regenerate-unicode-properties": "8.2.0", - "regjsgen": "0.5.2", - "regjsparser": "0.6.4", - "unicode-match-property-ecmascript": "1.0.4", - "unicode-match-property-value-ecmascript": "1.2.0" + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.2.0", + "regjsgen": "^0.5.1", + "regjsparser": "^0.6.4", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.2.0" } }, "register-service-worker": { @@ -10743,7 +10744,7 @@ "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", "dev": true, "requires": { - "jsesc": "0.5.0" + "jsesc": "~0.5.0" }, "dependencies": { "jsesc": { @@ -10772,11 +10773,11 @@ "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==", "dev": true, "requires": { - "css-select": "1.2.0", - "dom-converter": "0.2.0", - "htmlparser2": "3.10.1", - "strip-ansi": "3.0.1", - "utila": "0.4.0" + "css-select": "^1.1.0", + "dom-converter": "^0.2", + "htmlparser2": "^3.3.0", + "strip-ansi": "^3.0.0", + "utila": "^0.4.0" }, "dependencies": { "css-select": { @@ -10785,10 +10786,10 @@ "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "dev": true, "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.3", + "boolbase": "~1.0.0", + "css-what": "2.1", "domutils": "1.5.1", - "nth-check": "1.0.2" + "nth-check": "~1.0.1" } }, "css-what": { @@ -10803,8 +10804,8 @@ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "dev": true, "requires": { - "dom-serializer": "0.2.2", - "domelementtype": "1.3.1" + "dom-serializer": "0", + "domelementtype": "1" } }, "strip-ansi": { @@ -10813,7 +10814,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } } } @@ -10836,7 +10837,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.1.0" + "is-finite": "^1.0.0" } }, "request": { @@ -10845,26 +10846,26 @@ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "dev": true, "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.10.1", - "caseless": "0.12.0", - "combined-stream": "1.0.8", - "extend": "3.0.2", - "forever-agent": "0.6.1", - "form-data": "2.3.3", - "har-validator": "5.1.5", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.27", - "oauth-sign": "0.9.0", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.5.0", - "tunnel-agent": "0.6.0", - "uuid": "3.4.0" + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" }, "dependencies": { "qs": { @@ -10905,7 +10906,7 @@ "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { - "path-parse": "1.0.6" + "path-parse": "^1.0.6" } }, "resolve-cwd": { @@ -10914,7 +10915,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "resolve-from": { @@ -10935,7 +10936,7 @@ "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", "dev": true, "requires": { - "lowercase-keys": "1.0.1" + "lowercase-keys": "^1.0.0" } }, "restore-cursor": { @@ -10944,8 +10945,8 @@ "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, "requires": { - "onetime": "5.1.2", - "signal-exit": "3.0.3" + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" } }, "ret": { @@ -10984,7 +10985,7 @@ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } }, "ripemd160": { @@ -10993,8 +10994,8 @@ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, "requires": { - "hash-base": "3.1.0", - "inherits": "2.0.4" + "hash-base": "^3.0.0", + "inherits": "^2.0.1" } }, "roarr": { @@ -11004,12 +11005,12 @@ "dev": true, "optional": true, "requires": { - "boolean": "3.0.1", - "detect-node": "2.0.4", - "globalthis": "1.0.1", - "json-stringify-safe": "5.0.1", - "semver-compare": "1.0.0", - "sprintf-js": "1.1.2" + "boolean": "^3.0.1", + "detect-node": "^2.0.4", + "globalthis": "^1.0.1", + "json-stringify-safe": "^5.0.1", + "semver-compare": "^1.0.0", + "sprintf-js": "^1.1.2" } }, "rtlcss": { @@ -11018,11 +11019,11 @@ "integrity": "sha512-NCVdF45w70/3CQeqVvQ84bu2HN8agNn+CDjw+RxXaiWb7mPOmEvltdd1z4qzm9kin4Jnu9ShFBIx28yvWerZ2g==", "dev": true, "requires": { - "chalk": "2.4.2", - "findup": "0.1.5", - "mkdirp": "0.5.5", - "postcss": "6.0.23", - "strip-json-comments": "2.0.1" + "chalk": "^2.4.2", + "findup": "^0.1.5", + "mkdirp": "^0.5.1", + "postcss": "^6.0.23", + "strip-json-comments": "^2.0.0" }, "dependencies": { "chalk": { @@ -11031,9 +11032,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "postcss": { @@ -11042,9 +11043,9 @@ "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", "dev": true, "requires": { - "chalk": "2.4.2", - "source-map": "0.6.1", - "supports-color": "5.5.0" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" } }, "source-map": { @@ -11073,7 +11074,7 @@ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { - "aproba": "1.2.0" + "aproba": "^1.1.1" } }, "rxjs": { @@ -11082,7 +11083,7 @@ "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", "dev": true, "requires": { - "tslib": "1.13.0" + "tslib": "^1.9.0" }, "dependencies": { "tslib": { @@ -11105,7 +11106,7 @@ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "safer-buffer": { @@ -11120,7 +11121,7 @@ "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==", "dev": true, "requires": { - "truncate-utf8-bytes": "1.0.2" + "truncate-utf8-bytes": "^1.0.0" } }, "sass-graph": { @@ -11129,10 +11130,10 @@ "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", "dev": true, "requires": { - "glob": "7.1.6", - "lodash": "4.17.20", - "scss-tokenizer": "0.2.3", - "yargs": "13.3.2" + "glob": "^7.0.0", + "lodash": "^4.0.0", + "scss-tokenizer": "^0.2.3", + "yargs": "^13.3.2" }, "dependencies": { "ansi-regex": { @@ -11153,9 +11154,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "7.0.3", - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "5.2.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } }, "strip-ansi": { @@ -11164,7 +11165,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.1.0" + "ansi-regex": "^4.1.0" } }, "yargs": { @@ -11173,16 +11174,16 @@ "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { - "cliui": "5.0.0", - "find-up": "3.0.0", - "get-caller-file": "2.0.5", - "require-directory": "2.1.1", - "require-main-filename": "2.0.0", - "set-blocking": "2.0.0", - "string-width": "3.1.0", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "13.1.2" + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" } } } @@ -11193,11 +11194,11 @@ "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==", "dev": true, "requires": { - "clone-deep": "4.0.1", - "loader-utils": "1.4.0", - "neo-async": "2.6.2", - "schema-utils": "2.7.1", - "semver": "6.3.0" + "clone-deep": "^4.0.1", + "loader-utils": "^1.2.3", + "neo-async": "^2.6.1", + "schema-utils": "^2.6.1", + "semver": "^6.3.0" }, "dependencies": { "semver": { @@ -11220,9 +11221,9 @@ "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", "dev": true, "requires": { - "@types/json-schema": "7.0.6", - "ajv": "6.12.5", - "ajv-keywords": "3.5.2" + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" } }, "scss-tokenizer": { @@ -11231,8 +11232,8 @@ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "requires": { - "js-base64": "2.6.4", - "source-map": "0.4.4" + "js-base64": "^2.1.8", + "source-map": "^0.4.2" }, "dependencies": { "source-map": { @@ -11241,7 +11242,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -11258,7 +11259,7 @@ "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", "dev": true, "requires": { - "node-forge": "0.10.0" + "node-forge": "^0.10.0" } }, "semver": { @@ -11281,18 +11282,18 @@ "dev": true, "requires": { "debug": "2.6.9", - "depd": "1.1.2", - "destroy": "1.0.4", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.7.2", + "http-errors": "~1.7.2", "mime": "1.6.0", "ms": "2.1.1", - "on-finished": "2.3.0", - "range-parser": "1.2.1", - "statuses": "1.5.0" + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" }, "dependencies": { "debug": { @@ -11327,7 +11328,7 @@ "dev": true, "optional": true, "requires": { - "type-fest": "0.13.1" + "type-fest": "^0.13.1" } }, "serialize-javascript": { @@ -11336,7 +11337,7 @@ "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", "dev": true, "requires": { - "randombytes": "2.1.0" + "randombytes": "^2.1.0" } }, "serve-index": { @@ -11345,13 +11346,13 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.4", "batch": "0.6.1", "debug": "2.6.9", - "escape-html": "1.0.3", - "http-errors": "1.6.3", - "mime-types": "2.1.27", - "parseurl": "1.3.3" + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" }, "dependencies": { "debug": { @@ -11369,10 +11370,10 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": "1.5.0" + "statuses": ">= 1.4.0 < 2" } }, "inherits": { @@ -11395,9 +11396,9 @@ "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", "dev": true, "requires": { - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "parseurl": "1.3.3", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", "send": "0.17.1" } }, @@ -11413,10 +11414,10 @@ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -11425,7 +11426,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11448,8 +11449,8 @@ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "shallow-clone": { @@ -11458,7 +11459,7 @@ "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.2" } }, "shebang-command": { @@ -11467,7 +11468,7 @@ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { - "shebang-regex": "3.0.0" + "shebang-regex": "^3.0.0" } }, "shebang-regex": { @@ -11494,7 +11495,7 @@ "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", "dev": true, "requires": { - "is-arrayish": "0.3.2" + "is-arrayish": "^0.3.1" }, "dependencies": { "is-arrayish": { @@ -11517,9 +11518,9 @@ "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, "requires": { - "ansi-styles": "4.2.1", - "astral-regex": "2.0.0", - "is-fullwidth-code-point": "3.0.0" + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" }, "dependencies": { "ansi-styles": { @@ -11528,8 +11529,8 @@ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/color-name": "1.1.1", - "color-convert": "2.0.1" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, "color-convert": { @@ -11538,7 +11539,7 @@ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "color-name": "1.1.4" + "color-name": "~1.1.4" } }, "color-name": { @@ -11561,14 +11562,14 @@ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "dev": true, "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.3", - "use": "3.1.1" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { "debug": { @@ -11586,7 +11587,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -11595,7 +11596,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11606,9 +11607,9 @@ "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { @@ -11617,7 +11618,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -11626,7 +11627,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -11635,7 +11636,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -11644,9 +11645,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.3" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -11657,7 +11658,7 @@ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" }, "dependencies": { "is-buffer": { @@ -11672,7 +11673,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -11683,8 +11684,8 @@ "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==", "dev": true, "requires": { - "faye-websocket": "0.10.0", - "uuid": "3.4.0", + "faye-websocket": "^0.10.0", + "uuid": "^3.4.0", "websocket-driver": "0.6.5" } }, @@ -11694,12 +11695,12 @@ "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", "dev": true, "requires": { - "debug": "3.2.6", - "eventsource": "1.0.7", - "faye-websocket": "0.11.3", - "inherits": "2.0.4", - "json3": "3.3.3", - "url-parse": "1.4.7" + "debug": "^3.2.5", + "eventsource": "^1.0.7", + "faye-websocket": "~0.11.1", + "inherits": "^2.0.3", + "json3": "^3.3.2", + "url-parse": "^1.4.3" }, "dependencies": { "debug": { @@ -11708,7 +11709,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "faye-websocket": { @@ -11717,7 +11718,7 @@ "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", "dev": true, "requires": { - "websocket-driver": "0.6.5" + "websocket-driver": ">=0.5.1" } }, "ms": { @@ -11734,7 +11735,7 @@ "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", "dev": true, "requires": { - "is-plain-obj": "1.1.0" + "is-plain-obj": "^1.0.0" } }, "source-list-map": { @@ -11755,11 +11756,11 @@ "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", "dev": true, "requires": { - "atob": "2.1.2", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-support": { @@ -11768,8 +11769,8 @@ "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "dev": true, "requires": { - "buffer-from": "1.1.1", - "source-map": "0.6.1" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" }, "dependencies": { "source-map": { @@ -11792,8 +11793,8 @@ "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", "dev": true, "requires": { - "spdx-expression-parse": "3.0.1", - "spdx-license-ids": "3.0.6" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -11808,8 +11809,8 @@ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, "requires": { - "spdx-exceptions": "2.3.0", - "spdx-license-ids": "3.0.6" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -11824,11 +11825,11 @@ "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", "dev": true, "requires": { - "debug": "4.2.0", - "handle-thing": "2.0.1", - "http-deceiver": "1.2.7", - "select-hose": "2.0.0", - "spdy-transport": "3.0.0" + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" }, "dependencies": { "debug": { @@ -11854,12 +11855,12 @@ "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, "requires": { - "debug": "4.2.0", - "detect-node": "2.0.4", - "hpack.js": "2.1.6", - "obuf": "1.1.2", - "readable-stream": "3.6.0", - "wbuf": "1.7.3" + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.3" }, "dependencies": { "debug": { @@ -11885,7 +11886,7 @@ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dev": true, "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" } }, "sprintf-js": { @@ -11901,15 +11902,15 @@ "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", "dev": true, "requires": { - "asn1": "0.2.4", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.2", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.2", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "safer-buffer": "2.1.2", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" } }, "ssri": { @@ -11918,7 +11919,7 @@ "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==", "dev": true, "requires": { - "minipass": "3.1.3" + "minipass": "^3.1.1" } }, "stable": { @@ -11939,8 +11940,8 @@ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { @@ -11949,7 +11950,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -11966,7 +11967,7 @@ "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", "dev": true, "requires": { - "readable-stream": "2.3.7" + "readable-stream": "^2.0.1" }, "dependencies": { "readable-stream": { @@ -11975,13 +11976,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -11992,8 +11993,8 @@ "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "dev": true, "requires": { - "inherits": "2.0.4", - "readable-stream": "2.3.7" + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" }, "dependencies": { "readable-stream": { @@ -12002,13 +12003,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -12019,8 +12020,8 @@ "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "stream-shift": "1.0.1" + "end-of-stream": "^1.1.0", + "stream-shift": "^1.0.0" } }, "stream-http": { @@ -12029,11 +12030,11 @@ "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", "dev": true, "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.4", - "readable-stream": "2.3.7", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.2" + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.3.6", + "to-arraybuffer": "^1.0.0", + "xtend": "^4.0.0" }, "dependencies": { "readable-stream": { @@ -12042,13 +12043,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -12071,8 +12072,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "ansi-regex": { @@ -12087,7 +12088,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } @@ -12098,8 +12099,8 @@ "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.17.7" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" }, "dependencies": { "es-abstract": { @@ -12108,17 +12109,17 @@ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } } } @@ -12129,8 +12130,8 @@ "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.17.7" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" }, "dependencies": { "es-abstract": { @@ -12139,17 +12140,17 @@ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } } } @@ -12160,7 +12161,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -12169,7 +12170,7 @@ "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "5.0.0" + "ansi-regex": "^5.0.0" }, "dependencies": { "ansi-regex": { @@ -12186,7 +12187,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-eof": { @@ -12201,7 +12202,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "strip-json-comments": { @@ -12216,9 +12217,9 @@ "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==", "dev": true, "requires": { - "browserslist": "4.14.5", - "postcss": "7.0.35", - "postcss-selector-parser": "3.1.2" + "browserslist": "^4.0.0", + "postcss": "^7.0.0", + "postcss-selector-parser": "^3.0.0" }, "dependencies": { "postcss-selector-parser": { @@ -12227,9 +12228,9 @@ "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "5.2.0", - "indexes-of": "1.0.1", - "uniq": "1.0.1" + "dot-prop": "^5.2.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1" } } } @@ -12240,14 +12241,14 @@ "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==", "dev": true, "requires": { - "css-parse": "2.0.0", - "debug": "3.1.0", - "glob": "7.1.6", - "mkdirp": "1.0.4", - "safer-buffer": "2.1.2", - "sax": "1.2.4", - "semver": "6.3.0", - "source-map": "0.7.3" + "css-parse": "~2.0.0", + "debug": "~3.1.0", + "glob": "^7.1.6", + "mkdirp": "~1.0.4", + "safer-buffer": "^2.1.2", + "sax": "~1.2.4", + "semver": "^6.3.0", + "source-map": "^0.7.3" }, "dependencies": { "mkdirp": { @@ -12276,9 +12277,9 @@ "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", "dev": true, "requires": { - "loader-utils": "1.4.0", - "lodash.clonedeep": "4.5.0", - "when": "3.6.4" + "loader-utils": "^1.0.2", + "lodash.clonedeep": "^4.5.0", + "when": "~3.6.x" } }, "sumchecker": { @@ -12287,7 +12288,7 @@ "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", "dev": true, "requires": { - "debug": "4.2.0" + "debug": "^4.1.0" }, "dependencies": { "debug": { @@ -12313,7 +12314,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "svgo": { @@ -12322,19 +12323,19 @@ "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", "dev": true, "requires": { - "chalk": "2.4.2", - "coa": "2.0.2", - "css-select": "2.1.0", - "css-select-base-adapter": "0.1.1", + "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.3", - "js-yaml": "3.14.0", - "mkdirp": "0.5.5", - "object.values": "1.1.1", - "sax": "1.2.4", - "stable": "0.1.8", - "unquote": "1.1.1", - "util.promisify": "1.0.1" + "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": { "chalk": { @@ -12343,9 +12344,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -12356,10 +12357,10 @@ "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", "dev": true, "requires": { - "ajv": "6.12.5", - "lodash": "4.17.20", - "slice-ansi": "2.1.0", - "string-width": "3.1.0" + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" }, "dependencies": { "ansi-regex": { @@ -12386,9 +12387,9 @@ "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "astral-regex": "1.0.0", - "is-fullwidth-code-point": "2.0.0" + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", + "is-fullwidth-code-point": "^2.0.0" } }, "string-width": { @@ -12397,9 +12398,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "7.0.3", - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "5.2.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } }, "strip-ansi": { @@ -12408,7 +12409,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.1.0" + "ansi-regex": "^4.1.0" } } } @@ -12425,12 +12426,12 @@ "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==", "dev": true, "requires": { - "chownr": "2.0.0", - "fs-minipass": "2.1.0", - "minipass": "3.1.3", - "minizlib": "2.1.2", - "mkdirp": "1.0.4", - "yallist": "4.0.0" + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" }, "dependencies": { "mkdirp": { @@ -12447,11 +12448,11 @@ "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==", "dev": true, "requires": { - "bl": "4.0.3", - "end-of-stream": "1.4.4", - "fs-constants": "1.0.0", - "inherits": "2.0.4", - "readable-stream": "3.6.0" + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" } }, "terser": { @@ -12460,9 +12461,9 @@ "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", "dev": true, "requires": { - "commander": "2.20.3", - "source-map": "0.6.1", - "source-map-support": "0.5.19" + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" }, "dependencies": { "source-map": { @@ -12479,15 +12480,15 @@ "integrity": "sha512-0ZWDPIP8BtEDZdChbufcXUigOYk6dOX/P/X0hWxqDDcVAQLb8Yy/0FAaemSfax3PAA67+DJR778oz8qVbmy4hA==", "dev": true, "requires": { - "cacache": "15.0.5", - "find-cache-dir": "3.3.1", - "jest-worker": "26.3.0", - "p-limit": "3.0.2", - "schema-utils": "2.7.1", - "serialize-javascript": "4.0.0", - "source-map": "0.6.1", - "terser": "5.3.3", - "webpack-sources": "1.4.3" + "cacache": "^15.0.5", + "find-cache-dir": "^3.3.1", + "jest-worker": "^26.3.0", + "p-limit": "^3.0.2", + "schema-utils": "^2.6.6", + "serialize-javascript": "^4.0.0", + "source-map": "^0.6.1", + "terser": "^5.0.0", + "webpack-sources": "^1.4.3" }, "dependencies": { "find-cache-dir": { @@ -12496,9 +12497,9 @@ "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "3.1.0", - "pkg-dir": "4.2.0" + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" } }, "find-up": { @@ -12507,8 +12508,8 @@ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "5.0.0", - "path-exists": "4.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "locate-path": { @@ -12517,7 +12518,7 @@ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "4.1.0" + "p-locate": "^4.1.0" } }, "make-dir": { @@ -12526,7 +12527,7 @@ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { - "semver": "6.3.0" + "semver": "^6.0.0" } }, "p-limit": { @@ -12535,7 +12536,7 @@ "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -12544,7 +12545,7 @@ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "2.3.0" + "p-limit": "^2.2.0" }, "dependencies": { "p-limit": { @@ -12553,7 +12554,7 @@ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } } } @@ -12570,7 +12571,7 @@ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "4.1.0" + "find-up": "^4.0.0" } }, "semver": { @@ -12591,9 +12592,9 @@ "integrity": "sha512-vRQDIlD+2Pg8YMwVK9kMM3yGylG95EIwzBai1Bw7Ot4OBfn3VP1TZn3EWx4ep2jERN/AmnVaTiGuelZSN7ds/A==", "dev": true, "requires": { - "commander": "2.20.3", - "source-map": "0.7.3", - "source-map-support": "0.5.19" + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.19" }, "dependencies": { "source-map": { @@ -12624,8 +12625,8 @@ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "readable-stream": "2.3.7", - "xtend": "4.0.2" + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" }, "dependencies": { "readable-stream": { @@ -12634,13 +12635,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -12657,7 +12658,7 @@ "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", "dev": true, "requires": { - "setimmediate": "1.0.5" + "setimmediate": "^1.0.4" } }, "timsort": { @@ -12672,7 +12673,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.2" } }, "to-arraybuffer": { @@ -12693,7 +12694,7 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "is-buffer": { @@ -12708,7 +12709,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -12725,10 +12726,10 @@ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "dev": true, "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { @@ -12737,7 +12738,7 @@ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { - "is-number": "7.0.0" + "is-number": "^7.0.0" } }, "toidentifier": { @@ -12752,8 +12753,8 @@ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "dev": true, "requires": { - "psl": "1.8.0", - "punycode": "2.1.1" + "psl": "^1.1.28", + "punycode": "^2.1.1" } }, "trim-newlines": { @@ -12768,7 +12769,7 @@ "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.2" } }, "truncate-utf8-bytes": { @@ -12777,7 +12778,7 @@ "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=", "dev": true, "requires": { - "utf8-byte-length": "1.0.4" + "utf8-byte-length": "^1.0.1" } }, "tryer": { @@ -12792,11 +12793,11 @@ "integrity": "sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==", "dev": true, "requires": { - "chalk": "2.4.2", - "enhanced-resolve": "4.3.0", - "loader-utils": "1.4.0", - "micromatch": "4.0.2", - "semver": "6.3.0" + "chalk": "^2.3.0", + "enhanced-resolve": "^4.0.0", + "loader-utils": "^1.0.2", + "micromatch": "^4.0.0", + "semver": "^6.0.0" }, "dependencies": { "chalk": { @@ -12805,9 +12806,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "semver": { @@ -12829,7 +12830,7 @@ "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", "dev": true, "requires": { - "tslib": "1.13.0" + "tslib": "^1.8.1" }, "dependencies": { "tslib": { @@ -12859,7 +12860,7 @@ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -12874,7 +12875,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } }, "type-fest": { @@ -12891,7 +12892,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.27" + "mime-types": "~2.1.24" } }, "typedarray": { @@ -12924,8 +12925,8 @@ "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", "dev": true, "requires": { - "unicode-canonical-property-names-ecmascript": "1.0.4", - "unicode-property-aliases-ecmascript": "1.1.0" + "unicode-canonical-property-names-ecmascript": "^1.0.4", + "unicode-property-aliases-ecmascript": "^1.0.4" } }, "unicode-match-property-value-ecmascript": { @@ -12946,10 +12947,10 @@ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "2.0.1" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^2.0.1" } }, "uniq": { @@ -12970,7 +12971,7 @@ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "dev": true, "requires": { - "unique-slug": "2.0.2" + "unique-slug": "^2.0.0" } }, "unique-slug": { @@ -12979,7 +12980,7 @@ "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", "dev": true, "requires": { - "imurmurhash": "0.1.4" + "imurmurhash": "^0.1.4" } }, "universalify": { @@ -13006,8 +13007,8 @@ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { @@ -13016,9 +13017,9 @@ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { @@ -13058,7 +13059,7 @@ "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", "dev": true, "requires": { - "punycode": "2.1.1" + "punycode": "^2.1.0" } }, "urix": { @@ -13091,9 +13092,9 @@ "integrity": "sha512-IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw==", "dev": true, "requires": { - "loader-utils": "2.0.0", - "mime-types": "2.1.27", - "schema-utils": "2.7.1" + "loader-utils": "^2.0.0", + "mime-types": "^2.1.26", + "schema-utils": "^2.6.5" }, "dependencies": { "loader-utils": { @@ -13102,9 +13103,9 @@ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { - "big.js": "5.2.2", - "emojis-list": "3.0.0", - "json5": "2.1.3" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" } } } @@ -13115,8 +13116,8 @@ "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", "dev": true, "requires": { - "querystringify": "2.2.0", - "requires-port": "1.0.0" + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" } }, "url-parse-lax": { @@ -13125,7 +13126,7 @@ "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "dev": true, "requires": { - "prepend-http": "2.0.0" + "prepend-http": "^2.0.0" } }, "use": { @@ -13169,10 +13170,10 @@ "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.17.7", - "has-symbols": "1.0.1", - "object.getownpropertydescriptors": "2.1.0" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.2", + "has-symbols": "^1.0.1", + "object.getownpropertydescriptors": "^2.1.0" }, "dependencies": { "es-abstract": { @@ -13181,17 +13182,17 @@ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } } } @@ -13226,8 +13227,8 @@ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, "requires": { - "spdx-correct": "3.1.1", - "spdx-expression-parse": "3.0.1" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "vary": { @@ -13248,9 +13249,9 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "vm-browserify": { @@ -13271,12 +13272,12 @@ "integrity": "sha512-Kr21uPfthDc63nDl27AGQEhtt9VrZ9nkYk/NTftJ2ws9XiJwzJJCnCr3AITQ2jpRMA0XPGDECxYH8E027qMK9Q==", "dev": true, "requires": { - "debug": "4.2.0", - "eslint-scope": "5.1.1", - "eslint-visitor-keys": "1.3.0", - "espree": "6.2.1", - "esquery": "1.3.1", - "lodash": "4.17.20" + "debug": "^4.1.1", + "eslint-scope": "^5.0.0", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.2.1", + "esquery": "^1.0.1", + "lodash": "^4.17.15" }, "dependencies": { "debug": { @@ -13294,8 +13295,8 @@ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "esrecurse": "4.3.0", - "estraverse": "4.3.0" + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" } }, "ms": { @@ -13318,11 +13319,11 @@ "integrity": "sha512-Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA==", "dev": true, "requires": { - "@vue/component-compiler-utils": "3.2.0", - "hash-sum": "1.0.2", - "loader-utils": "1.4.0", - "vue-hot-reload-api": "2.3.4", - "vue-style-loader": "4.1.2" + "@vue/component-compiler-utils": "^3.1.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "vue-hot-reload-api": "^2.3.0", + "vue-style-loader": "^4.1.0" } }, "vue-router": { @@ -13337,13 +13338,13 @@ "integrity": "sha512-3LODaOsnQx7iMFTBLjki8xSyOxhCtbZ+nQie0wWY4iOVeEtTg1a3YQAjd82WvKxrWHHTshjvLb7OXMc2/dYuxw==", "dev": true, "requires": { - "chalk": "1.1.3", - "hash-sum": "1.0.2", - "he": "1.2.0", - "lodash.template": "4.5.0", - "lodash.uniq": "4.5.0", - "resolve": "1.17.0", - "serialize-javascript": "3.1.0", + "chalk": "^1.1.3", + "hash-sum": "^1.0.2", + "he": "^1.1.0", + "lodash.template": "^4.5.0", + "lodash.uniq": "^4.5.0", + "resolve": "^1.2.0", + "serialize-javascript": "^3.1.0", "source-map": "0.5.6" }, "dependencies": { @@ -13359,11 +13360,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "serialize-javascript": { @@ -13372,7 +13373,7 @@ "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", "dev": true, "requires": { - "randombytes": "2.1.0" + "randombytes": "^2.1.0" } }, "source-map": { @@ -13387,7 +13388,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "supports-color": { @@ -13404,8 +13405,8 @@ "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==", "dev": true, "requires": { - "hash-sum": "1.0.2", - "loader-utils": "1.4.0" + "hash-sum": "^1.0.2", + "loader-utils": "^1.0.2" } }, "vue-template-compiler": { @@ -13414,8 +13415,8 @@ "integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==", "dev": true, "requires": { - "de-indent": "1.0.2", - "he": "1.2.0" + "de-indent": "^1.0.2", + "he": "^1.1.0" } }, "vue-template-es2015-compiler": { @@ -13436,10 +13437,10 @@ "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==", "dev": true, "requires": { - "chokidar": "3.4.2", - "graceful-fs": "4.2.4", - "neo-async": "2.6.2", - "watchpack-chokidar2": "2.0.0" + "chokidar": "^3.4.1", + "graceful-fs": "^4.1.2", + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.0" } }, "watchpack-chokidar2": { @@ -13449,7 +13450,7 @@ "dev": true, "optional": true, "requires": { - "chokidar": "2.1.8" + "chokidar": "^2.1.8" }, "dependencies": { "anymatch": { @@ -13459,8 +13460,8 @@ "dev": true, "optional": true, "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" }, "dependencies": { "normalize-path": { @@ -13470,7 +13471,7 @@ "dev": true, "optional": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } } } @@ -13487,17 +13488,18 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, + "optional": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -13505,8 +13507,9 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -13518,18 +13521,18 @@ "dev": true, "optional": true, "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.3", - "braces": "2.3.2", - "fsevents": "1.2.13", - "glob-parent": "3.1.0", - "inherits": "2.0.4", - "is-binary-path": "1.0.1", - "is-glob": "4.0.1", - "normalize-path": "3.0.0", - "path-is-absolute": "1.0.1", - "readdirp": "2.2.1", - "upath": "1.2.0" + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" } }, "fill-range": { @@ -13537,11 +13540,12 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, + "optional": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -13549,8 +13553,9 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -13562,7 +13567,7 @@ "dev": true, "optional": true, "requires": { - "nan": "2.14.1" + "nan": "^2.12.1" } }, "glob-parent": { @@ -13572,8 +13577,8 @@ "dev": true, "optional": true, "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { "is-glob": { @@ -13583,7 +13588,7 @@ "dev": true, "optional": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -13595,22 +13600,24 @@ "dev": true, "optional": true, "requires": { - "binary-extensions": "1.13.1" + "binary-extensions": "^1.0.0" } }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "dev": true, + "optional": true }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, + "optional": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -13618,8 +13625,9 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -13629,20 +13637,21 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, + "optional": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.3", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "readable-stream": { @@ -13652,13 +13661,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -13668,9 +13677,9 @@ "dev": true, "optional": true, "requires": { - "graceful-fs": "4.2.4", - "micromatch": "3.1.10", - "readable-stream": "2.3.7" + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" } }, "to-regex-range": { @@ -13678,9 +13687,10 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, + "optional": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } } } @@ -13691,7 +13701,7 @@ "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, "requires": { - "minimalistic-assert": "1.0.1" + "minimalistic-assert": "^1.0.0" } }, "webpack": { @@ -13704,25 +13714,25 @@ "@webassemblyjs/helper-module-context": "1.9.0", "@webassemblyjs/wasm-edit": "1.9.0", "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "6.4.1", - "ajv": "6.12.5", - "ajv-keywords": "3.5.2", - "chrome-trace-event": "1.0.2", - "enhanced-resolve": "4.3.0", - "eslint-scope": "4.0.3", - "json-parse-better-errors": "1.0.2", - "loader-runner": "2.4.0", - "loader-utils": "1.4.0", - "memory-fs": "0.4.1", - "micromatch": "3.1.10", - "mkdirp": "0.5.5", - "neo-async": "2.6.2", - "node-libs-browser": "2.2.1", - "schema-utils": "1.0.0", - "tapable": "1.1.3", - "terser-webpack-plugin": "1.4.5", - "watchpack": "1.7.4", - "webpack-sources": "1.4.3" + "acorn": "^6.4.1", + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^4.3.0", + "eslint-scope": "^4.0.3", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^2.4.0", + "loader-utils": "^1.2.3", + "memory-fs": "^0.4.1", + "micromatch": "^3.1.10", + "mkdirp": "^0.5.3", + "neo-async": "^2.6.1", + "node-libs-browser": "^2.2.1", + "schema-utils": "^1.0.0", + "tapable": "^1.1.3", + "terser-webpack-plugin": "^1.4.3", + "watchpack": "^1.7.4", + "webpack-sources": "^1.4.1" }, "dependencies": { "braces": { @@ -13731,16 +13741,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -13749,7 +13759,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -13760,21 +13770,21 @@ "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", "dev": true, "requires": { - "bluebird": "3.7.2", - "chownr": "1.1.4", - "figgy-pudding": "3.5.2", - "glob": "7.1.6", - "graceful-fs": "4.2.4", - "infer-owner": "1.0.4", - "lru-cache": "5.1.1", - "mississippi": "3.0.0", - "mkdirp": "0.5.5", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.7.1", - "ssri": "6.0.1", - "unique-filename": "1.1.1", - "y18n": "4.0.0" + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" } }, "chownr": { @@ -13789,10 +13799,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -13801,7 +13811,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -13818,7 +13828,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -13827,7 +13837,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -13844,7 +13854,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "3.1.1" + "yallist": "^3.0.2" } }, "memory-fs": { @@ -13853,8 +13863,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "0.1.7", - "readable-stream": "2.3.7" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" } }, "micromatch": { @@ -13863,19 +13873,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.3", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "readable-stream": { @@ -13884,13 +13894,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -13899,7 +13909,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } }, "schema-utils": { @@ -13908,9 +13918,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "6.12.5", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.5.2" + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" } }, "source-map": { @@ -13925,7 +13935,7 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "3.5.2" + "figgy-pudding": "^3.5.1" } }, "terser-webpack-plugin": { @@ -13934,15 +13944,15 @@ "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", "dev": true, "requires": { - "cacache": "12.0.4", - "find-cache-dir": "2.1.0", - "is-wsl": "1.1.0", - "schema-utils": "1.0.0", - "serialize-javascript": "4.0.0", - "source-map": "0.6.1", - "terser": "4.8.0", - "webpack-sources": "1.4.3", - "worker-farm": "1.7.0" + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", + "is-wsl": "^1.1.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^4.0.0", + "source-map": "^0.6.1", + "terser": "^4.1.2", + "webpack-sources": "^1.4.0", + "worker-farm": "^1.7.0" } }, "to-regex-range": { @@ -13951,8 +13961,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "yallist": { @@ -13969,19 +13979,19 @@ "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==", "dev": true, "requires": { - "acorn": "7.4.0", - "acorn-walk": "7.2.0", - "bfj": "6.1.2", - "chalk": "2.4.2", - "commander": "2.20.3", - "ejs": "2.7.4", - "express": "4.17.1", - "filesize": "3.6.1", - "gzip-size": "5.1.1", - "lodash": "4.17.20", - "mkdirp": "0.5.5", - "opener": "1.5.2", - "ws": "6.2.1" + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1", + "bfj": "^6.1.1", + "chalk": "^2.4.1", + "commander": "^2.18.0", + "ejs": "^2.6.1", + "express": "^4.16.3", + "filesize": "^3.6.1", + "gzip-size": "^5.0.0", + "lodash": "^4.17.15", + "mkdirp": "^0.5.1", + "opener": "^1.5.1", + "ws": "^6.0.0" }, "dependencies": { "acorn": { @@ -13996,9 +14006,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -14009,8 +14019,8 @@ "integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==", "dev": true, "requires": { - "deepmerge": "1.5.2", - "javascript-stringify": "2.0.1" + "deepmerge": "^1.5.2", + "javascript-stringify": "^2.0.1" } }, "webpack-dev-middleware": { @@ -14019,11 +14029,11 @@ "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==", "dev": true, "requires": { - "memory-fs": "0.4.1", - "mime": "2.4.6", - "mkdirp": "0.5.5", - "range-parser": "1.2.1", - "webpack-log": "2.0.0" + "memory-fs": "^0.4.1", + "mime": "^2.4.4", + "mkdirp": "^0.5.1", + "range-parser": "^1.2.1", + "webpack-log": "^2.0.0" }, "dependencies": { "memory-fs": { @@ -14032,8 +14042,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "0.1.7", - "readable-stream": "2.3.7" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" } }, "mime": { @@ -14048,13 +14058,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -14066,38 +14076,38 @@ "dev": true, "requires": { "ansi-html": "0.0.7", - "bonjour": "3.5.0", - "chokidar": "2.1.8", - "compression": "1.7.4", - "connect-history-api-fallback": "1.6.0", - "debug": "4.2.0", - "del": "4.1.1", - "express": "4.17.1", - "html-entities": "1.3.1", + "bonjour": "^3.5.0", + "chokidar": "^2.1.8", + "compression": "^1.7.4", + "connect-history-api-fallback": "^1.6.0", + "debug": "^4.1.1", + "del": "^4.1.1", + "express": "^4.17.1", + "html-entities": "^1.3.1", "http-proxy-middleware": "0.19.1", - "import-local": "2.0.0", - "internal-ip": "4.3.0", - "ip": "1.1.5", - "is-absolute-url": "3.0.3", - "killable": "1.0.1", - "loglevel": "1.7.0", - "opn": "5.5.0", - "p-retry": "3.0.1", - "portfinder": "1.0.28", - "schema-utils": "1.0.0", - "selfsigned": "1.10.8", - "semver": "6.3.0", - "serve-index": "1.9.1", + "import-local": "^2.0.0", + "internal-ip": "^4.3.0", + "ip": "^1.1.5", + "is-absolute-url": "^3.0.3", + "killable": "^1.0.1", + "loglevel": "^1.6.8", + "opn": "^5.5.0", + "p-retry": "^3.0.1", + "portfinder": "^1.0.26", + "schema-utils": "^1.0.0", + "selfsigned": "^1.10.7", + "semver": "^6.3.0", + "serve-index": "^1.9.1", "sockjs": "0.3.20", "sockjs-client": "1.4.0", - "spdy": "4.0.2", - "strip-ansi": "3.0.1", - "supports-color": "6.1.0", - "url": "0.11.0", - "webpack-dev-middleware": "3.7.2", - "webpack-log": "2.0.0", - "ws": "6.2.1", - "yargs": "13.3.2" + "spdy": "^4.0.2", + "strip-ansi": "^3.0.1", + "supports-color": "^6.1.0", + "url": "^0.11.0", + "webpack-dev-middleware": "^3.7.2", + "webpack-log": "^2.0.0", + "ws": "^6.2.1", + "yargs": "^13.3.2" }, "dependencies": { "anymatch": { @@ -14106,8 +14116,8 @@ "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" }, "dependencies": { "normalize-path": { @@ -14116,7 +14126,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } } } @@ -14133,16 +14143,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -14151,7 +14161,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -14162,18 +14172,18 @@ "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", "dev": true, "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.3", - "braces": "2.3.2", - "fsevents": "1.2.13", - "glob-parent": "3.1.0", - "inherits": "2.0.4", - "is-binary-path": "1.0.1", - "is-glob": "4.0.1", - "normalize-path": "3.0.0", - "path-is-absolute": "1.0.1", - "readdirp": "2.2.1", - "upath": "1.2.0" + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" } }, "debug": { @@ -14197,10 +14207,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -14209,7 +14219,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -14221,7 +14231,7 @@ "dev": true, "optional": true, "requires": { - "nan": "2.14.1" + "nan": "^2.12.1" } }, "glob-parent": { @@ -14230,8 +14240,8 @@ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { "is-glob": { @@ -14240,7 +14250,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -14257,7 +14267,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.13.1" + "binary-extensions": "^1.0.0" } }, "is-buffer": { @@ -14272,7 +14282,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -14281,7 +14291,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -14292,19 +14302,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.3", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "ms": { @@ -14319,13 +14329,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -14334,9 +14344,9 @@ "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "micromatch": "3.1.10", - "readable-stream": "2.3.7" + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" } }, "schema-utils": { @@ -14345,9 +14355,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "6.12.5", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.5.2" + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" } }, "semver": { @@ -14362,9 +14372,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "7.0.3", - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "5.2.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" }, "dependencies": { "ansi-regex": { @@ -14379,7 +14389,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.1.0" + "ansi-regex": "^4.1.0" } } } @@ -14390,7 +14400,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "supports-color": { @@ -14399,7 +14409,7 @@ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "to-regex-range": { @@ -14408,8 +14418,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "yargs": { @@ -14418,16 +14428,16 @@ "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { - "cliui": "5.0.0", - "find-up": "3.0.0", - "get-caller-file": "2.0.5", - "require-directory": "2.1.1", - "require-main-filename": "2.0.0", - "set-blocking": "2.0.0", - "string-width": "3.1.0", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "13.1.2" + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" } } } @@ -14438,8 +14448,8 @@ "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", "dev": true, "requires": { - "ansi-colors": "3.2.4", - "uuid": "3.4.0" + "ansi-colors": "^3.0.0", + "uuid": "^3.3.2" } }, "webpack-merge": { @@ -14448,7 +14458,7 @@ "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", "dev": true, "requires": { - "lodash": "4.17.20" + "lodash": "^4.17.15" } }, "webpack-node-externals": { @@ -14463,8 +14473,8 @@ "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", "dev": true, "requires": { - "source-list-map": "2.0.1", - "source-map": "0.6.1" + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" }, "dependencies": { "source-map": { @@ -14481,7 +14491,7 @@ "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=", "dev": true, "requires": { - "websocket-extensions": "0.1.4" + "websocket-extensions": ">=0.1.1" } }, "websocket-extensions": { @@ -14502,7 +14512,7 @@ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -14517,7 +14527,7 @@ "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "requires": { - "string-width": "2.1.1" + "string-width": "^1.0.2 || 2" } }, "word-wrap": { @@ -14532,7 +14542,7 @@ "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", "dev": true, "requires": { - "errno": "0.1.7" + "errno": "~0.1.7" } }, "worker-rpc": { @@ -14541,7 +14551,7 @@ "integrity": "sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==", "dev": true, "requires": { - "microevent.ts": "0.1.1" + "microevent.ts": "~0.1.1" } }, "wrap-ansi": { @@ -14550,9 +14560,9 @@ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "requires": { - "ansi-styles": "4.2.1", - "string-width": "4.2.0", - "strip-ansi": "6.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "dependencies": { "ansi-styles": { @@ -14561,8 +14571,8 @@ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/color-name": "1.1.1", - "color-convert": "2.0.1" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, "color-convert": { @@ -14571,7 +14581,7 @@ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "color-name": "1.1.4" + "color-name": "~1.1.4" } }, "color-name": { @@ -14592,9 +14602,9 @@ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "emoji-regex": "8.0.0", - "is-fullwidth-code-point": "3.0.0", - "strip-ansi": "6.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } } } @@ -14611,7 +14621,7 @@ "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", "dev": true, "requires": { - "mkdirp": "0.5.5" + "mkdirp": "^0.5.1" } }, "write-file-atomic": { @@ -14620,9 +14630,9 @@ "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "imurmurhash": "0.1.4", - "signal-exit": "3.0.3" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" } }, "write-file-webpack-plugin": { @@ -14631,13 +14641,13 @@ "integrity": "sha512-AZ7qJUvhTCBiOtG21aFJUcNuLVo2FFM6JMGKvaUGAH+QDqQAp2iG0nq3GcuXmJOFQR2JjpjhyYkyPrbFKhdjNQ==", "dev": true, "requires": { - "chalk": "2.4.2", - "debug": "3.1.0", - "filesize": "3.6.1", - "lodash": "4.17.20", - "mkdirp": "0.5.5", - "moment": "2.29.0", - "write-file-atomic": "2.4.3" + "chalk": "^2.4.0", + "debug": "^3.1.0", + "filesize": "^3.6.1", + "lodash": "^4.17.13", + "mkdirp": "^0.5.1", + "moment": "^2.22.1", + "write-file-atomic": "^2.3.0" }, "dependencies": { "chalk": { @@ -14646,9 +14656,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -14659,7 +14669,7 @@ "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", "dev": true, "requires": { - "async-limiter": "1.0.1" + "async-limiter": "~1.0.0" } }, "xmlbuilder": { @@ -14698,17 +14708,17 @@ "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dev": true, "requires": { - "cliui": "6.0.0", - "decamelize": "1.2.0", - "find-up": "4.1.0", - "get-caller-file": "2.0.5", - "require-directory": "2.1.1", - "require-main-filename": "2.0.0", - "set-blocking": "2.0.0", - "string-width": "4.2.0", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "18.1.3" + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" }, "dependencies": { "cliui": { @@ -14717,9 +14727,9 @@ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, "requires": { - "string-width": "4.2.0", - "strip-ansi": "6.0.0", - "wrap-ansi": "6.2.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" } }, "find-up": { @@ -14779,8 +14789,8 @@ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, "requires": { - "camelcase": "5.3.1", - "decamelize": "1.2.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } @@ -14791,8 +14801,8 @@ "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "dev": true, "requires": { - "camelcase": "5.3.1", - "decamelize": "1.2.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } }, "zip-stream": { @@ -14801,9 +14811,9 @@ "integrity": "sha512-TGxB2g+1ur6MHkvM644DuZr8Uzyz0k0OYWtS3YlpfWBEmK4woaC2t3+pozEL3dBfIPmpgmClR5B2QRcMgGt22g==", "dev": true, "requires": { - "archiver-utils": "2.1.0", - "compress-commons": "4.0.1", - "readable-stream": "3.6.0" + "archiver-utils": "^2.1.0", + "compress-commons": "^4.0.0", + "readable-stream": "^3.6.0" } }, "zlib": { diff --git a/quasar.conf.js b/quasar.conf.js index 4003e76..2960d54 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -37,7 +37,7 @@ module.exports = configure(function (ctx) { // https://github.com/quasarframework/quasar/tree/dev/extras extras: [ // 'ionicons-v4', - // 'mdi-v5', + 'mdi-v5', // 'fontawesome-v5', // 'eva-icons', // 'themify', @@ -50,7 +50,7 @@ module.exports = configure(function (ctx) { // Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build build: { - vueRouterMode: 'hash', // available values: 'hash', 'history' + vueRouterMode: 'history', // available values: 'hash', 'history' // transpile: false, @@ -70,14 +70,14 @@ module.exports = configure(function (ctx) { // https://quasar.dev/quasar-cli/handling-webpack extendWebpack (cfg) { - // linting is slow in TS projects, we execute it only for production builds + // linting is slow in TS projects, we execute it only for production builds if (ctx.prod) { - cfg.module.rules.push({ - enforce: 'pre', - test: /\.(js|vue)$/, - loader: 'eslint-loader', - exclude: /node_modules/ - }) + cfg.module.rules.push({ + enforce: 'pre', + test: /\.(js|vue)$/, + loader: 'eslint-loader', + exclude: /node_modules/ + }) } }, }, diff --git a/src/components/EssentialLink.vue b/src/components/EssentialLink.vue index a7bc4eb..b8169bf 100644 --- a/src/components/EssentialLink.vue +++ b/src/components/EssentialLink.vue @@ -2,8 +2,8 @@ diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index a4547d5..215c4f8 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -1,109 +1,73 @@ diff --git a/src/pages/About.vue b/src/pages/About.vue new file mode 100644 index 0000000..ea85000 --- /dev/null +++ b/src/pages/About.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/router/routes.ts b/src/router/routes.ts index 4876636..6107909 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -5,7 +5,9 @@ const routes: RouteConfig[] = [ path: '/', component: () => import('layouts/MainLayout.vue'), children: [ - { path: '', component: () => import('pages/Index.vue') } + { name: 'home', path: '', component: () => import('pages/Index.vue') }, + { name: 'about', path: 'about', component: () => import('pages/About.vue') } + ] }, From 2ee3cb0dbcf6bc0bba360ffe4dd093f30e44167a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sat, 10 Oct 2020 23:02:32 +0200 Subject: [PATCH 022/448] Grobes Layout fertig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit wurde Gefüllt mit Dummies für die Navigation. Zeigt Loginpage und leitet einen weiter. Design ist responsive. --- public/logo-dark.svg | 58 +++++++++++++ public/logo.svg | 59 +++++++++++++ .../{ => navigation}/EssentialLink.vue | 0 .../navigation/PluginLinksAbout.vue | 28 ++++++ src/components/navigation/PluginLinksHome.vue | 27 ++++++ src/layouts/MainLayout.vue | 86 ++++++++++++++----- src/layouts/OutLayout.vue | 41 +++++++++ src/pages/Login.vue | 56 ++++++++++++ src/pages/about/About.vue | 17 ++++ src/pages/{About.vue => about/NewAbout.vue} | 11 +-- src/pages/about/OldAbout.vue | 14 +++ src/pages/home/Home.vue | 18 ++++ src/pages/home/NewHome.vue | 14 +++ src/pages/home/OldHome.vue | 14 +++ src/router/routes.ts | 58 ++++++++++++- 15 files changed, 470 insertions(+), 31 deletions(-) create mode 100644 public/logo-dark.svg create mode 100644 public/logo.svg rename src/components/{ => navigation}/EssentialLink.vue (100%) create mode 100644 src/components/navigation/PluginLinksAbout.vue create mode 100644 src/components/navigation/PluginLinksHome.vue create mode 100644 src/layouts/OutLayout.vue create mode 100644 src/pages/Login.vue create mode 100644 src/pages/about/About.vue rename src/pages/{About.vue => about/NewAbout.vue} (52%) create mode 100644 src/pages/about/OldAbout.vue create mode 100644 src/pages/home/Home.vue create mode 100644 src/pages/home/NewHome.vue create mode 100644 src/pages/home/OldHome.vue diff --git a/public/logo-dark.svg b/public/logo-dark.svg new file mode 100644 index 0000000..ce9ce36 --- /dev/null +++ b/public/logo-dark.svg @@ -0,0 +1,58 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/public/logo.svg b/public/logo.svg new file mode 100644 index 0000000..2cd6ae8 --- /dev/null +++ b/public/logo.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/src/components/EssentialLink.vue b/src/components/navigation/EssentialLink.vue similarity index 100% rename from src/components/EssentialLink.vue rename to src/components/navigation/EssentialLink.vue diff --git a/src/components/navigation/PluginLinksAbout.vue b/src/components/navigation/PluginLinksAbout.vue new file mode 100644 index 0000000..7e12254 --- /dev/null +++ b/src/components/navigation/PluginLinksAbout.vue @@ -0,0 +1,28 @@ + + + diff --git a/src/components/navigation/PluginLinksHome.vue b/src/components/navigation/PluginLinksHome.vue new file mode 100644 index 0000000..1f81695 --- /dev/null +++ b/src/components/navigation/PluginLinksHome.vue @@ -0,0 +1,27 @@ + + + diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index 215c4f8..ed5f05c 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -1,27 +1,38 @@ diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue new file mode 100644 index 0000000..400ea93 --- /dev/null +++ b/src/layouts/OutLayout.vue @@ -0,0 +1,41 @@ + + + diff --git a/src/pages/Login.vue b/src/pages/Login.vue new file mode 100644 index 0000000..e492340 --- /dev/null +++ b/src/pages/Login.vue @@ -0,0 +1,56 @@ + + + diff --git a/src/pages/about/About.vue b/src/pages/about/About.vue new file mode 100644 index 0000000..622af68 --- /dev/null +++ b/src/pages/about/About.vue @@ -0,0 +1,17 @@ + + + diff --git a/src/pages/About.vue b/src/pages/about/NewAbout.vue similarity index 52% rename from src/pages/About.vue rename to src/pages/about/NewAbout.vue index ea85000..8bda575 100644 --- a/src/pages/About.vue +++ b/src/pages/about/NewAbout.vue @@ -1,13 +1,14 @@ - - \ No newline at end of file diff --git a/src/pages/about/OldAbout.vue b/src/pages/about/OldAbout.vue new file mode 100644 index 0000000..99333f4 --- /dev/null +++ b/src/pages/about/OldAbout.vue @@ -0,0 +1,14 @@ + + + diff --git a/src/pages/home/Home.vue b/src/pages/home/Home.vue new file mode 100644 index 0000000..c5dd22d --- /dev/null +++ b/src/pages/home/Home.vue @@ -0,0 +1,18 @@ + + + diff --git a/src/pages/home/NewHome.vue b/src/pages/home/NewHome.vue new file mode 100644 index 0000000..8d8dba7 --- /dev/null +++ b/src/pages/home/NewHome.vue @@ -0,0 +1,14 @@ + + + diff --git a/src/pages/home/OldHome.vue b/src/pages/home/OldHome.vue new file mode 100644 index 0000000..6c18ea2 --- /dev/null +++ b/src/pages/home/OldHome.vue @@ -0,0 +1,14 @@ + + + diff --git a/src/router/routes.ts b/src/router/routes.ts index 6107909..f303432 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -3,11 +3,62 @@ import { RouteConfig } from 'vue-router'; const routes: RouteConfig[] = [ { path: '/', + redirect: 'login', + component: () => import('layouts/OutLayout.vue'), + children: [ + { + name: 'login', + path: 'login', + component: () => import('pages/Login.vue') + } + ] + }, + { + path: '/main', component: () => import('layouts/MainLayout.vue'), children: [ - { name: 'home', path: '', component: () => import('pages/Index.vue') }, - { name: 'about', path: 'about', component: () => import('pages/About.vue') } - + { + name: 'home', + path: 'home', + components: { + default: () => import('pages/home/Home.vue'), + 'plugin-nav': () => + import('components/navigation/PluginLinksHome.vue') + }, + children: [ + { + name: 'newHome', + path: 'newHome', + component: () => import('pages/home/NewHome.vue') + }, + { + name: 'oldHome', + path: 'oldHome', + component: () => import('pages/home/OldHome.vue') + } + ] + }, + { + name: 'about', + path: 'about', + components: { + default: () => import('pages/about/About.vue'), + 'plugin-nav': () => + import('components/navigation/PluginLinksAbout.vue') + }, + children: [ + { + name: 'newAbout', + path: 'newAbout', + component: () => import('pages/about/NewAbout.vue') + }, + { + name: 'oldAbout', + path: 'oldAbout', + component: () => import('pages/about/OldAbout.vue') + } + ] + } ] }, @@ -15,6 +66,7 @@ const routes: RouteConfig[] = [ // but you can also remove it { path: '*', + redirect: 'login', component: () => import('pages/Error404.vue') } ]; From 6d56d5847f960123a0ab57e770689aa7eeb8181f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Mon, 12 Oct 2020 23:49:05 +0200 Subject: [PATCH 023/448] Einfaches Plugin-Loading MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Lädt alle Plugins aus dem Ordner src/plugins. Bis jetzt werden nur die Routes hinzugefügt! Es wird noch nicht mit dem Store gearbeitet. --- package-lock.json | 5492 +++++++++-------- package.json | 5 +- quasar.conf.js | 35 +- src/boot/plugins.ts | 44 + src/layouts/MainLayout.vue | 7 + src/pages/home/Home.vue | 8 +- .../components/navigation/PluginLinks.vue | 32 + .../plugin-example-2/pages/NewPlugin.vue | 17 + .../plugin-example-2/pages/OldPlugin.vue | 16 + src/plugins/plugin-example-2/pages/Plugin.vue | 22 + src/plugins/plugin-example-2/plugin.ts | 12 + src/plugins/plugin-example-2/routes/index.ts | 34 + .../components/navigation/PluginLinks.vue | 32 + .../plugin-example/pages/NewPlugin.vue | 17 + .../plugin-example/pages/OldPlugin.vue | 16 + src/plugins/plugin-example/pages/Plugin.vue | 22 + src/plugins/plugin-example/plugin.ts | 14 + src/plugins/plugin-example/routes/index.ts | 34 + src/store/index.ts | 2 +- tsconfig.json | 1 + 20 files changed, 3113 insertions(+), 2749 deletions(-) create mode 100644 src/boot/plugins.ts create mode 100644 src/plugins/plugin-example-2/components/navigation/PluginLinks.vue create mode 100644 src/plugins/plugin-example-2/pages/NewPlugin.vue create mode 100644 src/plugins/plugin-example-2/pages/OldPlugin.vue create mode 100644 src/plugins/plugin-example-2/pages/Plugin.vue create mode 100644 src/plugins/plugin-example-2/plugin.ts create mode 100644 src/plugins/plugin-example-2/routes/index.ts create mode 100644 src/plugins/plugin-example/components/navigation/PluginLinks.vue create mode 100644 src/plugins/plugin-example/pages/NewPlugin.vue create mode 100644 src/plugins/plugin-example/pages/OldPlugin.vue create mode 100644 src/plugins/plugin-example/pages/Plugin.vue create mode 100644 src/plugins/plugin-example/plugin.ts create mode 100644 src/plugins/plugin-example/routes/index.ts diff --git a/package-lock.json b/package-lock.json index 6ca15bf..8cd8737 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", "dev": true, "requires": { - "@babel/highlight": "^7.10.4" + "@babel/highlight": "7.10.4" } }, "@babel/compat-data": { @@ -19,9 +19,9 @@ "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==", "dev": true, "requires": { - "browserslist": "^4.12.0", - "invariant": "^2.2.4", - "semver": "^5.5.0" + "browserslist": "4.14.5", + "invariant": "2.2.4", + "semver": "5.7.1" }, "dependencies": { "semver": { @@ -38,22 +38,22 @@ "integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.11.6", - "@babel/helper-module-transforms": "^7.11.0", - "@babel/helpers": "^7.10.4", - "@babel/parser": "^7.11.5", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.11.5", - "@babel/types": "^7.11.5", - "convert-source-map": "^1.7.0", - "debug": "^4.1.0", - "gensync": "^1.0.0-beta.1", - "json5": "^2.1.2", - "lodash": "^4.17.19", - "resolve": "^1.3.2", - "semver": "^5.4.1", - "source-map": "^0.5.0" + "@babel/code-frame": "7.10.4", + "@babel/generator": "7.11.6", + "@babel/helper-module-transforms": "7.11.0", + "@babel/helpers": "7.10.4", + "@babel/parser": "7.11.5", + "@babel/template": "7.10.4", + "@babel/traverse": "7.11.5", + "@babel/types": "7.11.5", + "convert-source-map": "1.7.0", + "debug": "4.2.0", + "gensync": "1.0.0-beta.1", + "json5": "2.1.3", + "lodash": "4.17.20", + "resolve": "1.17.0", + "semver": "5.7.1", + "source-map": "0.5.7" }, "dependencies": { "debug": { @@ -85,9 +85,9 @@ "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==", "dev": true, "requires": { - "@babel/types": "^7.11.5", - "jsesc": "^2.5.1", - "source-map": "^0.5.0" + "@babel/types": "7.11.5", + "jsesc": "2.5.2", + "source-map": "0.5.7" } }, "@babel/helper-annotate-as-pure": { @@ -96,7 +96,7 @@ "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "7.11.5" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { @@ -105,8 +105,8 @@ "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==", "dev": true, "requires": { - "@babel/helper-explode-assignable-expression": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/helper-explode-assignable-expression": "7.11.4", + "@babel/types": "7.11.5" } }, "@babel/helper-compilation-targets": { @@ -115,11 +115,11 @@ "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==", "dev": true, "requires": { - "@babel/compat-data": "^7.10.4", - "browserslist": "^4.12.0", - "invariant": "^2.2.4", - "levenary": "^1.1.1", - "semver": "^5.5.0" + "@babel/compat-data": "7.11.0", + "browserslist": "4.14.5", + "invariant": "2.2.4", + "levenary": "1.1.1", + "semver": "5.7.1" }, "dependencies": { "semver": { @@ -136,12 +136,12 @@ "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-member-expression-to-functions": "^7.10.5", - "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.10.4" + "@babel/helper-function-name": "7.10.4", + "@babel/helper-member-expression-to-functions": "7.11.0", + "@babel/helper-optimise-call-expression": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-replace-supers": "7.10.4", + "@babel/helper-split-export-declaration": "7.11.0" } }, "@babel/helper-create-regexp-features-plugin": { @@ -150,9 +150,9 @@ "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-regex": "^7.10.4", - "regexpu-core": "^4.7.0" + "@babel/helper-annotate-as-pure": "7.10.4", + "@babel/helper-regex": "7.10.5", + "regexpu-core": "4.7.1" } }, "@babel/helper-define-map": { @@ -161,9 +161,9 @@ "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/types": "^7.10.5", - "lodash": "^4.17.19" + "@babel/helper-function-name": "7.10.4", + "@babel/types": "7.11.5", + "lodash": "4.17.20" } }, "@babel/helper-explode-assignable-expression": { @@ -172,7 +172,7 @@ "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "7.11.5" } }, "@babel/helper-function-name": { @@ -181,9 +181,9 @@ "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/helper-get-function-arity": "7.10.4", + "@babel/template": "7.10.4", + "@babel/types": "7.11.5" } }, "@babel/helper-get-function-arity": { @@ -192,7 +192,7 @@ "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "7.11.5" } }, "@babel/helper-hoist-variables": { @@ -201,7 +201,7 @@ "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "7.11.5" } }, "@babel/helper-member-expression-to-functions": { @@ -210,7 +210,7 @@ "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==", "dev": true, "requires": { - "@babel/types": "^7.11.0" + "@babel/types": "7.11.5" } }, "@babel/helper-module-imports": { @@ -219,7 +219,7 @@ "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "7.11.5" } }, "@babel/helper-module-transforms": { @@ -228,13 +228,13 @@ "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4", - "@babel/helper-simple-access": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/template": "^7.10.4", - "@babel/types": "^7.11.0", - "lodash": "^4.17.19" + "@babel/helper-module-imports": "7.10.4", + "@babel/helper-replace-supers": "7.10.4", + "@babel/helper-simple-access": "7.10.4", + "@babel/helper-split-export-declaration": "7.11.0", + "@babel/template": "7.10.4", + "@babel/types": "7.11.5", + "lodash": "4.17.20" } }, "@babel/helper-optimise-call-expression": { @@ -243,7 +243,7 @@ "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", "dev": true, "requires": { - "@babel/types": "^7.10.4" + "@babel/types": "7.11.5" } }, "@babel/helper-plugin-utils": { @@ -258,7 +258,7 @@ "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==", "dev": true, "requires": { - "lodash": "^4.17.19" + "lodash": "4.17.20" } }, "@babel/helper-remap-async-to-generator": { @@ -267,10 +267,10 @@ "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-wrap-function": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/helper-annotate-as-pure": "7.10.4", + "@babel/helper-wrap-function": "7.10.4", + "@babel/template": "7.10.4", + "@babel/types": "7.11.5" } }, "@babel/helper-replace-supers": { @@ -279,10 +279,10 @@ "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.10.4", - "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/helper-member-expression-to-functions": "7.11.0", + "@babel/helper-optimise-call-expression": "7.10.4", + "@babel/traverse": "7.11.5", + "@babel/types": "7.11.5" } }, "@babel/helper-simple-access": { @@ -291,8 +291,8 @@ "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==", "dev": true, "requires": { - "@babel/template": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/template": "7.10.4", + "@babel/types": "7.11.5" } }, "@babel/helper-skip-transparent-expression-wrappers": { @@ -301,7 +301,7 @@ "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==", "dev": true, "requires": { - "@babel/types": "^7.11.0" + "@babel/types": "7.11.5" } }, "@babel/helper-split-export-declaration": { @@ -310,7 +310,7 @@ "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", "dev": true, "requires": { - "@babel/types": "^7.11.0" + "@babel/types": "7.11.5" } }, "@babel/helper-validator-identifier": { @@ -325,10 +325,10 @@ "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/helper-function-name": "7.10.4", + "@babel/template": "7.10.4", + "@babel/traverse": "7.11.5", + "@babel/types": "7.11.5" } }, "@babel/helpers": { @@ -337,9 +337,9 @@ "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==", "dev": true, "requires": { - "@babel/template": "^7.10.4", - "@babel/traverse": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/template": "7.10.4", + "@babel/traverse": "7.11.5", + "@babel/types": "7.11.5" } }, "@babel/highlight": { @@ -348,9 +348,9 @@ "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" + "@babel/helper-validator-identifier": "7.10.4", + "chalk": "2.4.2", + "js-tokens": "4.0.0" }, "dependencies": { "chalk": { @@ -359,9 +359,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } } } @@ -378,9 +378,9 @@ "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-remap-async-to-generator": "^7.10.4", - "@babel/plugin-syntax-async-generators": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-remap-async-to-generator": "7.11.4", + "@babel/plugin-syntax-async-generators": "7.8.4" } }, "@babel/plugin-proposal-class-properties": { @@ -389,8 +389,8 @@ "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-class-features-plugin": "7.10.5", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-proposal-decorators": { @@ -399,9 +399,9 @@ "integrity": "sha512-Sc5TAQSZuLzgY0664mMDn24Vw2P8g/VhyLyGPaWiHahhgLqeZvcGeyBZOrJW0oSKIK2mvQ22a1ENXBIQLhrEiQ==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.10.5", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-decorators": "^7.10.4" + "@babel/helper-create-class-features-plugin": "7.10.5", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-decorators": "7.10.4" } }, "@babel/plugin-proposal-dynamic-import": { @@ -410,8 +410,8 @@ "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-dynamic-import": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-dynamic-import": "7.8.3" } }, "@babel/plugin-proposal-export-namespace-from": { @@ -420,8 +420,8 @@ "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-export-namespace-from": "7.8.3" } }, "@babel/plugin-proposal-function-sent": { @@ -430,9 +430,9 @@ "integrity": "sha512-aBtve/DhQsVPAGnSDcgt33gF36rO0TK+KtHp9Hwtj3KwH+o1Cii9vfVVYeB9c6Jo1SXOgTRwRD7ljpTS0qbN8w==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-wrap-function": "^7.10.4", - "@babel/plugin-syntax-function-sent": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-wrap-function": "7.10.4", + "@babel/plugin-syntax-function-sent": "7.10.4" } }, "@babel/plugin-proposal-json-strings": { @@ -441,8 +441,8 @@ "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-json-strings": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-json-strings": "7.8.3" } }, "@babel/plugin-proposal-logical-assignment-operators": { @@ -451,8 +451,8 @@ "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-logical-assignment-operators": "7.10.4" } }, "@babel/plugin-proposal-nullish-coalescing-operator": { @@ -461,8 +461,8 @@ "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "7.8.3" } }, "@babel/plugin-proposal-numeric-separator": { @@ -471,8 +471,8 @@ "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-numeric-separator": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-numeric-separator": "7.10.4" } }, "@babel/plugin-proposal-object-rest-spread": { @@ -481,9 +481,9 @@ "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-transform-parameters": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-object-rest-spread": "7.8.3", + "@babel/plugin-transform-parameters": "7.10.5" } }, "@babel/plugin-proposal-optional-catch-binding": { @@ -492,8 +492,8 @@ "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-optional-catch-binding": "7.8.3" } }, "@babel/plugin-proposal-optional-chaining": { @@ -502,9 +502,9 @@ "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-skip-transparent-expression-wrappers": "7.11.0", + "@babel/plugin-syntax-optional-chaining": "7.8.3" } }, "@babel/plugin-proposal-private-methods": { @@ -513,8 +513,8 @@ "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-class-features-plugin": "7.10.5", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-proposal-throw-expressions": { @@ -523,8 +523,8 @@ "integrity": "sha512-m7K9duXeH/rko36i9G9seLOg2AVdeVTn65k8nnTxgozex0hkDSUr6cktJxTO7jElGEpmMz410pTs0Jn8+empxw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-syntax-throw-expressions": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-syntax-throw-expressions": "7.10.4" } }, "@babel/plugin-proposal-unicode-property-regex": { @@ -533,8 +533,8 @@ "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-regexp-features-plugin": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-async-generators": { @@ -543,7 +543,7 @@ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-class-properties": { @@ -552,7 +552,7 @@ "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-decorators": { @@ -561,7 +561,7 @@ "integrity": "sha512-2NaoC6fAk2VMdhY1eerkfHV+lVYC1u8b+jmRJISqANCJlTxYy19HGdIkkQtix2UtkcPuPu+IlDgrVseZnU03bw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-dynamic-import": { @@ -570,7 +570,7 @@ "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-export-namespace-from": { @@ -579,7 +579,7 @@ "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.3" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-function-sent": { @@ -588,7 +588,7 @@ "integrity": "sha512-dwElaRoDQhlVevbgKOlEUTe08QNJo4ZjWw3rqnMbEvH8NRJM+iPN2tTQtzyfNloXD8f3Jdiyf5Pn400B1U3SVA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-import-meta": { @@ -597,7 +597,7 @@ "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-json-strings": { @@ -606,7 +606,7 @@ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-logical-assignment-operators": { @@ -615,7 +615,7 @@ "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-nullish-coalescing-operator": { @@ -624,7 +624,7 @@ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-numeric-separator": { @@ -633,7 +633,7 @@ "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-object-rest-spread": { @@ -642,7 +642,7 @@ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-optional-catch-binding": { @@ -651,7 +651,7 @@ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-optional-chaining": { @@ -660,7 +660,7 @@ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.8.0" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-throw-expressions": { @@ -669,7 +669,7 @@ "integrity": "sha512-Yac/4W71+JdAiOV3aLbnUUe2R0NZzNvdy5EqdauFnBQTxIXT58M89lOplIFVELTSus6PxFMjmbi2vXaJDiV/PQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-syntax-top-level-await": { @@ -678,7 +678,7 @@ "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-arrow-functions": { @@ -687,7 +687,7 @@ "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-async-to-generator": { @@ -696,9 +696,9 @@ "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-remap-async-to-generator": "^7.10.4" + "@babel/helper-module-imports": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-remap-async-to-generator": "7.11.4" } }, "@babel/plugin-transform-block-scoped-functions": { @@ -707,7 +707,7 @@ "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-block-scoping": { @@ -716,7 +716,7 @@ "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-classes": { @@ -725,14 +725,14 @@ "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-define-map": "^7.10.4", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-optimise-call-expression": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.10.4", - "globals": "^11.1.0" + "@babel/helper-annotate-as-pure": "7.10.4", + "@babel/helper-define-map": "7.10.5", + "@babel/helper-function-name": "7.10.4", + "@babel/helper-optimise-call-expression": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-replace-supers": "7.10.4", + "@babel/helper-split-export-declaration": "7.11.0", + "globals": "11.12.0" } }, "@babel/plugin-transform-computed-properties": { @@ -741,7 +741,7 @@ "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-destructuring": { @@ -750,7 +750,7 @@ "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-dotall-regex": { @@ -759,8 +759,8 @@ "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-regexp-features-plugin": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-duplicate-keys": { @@ -769,7 +769,7 @@ "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-exponentiation-operator": { @@ -778,8 +778,8 @@ "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-builder-binary-assignment-operator-visitor": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-for-of": { @@ -788,7 +788,7 @@ "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-function-name": { @@ -797,8 +797,8 @@ "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-function-name": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-literals": { @@ -807,7 +807,7 @@ "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-member-expression-literals": { @@ -816,7 +816,7 @@ "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-modules-amd": { @@ -825,9 +825,9 @@ "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.10.5", - "@babel/helper-plugin-utils": "^7.10.4", - "babel-plugin-dynamic-import-node": "^2.3.3" + "@babel/helper-module-transforms": "7.11.0", + "@babel/helper-plugin-utils": "7.10.4", + "babel-plugin-dynamic-import-node": "2.3.3" } }, "@babel/plugin-transform-modules-commonjs": { @@ -836,10 +836,10 @@ "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-simple-access": "^7.10.4", - "babel-plugin-dynamic-import-node": "^2.3.3" + "@babel/helper-module-transforms": "7.11.0", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-simple-access": "7.10.4", + "babel-plugin-dynamic-import-node": "2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { @@ -848,10 +848,10 @@ "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.10.4", - "@babel/helper-module-transforms": "^7.10.5", - "@babel/helper-plugin-utils": "^7.10.4", - "babel-plugin-dynamic-import-node": "^2.3.3" + "@babel/helper-hoist-variables": "7.10.4", + "@babel/helper-module-transforms": "7.11.0", + "@babel/helper-plugin-utils": "7.10.4", + "babel-plugin-dynamic-import-node": "2.3.3" } }, "@babel/plugin-transform-modules-umd": { @@ -860,8 +860,8 @@ "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-module-transforms": "7.11.0", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-named-capturing-groups-regex": { @@ -870,7 +870,7 @@ "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.4" + "@babel/helper-create-regexp-features-plugin": "7.10.4" } }, "@babel/plugin-transform-new-target": { @@ -879,7 +879,7 @@ "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-object-super": { @@ -888,8 +888,8 @@ "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-replace-supers": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-replace-supers": "7.10.4" } }, "@babel/plugin-transform-parameters": { @@ -898,8 +898,8 @@ "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-get-function-arity": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-property-literals": { @@ -908,7 +908,7 @@ "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-regenerator": { @@ -917,7 +917,7 @@ "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==", "dev": true, "requires": { - "regenerator-transform": "^0.14.2" + "regenerator-transform": "0.14.5" } }, "@babel/plugin-transform-reserved-words": { @@ -926,7 +926,7 @@ "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-runtime": { @@ -935,10 +935,10 @@ "integrity": "sha512-9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "resolve": "^1.8.1", - "semver": "^5.5.1" + "@babel/helper-module-imports": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4", + "resolve": "1.17.0", + "semver": "5.7.1" }, "dependencies": { "semver": { @@ -955,7 +955,7 @@ "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-spread": { @@ -964,8 +964,8 @@ "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-skip-transparent-expression-wrappers": "7.11.0" } }, "@babel/plugin-transform-sticky-regex": { @@ -974,8 +974,8 @@ "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/helper-regex": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/helper-regex": "7.10.5" } }, "@babel/plugin-transform-template-literals": { @@ -984,8 +984,8 @@ "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-annotate-as-pure": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-typeof-symbol": { @@ -994,7 +994,7 @@ "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-unicode-escapes": { @@ -1003,7 +1003,7 @@ "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/plugin-transform-unicode-regex": { @@ -1012,8 +1012,8 @@ "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4" + "@babel/helper-create-regexp-features-plugin": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4" } }, "@babel/preset-env": { @@ -1022,74 +1022,74 @@ "integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==", "dev": true, "requires": { - "@babel/compat-data": "^7.11.0", - "@babel/helper-compilation-targets": "^7.10.4", - "@babel/helper-module-imports": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/plugin-proposal-async-generator-functions": "^7.10.4", - "@babel/plugin-proposal-class-properties": "^7.10.4", - "@babel/plugin-proposal-dynamic-import": "^7.10.4", - "@babel/plugin-proposal-export-namespace-from": "^7.10.4", - "@babel/plugin-proposal-json-strings": "^7.10.4", - "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0", - "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4", - "@babel/plugin-proposal-numeric-separator": "^7.10.4", - "@babel/plugin-proposal-object-rest-spread": "^7.11.0", - "@babel/plugin-proposal-optional-catch-binding": "^7.10.4", - "@babel/plugin-proposal-optional-chaining": "^7.11.0", - "@babel/plugin-proposal-private-methods": "^7.10.4", - "@babel/plugin-proposal-unicode-property-regex": "^7.10.4", - "@babel/plugin-syntax-async-generators": "^7.8.0", - "@babel/plugin-syntax-class-properties": "^7.10.4", - "@babel/plugin-syntax-dynamic-import": "^7.8.0", - "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-json-strings": "^7.8.0", - "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", - "@babel/plugin-syntax-numeric-separator": "^7.10.4", - "@babel/plugin-syntax-object-rest-spread": "^7.8.0", - "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", - "@babel/plugin-syntax-optional-chaining": "^7.8.0", - "@babel/plugin-syntax-top-level-await": "^7.10.4", - "@babel/plugin-transform-arrow-functions": "^7.10.4", - "@babel/plugin-transform-async-to-generator": "^7.10.4", - "@babel/plugin-transform-block-scoped-functions": "^7.10.4", - "@babel/plugin-transform-block-scoping": "^7.10.4", - "@babel/plugin-transform-classes": "^7.10.4", - "@babel/plugin-transform-computed-properties": "^7.10.4", - "@babel/plugin-transform-destructuring": "^7.10.4", - "@babel/plugin-transform-dotall-regex": "^7.10.4", - "@babel/plugin-transform-duplicate-keys": "^7.10.4", - "@babel/plugin-transform-exponentiation-operator": "^7.10.4", - "@babel/plugin-transform-for-of": "^7.10.4", - "@babel/plugin-transform-function-name": "^7.10.4", - "@babel/plugin-transform-literals": "^7.10.4", - "@babel/plugin-transform-member-expression-literals": "^7.10.4", - "@babel/plugin-transform-modules-amd": "^7.10.4", - "@babel/plugin-transform-modules-commonjs": "^7.10.4", - "@babel/plugin-transform-modules-systemjs": "^7.10.4", - "@babel/plugin-transform-modules-umd": "^7.10.4", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4", - "@babel/plugin-transform-new-target": "^7.10.4", - "@babel/plugin-transform-object-super": "^7.10.4", - "@babel/plugin-transform-parameters": "^7.10.4", - "@babel/plugin-transform-property-literals": "^7.10.4", - "@babel/plugin-transform-regenerator": "^7.10.4", - "@babel/plugin-transform-reserved-words": "^7.10.4", - "@babel/plugin-transform-shorthand-properties": "^7.10.4", - "@babel/plugin-transform-spread": "^7.11.0", - "@babel/plugin-transform-sticky-regex": "^7.10.4", - "@babel/plugin-transform-template-literals": "^7.10.4", - "@babel/plugin-transform-typeof-symbol": "^7.10.4", - "@babel/plugin-transform-unicode-escapes": "^7.10.4", - "@babel/plugin-transform-unicode-regex": "^7.10.4", - "@babel/preset-modules": "^0.1.3", - "@babel/types": "^7.11.5", - "browserslist": "^4.12.0", - "core-js-compat": "^3.6.2", - "invariant": "^2.2.2", - "levenary": "^1.1.1", - "semver": "^5.5.0" + "@babel/compat-data": "7.11.0", + "@babel/helper-compilation-targets": "7.10.4", + "@babel/helper-module-imports": "7.10.4", + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-proposal-async-generator-functions": "7.10.5", + "@babel/plugin-proposal-class-properties": "7.10.4", + "@babel/plugin-proposal-dynamic-import": "7.10.4", + "@babel/plugin-proposal-export-namespace-from": "7.10.4", + "@babel/plugin-proposal-json-strings": "7.10.4", + "@babel/plugin-proposal-logical-assignment-operators": "7.11.0", + "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.4", + "@babel/plugin-proposal-numeric-separator": "7.10.4", + "@babel/plugin-proposal-object-rest-spread": "7.11.0", + "@babel/plugin-proposal-optional-catch-binding": "7.10.4", + "@babel/plugin-proposal-optional-chaining": "7.11.0", + "@babel/plugin-proposal-private-methods": "7.10.4", + "@babel/plugin-proposal-unicode-property-regex": "7.10.4", + "@babel/plugin-syntax-async-generators": "7.8.4", + "@babel/plugin-syntax-class-properties": "7.10.4", + "@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", + "@babel/plugin-syntax-logical-assignment-operators": "7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "7.8.3", + "@babel/plugin-syntax-numeric-separator": "7.10.4", + "@babel/plugin-syntax-object-rest-spread": "7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "7.8.3", + "@babel/plugin-syntax-optional-chaining": "7.8.3", + "@babel/plugin-syntax-top-level-await": "7.10.4", + "@babel/plugin-transform-arrow-functions": "7.10.4", + "@babel/plugin-transform-async-to-generator": "7.10.4", + "@babel/plugin-transform-block-scoped-functions": "7.10.4", + "@babel/plugin-transform-block-scoping": "7.11.1", + "@babel/plugin-transform-classes": "7.10.4", + "@babel/plugin-transform-computed-properties": "7.10.4", + "@babel/plugin-transform-destructuring": "7.10.4", + "@babel/plugin-transform-dotall-regex": "7.10.4", + "@babel/plugin-transform-duplicate-keys": "7.10.4", + "@babel/plugin-transform-exponentiation-operator": "7.10.4", + "@babel/plugin-transform-for-of": "7.10.4", + "@babel/plugin-transform-function-name": "7.10.4", + "@babel/plugin-transform-literals": "7.10.4", + "@babel/plugin-transform-member-expression-literals": "7.10.4", + "@babel/plugin-transform-modules-amd": "7.10.5", + "@babel/plugin-transform-modules-commonjs": "7.10.4", + "@babel/plugin-transform-modules-systemjs": "7.10.5", + "@babel/plugin-transform-modules-umd": "7.10.4", + "@babel/plugin-transform-named-capturing-groups-regex": "7.10.4", + "@babel/plugin-transform-new-target": "7.10.4", + "@babel/plugin-transform-object-super": "7.10.4", + "@babel/plugin-transform-parameters": "7.10.5", + "@babel/plugin-transform-property-literals": "7.10.4", + "@babel/plugin-transform-regenerator": "7.10.4", + "@babel/plugin-transform-reserved-words": "7.10.4", + "@babel/plugin-transform-shorthand-properties": "7.10.4", + "@babel/plugin-transform-spread": "7.11.0", + "@babel/plugin-transform-sticky-regex": "7.10.4", + "@babel/plugin-transform-template-literals": "7.10.5", + "@babel/plugin-transform-typeof-symbol": "7.10.4", + "@babel/plugin-transform-unicode-escapes": "7.10.4", + "@babel/plugin-transform-unicode-regex": "7.10.4", + "@babel/preset-modules": "0.1.4", + "@babel/types": "7.11.5", + "browserslist": "4.14.5", + "core-js-compat": "3.6.5", + "invariant": "2.2.4", + "levenary": "1.1.1", + "semver": "5.7.1" }, "dependencies": { "semver": { @@ -1106,11 +1106,11 @@ "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.0.0", - "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", - "@babel/plugin-transform-dotall-regex": "^7.4.4", - "@babel/types": "^7.4.4", - "esutils": "^2.0.2" + "@babel/helper-plugin-utils": "7.10.4", + "@babel/plugin-proposal-unicode-property-regex": "7.10.4", + "@babel/plugin-transform-dotall-regex": "7.10.4", + "@babel/types": "7.11.5", + "esutils": "2.0.3" } }, "@babel/runtime": { @@ -1119,7 +1119,7 @@ "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==", "dev": true, "requires": { - "regenerator-runtime": "^0.13.4" + "regenerator-runtime": "0.13.7" } }, "@babel/template": { @@ -1128,9 +1128,9 @@ "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/parser": "^7.10.4", - "@babel/types": "^7.10.4" + "@babel/code-frame": "7.10.4", + "@babel/parser": "7.11.5", + "@babel/types": "7.11.5" } }, "@babel/traverse": { @@ -1139,15 +1139,15 @@ "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.10.4", - "@babel/generator": "^7.11.5", - "@babel/helper-function-name": "^7.10.4", - "@babel/helper-split-export-declaration": "^7.11.0", - "@babel/parser": "^7.11.5", - "@babel/types": "^7.11.5", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.19" + "@babel/code-frame": "7.10.4", + "@babel/generator": "7.11.6", + "@babel/helper-function-name": "7.10.4", + "@babel/helper-split-export-declaration": "7.11.0", + "@babel/parser": "7.11.5", + "@babel/types": "7.11.5", + "debug": "4.2.0", + "globals": "11.12.0", + "lodash": "4.17.20" }, "dependencies": { "debug": { @@ -1173,9 +1173,9 @@ "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "^7.10.4", - "lodash": "^4.17.19", - "to-fast-properties": "^2.0.0" + "@babel/helper-validator-identifier": "7.10.4", + "lodash": "4.17.20", + "to-fast-properties": "2.0.0" } }, "@electron/get": { @@ -1184,15 +1184,15 @@ "integrity": "sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==", "dev": true, "requires": { - "debug": "^4.1.1", - "env-paths": "^2.2.0", - "fs-extra": "^8.1.0", - "global-agent": "^2.0.2", - "global-tunnel-ng": "^2.7.1", - "got": "^9.6.0", - "progress": "^2.0.3", - "sanitize-filename": "^1.6.2", - "sumchecker": "^3.0.1" + "debug": "4.2.0", + "env-paths": "2.2.0", + "fs-extra": "8.1.0", + "global-agent": "2.1.12", + "global-tunnel-ng": "2.7.1", + "got": "9.6.0", + "progress": "2.0.3", + "sanitize-filename": "1.6.3", + "sumchecker": "3.0.1" }, "dependencies": { "debug": { @@ -1210,9 +1210,9 @@ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "dev": true, "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "graceful-fs": "4.2.4", + "jsonfile": "4.0.0", + "universalify": "0.1.2" } }, "ms": { @@ -1230,7 +1230,7 @@ "dev": true, "requires": { "@nodelib/fs.stat": "2.0.3", - "run-parallel": "^1.1.9" + "run-parallel": "1.1.9" } }, "@nodelib/fs.stat": { @@ -1246,7 +1246,7 @@ "dev": true, "requires": { "@nodelib/fs.scandir": "2.1.3", - "fastq": "^1.6.0" + "fastq": "1.8.0" } }, "@npmcli/move-file": { @@ -1255,7 +1255,7 @@ "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==", "dev": true, "requires": { - "mkdirp": "^1.0.4" + "mkdirp": "1.0.4" }, "dependencies": { "mkdirp": { @@ -1290,7 +1290,7 @@ "@types/webpack-dev-server": "3.11.0", "archiver": "5.0.0", "autoprefixer": "9.8.6", - "browserslist": "^4.12.0", + "browserslist": "4.14.5", "chalk": "4.1.0", "chokidar": "3.4.2", "ci-info": "2.0.0", @@ -1355,6 +1355,28 @@ "write-file-webpack-plugin": "4.5.1", "yargs": "15.4.1", "zlib": "1.0.5" + }, + "dependencies": { + "@types/webpack": { + "version": "4.41.17", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.17.tgz", + "integrity": "sha512-6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw==", + "dev": true, + "requires": { + "@types/anymatch": "1.3.1", + "@types/node": "10.17.35", + "@types/tapable": "1.0.6", + "@types/uglify-js": "3.11.0", + "@types/webpack-sources": "2.0.0", + "source-map": "0.6.1" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "@quasar/babel-preset-app": { @@ -1363,26 +1385,26 @@ "integrity": "sha512-Eiu8B2rFl3nEvA+PYaybcXknkXcgVy//OqM7+f5fu3UEVw050/JyHBsrnBOMc+muon16Og1RKxOVmQuAWDS1hA==", "dev": true, "requires": { - "@babel/core": "^7.9.0", - "@babel/helper-compilation-targets": "^7.9.6", - "@babel/helper-module-imports": "^7.8.3", - "@babel/plugin-proposal-class-properties": "^7.5.5", - "@babel/plugin-proposal-decorators": "^7.4.4", - "@babel/plugin-proposal-export-namespace-from": "^7.2.0", - "@babel/plugin-proposal-function-sent": "^7.2.0", - "@babel/plugin-proposal-json-strings": "^7.2.0", - "@babel/plugin-proposal-numeric-separator": "^7.2.0", - "@babel/plugin-proposal-throw-expressions": "^7.2.0", - "@babel/plugin-syntax-dynamic-import": "^7.2.0", - "@babel/plugin-syntax-import-meta": "^7.2.0", - "@babel/plugin-transform-runtime": "^7.9.0", - "@babel/preset-env": "^7.9.0", - "@babel/runtime": "^7.9.0", - "babel-loader": "^8.0.6", - "babel-plugin-dynamic-import-node": "^2.3.0", - "babel-plugin-module-resolver": "^4.0.0", - "core-js": "^3.6.5", - "core-js-compat": "^3.6.5" + "@babel/core": "7.11.6", + "@babel/helper-compilation-targets": "7.10.4", + "@babel/helper-module-imports": "7.10.4", + "@babel/plugin-proposal-class-properties": "7.10.4", + "@babel/plugin-proposal-decorators": "7.10.5", + "@babel/plugin-proposal-export-namespace-from": "7.10.4", + "@babel/plugin-proposal-function-sent": "7.10.4", + "@babel/plugin-proposal-json-strings": "7.10.4", + "@babel/plugin-proposal-numeric-separator": "7.10.4", + "@babel/plugin-proposal-throw-expressions": "7.10.4", + "@babel/plugin-syntax-dynamic-import": "7.8.3", + "@babel/plugin-syntax-import-meta": "7.10.4", + "@babel/plugin-transform-runtime": "7.11.5", + "@babel/preset-env": "7.11.5", + "@babel/runtime": "7.11.2", + "babel-loader": "8.1.0", + "babel-plugin-dynamic-import-node": "2.3.3", + "babel-plugin-module-resolver": "4.0.0", + "core-js": "3.6.5", + "core-js-compat": "3.6.5" } }, "@quasar/extras": { @@ -1408,7 +1430,7 @@ "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", "dev": true, "requires": { - "defer-to-connect": "^1.0.1" + "defer-to-connect": "1.1.3" } }, "@types/anymatch": { @@ -1423,8 +1445,8 @@ "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==", "dev": true, "requires": { - "@types/connect": "*", - "@types/node": "*" + "@types/connect": "3.4.33", + "@types/node": "10.17.35" } }, "@types/color-name": { @@ -1439,7 +1461,7 @@ "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", "dev": true, "requires": { - "@types/node": "*" + "@types/node": "10.17.35" } }, "@types/connect-history-api-fallback": { @@ -1448,8 +1470,8 @@ "integrity": "sha512-7SxFCd+FLlxCfwVwbyPxbR4khL9aNikJhrorw8nUIOqeuooc9gifBuDQOJw5kzN7i6i3vLn9G8Wde/4QDihpYw==", "dev": true, "requires": { - "@types/express-serve-static-core": "*", - "@types/node": "*" + "@types/express-serve-static-core": "4.17.13", + "@types/node": "10.17.35" } }, "@types/cordova": { @@ -1464,10 +1486,10 @@ "integrity": "sha512-n47/AbT4DEYPyXtES2myPyKCxVE3hICAB3MnpoVg+Ba8CLBGOpUUsNJ5fyLhfKt5N06sT9nTk4eAc+rtYVpvTQ==", "dev": true, "requires": { - "@electron/get": "^1.3.1", - "@types/node": "*", - "electron-notarize": "^0.1.1", - "electron-osx-sign": "^0.4.11" + "@electron/get": "1.12.2", + "@types/node": "10.17.35", + "electron-notarize": "0.1.1", + "electron-osx-sign": "0.4.17" } }, "@types/eslint-visitor-keys": { @@ -1482,10 +1504,10 @@ "integrity": "sha512-n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==", "dev": true, "requires": { - "@types/body-parser": "*", - "@types/express-serve-static-core": "*", - "@types/qs": "*", - "@types/serve-static": "*" + "@types/body-parser": "1.19.0", + "@types/express-serve-static-core": "4.17.13", + "@types/qs": "6.9.5", + "@types/serve-static": "1.13.5" } }, "@types/express-serve-static-core": { @@ -1494,9 +1516,9 @@ "integrity": "sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA==", "dev": true, "requires": { - "@types/node": "*", - "@types/qs": "*", - "@types/range-parser": "*" + "@types/node": "10.17.35", + "@types/qs": "6.9.5", + "@types/range-parser": "1.2.3" } }, "@types/glob": { @@ -1505,8 +1527,8 @@ "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", "dev": true, "requires": { - "@types/minimatch": "*", - "@types/node": "*" + "@types/minimatch": "3.0.3", + "@types/node": "10.17.35" } }, "@types/html-minifier-terser": { @@ -1521,7 +1543,7 @@ "integrity": "sha512-IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==", "dev": true, "requires": { - "@types/node": "*" + "@types/node": "10.17.35" } }, "@types/http-proxy-middleware": { @@ -1530,9 +1552,9 @@ "integrity": "sha512-lnBTx6HCOUeIJMLbI/LaL5EmdKLhczJY5oeXZpX/cXE4rRqb3RmV7VcMpiEfYkmTjipv3h7IAyIINe4plEv7cA==", "dev": true, "requires": { - "@types/connect": "*", - "@types/http-proxy": "*", - "@types/node": "*" + "@types/connect": "3.4.33", + "@types/http-proxy": "1.17.4", + "@types/node": "10.17.35" } }, "@types/json-schema": { @@ -1589,8 +1611,8 @@ "integrity": "sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==", "dev": true, "requires": { - "@types/express-serve-static-core": "*", - "@types/mime": "*" + "@types/express-serve-static-core": "4.17.13", + "@types/mime": "2.0.3" } }, "@types/source-list-map": { @@ -1611,8 +1633,8 @@ "integrity": "sha512-K5C7izOT8rR4qiE2vfXcQNEJN4lT9cq/2qJgpMUWR2HsjDW/KVrHx2CaHuaXvaqDNsRmdELPLaxeJHiI4GjVrA==", "dev": true, "requires": { - "@types/webpack": "*", - "terser": "^4.6.13" + "@types/webpack": "4.41.22", + "terser": "4.8.0" } }, "@types/uglify-js": { @@ -1621,7 +1643,7 @@ "integrity": "sha512-I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q==", "dev": true, "requires": { - "source-map": "^0.6.1" + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -1633,17 +1655,17 @@ } }, "@types/webpack": { - "version": "4.41.17", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.17.tgz", - "integrity": "sha512-6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw==", + "version": "4.41.22", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.22.tgz", + "integrity": "sha512-JQDJK6pj8OMV9gWOnN1dcLCyU9Hzs6lux0wBO4lr1+gyEhIBR9U3FMrz12t2GPkg110XAxEAw2WHF6g7nZIbRQ==", "dev": true, "requires": { - "@types/anymatch": "*", - "@types/node": "*", - "@types/tapable": "*", - "@types/uglify-js": "*", - "@types/webpack-sources": "*", - "source-map": "^0.6.0" + "@types/anymatch": "1.3.1", + "@types/node": "10.17.35", + "@types/tapable": "1.0.6", + "@types/uglify-js": "3.11.0", + "@types/webpack-sources": "2.0.0", + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -1660,7 +1682,7 @@ "integrity": "sha512-Ah6FbkXLAVUNI/ExXHsTS90iRS/Efplh333NySjhGx09oeH9qXf57NMUfl4RADTL5a89hQaq/nbT4eb0LwsQJw==", "dev": true, "requires": { - "@types/webpack": "*" + "@types/webpack": "4.41.22" } }, "@types/webpack-dev-server": { @@ -1669,22 +1691,28 @@ "integrity": "sha512-3+86AgSzl18n5P1iUP9/lz3G3GMztCp+wxdDvVuNhx1sr1jE79GpYfKHL8k+Vht3N74K2n98CuAEw4YPJCYtDA==", "dev": true, "requires": { - "@types/connect-history-api-fallback": "*", - "@types/express": "*", - "@types/http-proxy-middleware": "*", - "@types/serve-static": "*", - "@types/webpack": "*" + "@types/connect-history-api-fallback": "1.3.3", + "@types/express": "4.17.6", + "@types/http-proxy-middleware": "0.19.3", + "@types/serve-static": "1.13.5", + "@types/webpack": "4.41.22" } }, + "@types/webpack-env": { + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.15.3.tgz", + "integrity": "sha512-5oiXqR7kwDGZ6+gmzIO2lTC+QsriNuQXZDWNYRV3l2XRN/zmPgnC21DLSx2D05zvD8vnXW6qUg7JnXZ4I6qLVQ==", + "dev": true + }, "@types/webpack-sources": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.0.0.tgz", "integrity": "sha512-a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==", "dev": true, "requires": { - "@types/node": "*", - "@types/source-list-map": "*", - "source-map": "^0.7.3" + "@types/node": "10.17.35", + "@types/source-list-map": "0.1.2", + "source-map": "0.7.3" }, "dependencies": { "source-map": { @@ -1702,11 +1730,11 @@ "dev": true, "requires": { "@typescript-eslint/experimental-utils": "3.10.1", - "debug": "^4.1.1", - "functional-red-black-tree": "^1.0.1", - "regexpp": "^3.0.0", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "debug": "4.2.0", + "functional-red-black-tree": "1.0.1", + "regexpp": "3.1.0", + "semver": "7.3.2", + "tsutils": "3.17.1" }, "dependencies": { "debug": { @@ -1732,11 +1760,11 @@ "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==", "dev": true, "requires": { - "@types/json-schema": "^7.0.3", + "@types/json-schema": "7.0.6", "@typescript-eslint/types": "3.10.1", "@typescript-eslint/typescript-estree": "3.10.1", - "eslint-scope": "^5.0.0", - "eslint-utils": "^2.0.0" + "eslint-scope": "5.1.1", + "eslint-utils": "2.1.0" }, "dependencies": { "eslint-scope": { @@ -1745,8 +1773,8 @@ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" + "esrecurse": "4.3.0", + "estraverse": "4.3.0" } } } @@ -1757,11 +1785,11 @@ "integrity": "sha512-Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==", "dev": true, "requires": { - "@types/eslint-visitor-keys": "^1.0.0", + "@types/eslint-visitor-keys": "1.0.0", "@typescript-eslint/experimental-utils": "3.10.1", "@typescript-eslint/types": "3.10.1", "@typescript-eslint/typescript-estree": "3.10.1", - "eslint-visitor-keys": "^1.1.0" + "eslint-visitor-keys": "1.3.0" } }, "@typescript-eslint/types": { @@ -1778,12 +1806,12 @@ "requires": { "@typescript-eslint/types": "3.10.1", "@typescript-eslint/visitor-keys": "3.10.1", - "debug": "^4.1.1", - "glob": "^7.1.6", - "is-glob": "^4.0.1", - "lodash": "^4.17.15", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "debug": "4.2.0", + "glob": "7.1.6", + "is-glob": "4.0.1", + "lodash": "4.17.20", + "semver": "7.3.2", + "tsutils": "3.17.1" }, "dependencies": { "debug": { @@ -1809,7 +1837,7 @@ "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" + "eslint-visitor-keys": "1.3.0" } }, "@vue/component-compiler-utils": { @@ -1818,15 +1846,15 @@ "integrity": "sha512-lejBLa7xAMsfiZfNp7Kv51zOzifnb29FwdnMLa96z26kXErPFioSf9BMcePVIQ6/Gc6/mC0UrPpxAWIHyae0vw==", "dev": true, "requires": { - "consolidate": "^0.15.1", - "hash-sum": "^1.0.2", - "lru-cache": "^4.1.2", - "merge-source-map": "^1.1.0", - "postcss": "^7.0.14", - "postcss-selector-parser": "^6.0.2", - "prettier": "^1.18.2", - "source-map": "~0.6.1", - "vue-template-es2015-compiler": "^1.9.0" + "consolidate": "0.15.1", + "hash-sum": "1.0.2", + "lru-cache": "4.1.5", + "merge-source-map": "1.1.0", + "postcss": "7.0.35", + "postcss-selector-parser": "6.0.4", + "prettier": "1.19.1", + "source-map": "0.6.1", + "vue-template-es2015-compiler": "1.9.1" }, "dependencies": { "lru-cache": { @@ -1858,7 +1886,7 @@ "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-0.6.7.tgz", "integrity": "sha512-WAWEQK4urEsMNe3OyOp7VnMmegRZT2yRB3fDGLRXPMdfuo4+nM+uMEhUgDiUg9LFSXfLWhjwuFOJ2hnS2X7AUw==", "requires": { - "tslib": "^2.0.0" + "tslib": "2.0.1" } }, "@webassemblyjs/ast": { @@ -1938,7 +1966,7 @@ "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==", "dev": true, "requires": { - "@xtuc/ieee754": "^1.2.0" + "@xtuc/ieee754": "1.2.0" } }, "@webassemblyjs/leb128": { @@ -2060,7 +2088,7 @@ "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", "dev": true, "requires": { - "mime-types": "~2.1.24", + "mime-types": "2.1.27", "negotiator": "0.6.2" } }, @@ -2088,8 +2116,8 @@ "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" + "clean-stack": "2.2.0", + "indent-string": "4.0.0" } }, "ajv": { @@ -2098,10 +2126,10 @@ "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", "dev": true, "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "fast-deep-equal": "3.1.3", + "fast-json-stable-stringify": "2.1.0", + "json-schema-traverse": "0.4.1", + "uri-js": "4.4.0" } }, "ajv-errors": { @@ -2140,7 +2168,7 @@ "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", "dev": true, "requires": { - "type-fest": "^0.11.0" + "type-fest": "0.11.0" }, "dependencies": { "type-fest": { @@ -2169,7 +2197,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.3" } }, "anymatch": { @@ -2178,8 +2206,8 @@ "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", "dev": true, "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" + "normalize-path": "3.0.0", + "picomatch": "2.2.2" } }, "aproba": { @@ -2194,13 +2222,13 @@ "integrity": "sha512-AEWhJz6Yi6hWtN1Sqy/H4sZo/lLMJ/NftXxGaDy/TnOMmmjsRaZc/Ts+U4BsPoBQkuunTN6t8hk7iU9A+HBxLw==", "dev": true, "requires": { - "archiver-utils": "^2.1.0", - "async": "^3.2.0", - "buffer-crc32": "^0.2.1", - "readable-stream": "^3.6.0", - "readdir-glob": "^1.0.0", - "tar-stream": "^2.1.2", - "zip-stream": "^4.0.0" + "archiver-utils": "2.1.0", + "async": "3.2.0", + "buffer-crc32": "0.2.13", + "readable-stream": "3.6.0", + "readdir-glob": "1.1.0", + "tar-stream": "2.1.4", + "zip-stream": "4.0.2" } }, "archiver-utils": { @@ -2209,16 +2237,16 @@ "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", "dev": true, "requires": { - "glob": "^7.1.4", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", - "lodash.defaults": "^4.2.0", - "lodash.difference": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^2.0.0" + "glob": "7.1.6", + "graceful-fs": "4.2.4", + "lazystream": "1.0.0", + "lodash.defaults": "4.2.0", + "lodash.difference": "4.5.0", + "lodash.flatten": "4.4.0", + "lodash.isplainobject": "4.0.6", + "lodash.union": "4.6.0", + "normalize-path": "3.0.0", + "readable-stream": "2.3.7" }, "dependencies": { "readable-stream": { @@ -2227,13 +2255,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -2244,8 +2272,8 @@ "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" + "delegates": "1.0.0", + "readable-stream": "2.3.7" }, "dependencies": { "readable-stream": { @@ -2254,13 +2282,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -2271,7 +2299,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "~1.0.2" + "sprintf-js": "1.0.3" }, "dependencies": { "sprintf-js": { @@ -2336,7 +2364,7 @@ "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "dev": true, "requires": { - "safer-buffer": "~2.1.0" + "safer-buffer": "2.1.2" } }, "asn1.js": { @@ -2345,10 +2373,10 @@ "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", "dev": true, "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "safer-buffer": "^2.1.0" + "bn.js": "4.11.9", + "inherits": "2.0.4", + "minimalistic-assert": "1.0.1", + "safer-buffer": "2.1.2" }, "dependencies": { "bn.js": { @@ -2365,7 +2393,7 @@ "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", "dev": true, "requires": { - "object-assign": "^4.1.1", + "object-assign": "4.1.1", "util": "0.10.3" }, "dependencies": { @@ -2452,13 +2480,13 @@ "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==", "dev": true, "requires": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001109", - "colorette": "^1.2.1", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.32", - "postcss-value-parser": "^4.1.0" + "browserslist": "4.14.5", + "caniuse-lite": "1.0.30001142", + "colorette": "1.2.1", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "7.0.35", + "postcss-value-parser": "4.1.0" } }, "aws-sign2": { @@ -2479,7 +2507,7 @@ "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==", "requires": { "follow-redirects": "1.5.10", - "is-buffer": "^2.0.2" + "is-buffer": "2.0.4" } }, "babel-eslint": { @@ -2488,12 +2516,12 @@ "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.7.0", - "@babel/traverse": "^7.7.0", - "@babel/types": "^7.7.0", - "eslint-visitor-keys": "^1.0.0", - "resolve": "^1.12.0" + "@babel/code-frame": "7.10.4", + "@babel/parser": "7.11.5", + "@babel/traverse": "7.11.5", + "@babel/types": "7.11.5", + "eslint-visitor-keys": "1.3.0", + "resolve": "1.17.0" } }, "babel-loader": { @@ -2502,11 +2530,11 @@ "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==", "dev": true, "requires": { - "find-cache-dir": "^2.1.0", - "loader-utils": "^1.4.0", - "mkdirp": "^0.5.3", - "pify": "^4.0.1", - "schema-utils": "^2.6.5" + "find-cache-dir": "2.1.0", + "loader-utils": "1.4.0", + "mkdirp": "0.5.5", + "pify": "4.0.1", + "schema-utils": "2.7.1" } }, "babel-plugin-dynamic-import-node": { @@ -2515,7 +2543,7 @@ "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", "dev": true, "requires": { - "object.assign": "^4.1.0" + "object.assign": "4.1.1" } }, "babel-plugin-module-resolver": { @@ -2524,11 +2552,11 @@ "integrity": "sha512-3pdEq3PXALilSJ6dnC4wMWr0AZixHRM4utpdpBR9g5QG7B7JwWyukQv7a9hVxkbGFl+nQbrHDqqQOIBtTXTP/Q==", "dev": true, "requires": { - "find-babel-config": "^1.2.0", - "glob": "^7.1.6", - "pkg-up": "^3.1.0", - "reselect": "^4.0.0", - "resolve": "^1.13.1" + "find-babel-config": "1.2.0", + "glob": "7.1.6", + "pkg-up": "3.1.0", + "reselect": "4.0.0", + "resolve": "1.17.0" } }, "balanced-match": { @@ -2543,13 +2571,13 @@ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" + "cache-base": "1.0.1", + "class-utils": "0.3.6", + "component-emitter": "1.3.0", + "define-property": "1.0.0", + "isobject": "3.0.1", + "mixin-deep": "1.3.2", + "pascalcase": "0.1.1" }, "dependencies": { "define-property": { @@ -2558,7 +2586,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -2567,7 +2595,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-data-descriptor": { @@ -2576,7 +2604,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-descriptor": { @@ -2585,9 +2613,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.3" } } } @@ -2610,7 +2638,7 @@ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, "requires": { - "tweetnacl": "^0.14.3" + "tweetnacl": "0.14.5" } }, "bfj": { @@ -2619,10 +2647,10 @@ "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==", "dev": true, "requires": { - "bluebird": "^3.5.5", - "check-types": "^8.0.3", - "hoopy": "^0.1.4", - "tryer": "^1.0.1" + "bluebird": "3.7.2", + "check-types": "8.0.3", + "hoopy": "0.1.4", + "tryer": "1.0.1" } }, "big.js": { @@ -2643,9 +2671,9 @@ "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==", "dev": true, "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" + "buffer": "5.6.0", + "inherits": "2.0.4", + "readable-stream": "3.6.0" } }, "block-stream": { @@ -2654,7 +2682,7 @@ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "dev": true, "requires": { - "inherits": "~2.0.0" + "inherits": "2.0.4" } }, "bluebird": { @@ -2676,15 +2704,15 @@ "dev": true, "requires": { "bytes": "3.1.0", - "content-type": "~1.0.4", + "content-type": "1.0.4", "debug": "2.6.9", - "depd": "~1.1.2", + "depd": "1.1.2", "http-errors": "1.7.2", "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", + "on-finished": "2.3.0", "qs": "6.7.0", "raw-body": "2.4.0", - "type-is": "~1.6.17" + "type-is": "1.6.18" }, "dependencies": { "debug": { @@ -2704,12 +2732,12 @@ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { - "array-flatten": "^2.1.0", - "deep-equal": "^1.0.1", - "dns-equal": "^1.0.0", - "dns-txt": "^2.0.2", - "multicast-dns": "^6.0.1", - "multicast-dns-service-types": "^1.1.0" + "array-flatten": "2.1.2", + "deep-equal": "1.1.1", + "dns-equal": "1.0.0", + "dns-txt": "2.0.2", + "multicast-dns": "6.2.3", + "multicast-dns-service-types": "1.1.0" }, "dependencies": { "array-flatten": { @@ -2730,8 +2758,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==", - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", @@ -2739,7 +2766,7 @@ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { - "balanced-match": "^1.0.0", + "balanced-match": "1.0.0", "concat-map": "0.0.1" } }, @@ -2749,7 +2776,7 @@ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "7.0.1" } }, "brorand": { @@ -2764,12 +2791,12 @@ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "buffer-xor": "1.0.3", + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "evp_bytestokey": "1.0.3", + "inherits": "2.0.4", + "safe-buffer": "5.1.2" } }, "browserify-cipher": { @@ -2778,9 +2805,9 @@ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", "dev": true, "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" + "browserify-aes": "1.2.0", + "browserify-des": "1.0.2", + "evp_bytestokey": "1.0.3" } }, "browserify-des": { @@ -2789,10 +2816,10 @@ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", "dev": true, "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" + "cipher-base": "1.0.4", + "des.js": "1.0.1", + "inherits": "2.0.4", + "safe-buffer": "5.1.2" } }, "browserify-rsa": { @@ -2801,8 +2828,8 @@ "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" + "bn.js": "4.11.9", + "randombytes": "2.1.0" }, "dependencies": { "bn.js": { @@ -2819,15 +2846,15 @@ "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "dev": true, "requires": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", - "create-hash": "^1.2.0", - "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", - "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "bn.js": "5.1.3", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "elliptic": "6.5.3", + "inherits": "2.0.4", + "parse-asn1": "5.1.6", + "readable-stream": "3.6.0", + "safe-buffer": "5.2.1" }, "dependencies": { "safe-buffer": { @@ -2844,7 +2871,7 @@ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, "requires": { - "pako": "~1.0.5" + "pako": "1.0.11" } }, "browserslist": { @@ -2853,10 +2880,10 @@ "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001135", - "electron-to-chromium": "^1.3.571", - "escalade": "^3.1.0", - "node-releases": "^1.1.61" + "caniuse-lite": "1.0.30001142", + "electron-to-chromium": "1.3.576", + "escalade": "3.1.0", + "node-releases": "1.1.61" } }, "buffer": { @@ -2865,8 +2892,8 @@ "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", "dev": true, "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4" + "base64-js": "1.3.1", + "ieee754": "1.1.13" } }, "buffer-alloc": { @@ -2875,8 +2902,8 @@ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "dev": true, "requires": { - "buffer-alloc-unsafe": "^1.1.0", - "buffer-fill": "^1.0.0" + "buffer-alloc-unsafe": "1.1.0", + "buffer-fill": "1.0.0" } }, "buffer-alloc-unsafe": { @@ -2933,23 +2960,23 @@ "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==", "dev": true, "requires": { - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^6.0.0", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", - "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.0", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" + "@npmcli/move-file": "1.0.1", + "chownr": "2.0.0", + "fs-minipass": "2.1.0", + "glob": "7.1.6", + "infer-owner": "1.0.4", + "lru-cache": "6.0.0", + "minipass": "3.1.3", + "minipass-collect": "1.0.2", + "minipass-flush": "1.0.5", + "minipass-pipeline": "1.2.4", + "mkdirp": "1.0.4", + "p-map": "4.0.0", + "promise-inflight": "1.0.1", + "rimraf": "3.0.2", + "ssri": "8.0.0", + "tar": "6.0.5", + "unique-filename": "1.1.1" }, "dependencies": { "mkdirp": { @@ -2966,15 +2993,15 @@ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" + "collection-visit": "1.0.0", + "component-emitter": "1.3.0", + "get-value": "2.0.6", + "has-value": "1.0.0", + "isobject": "3.0.1", + "set-value": "2.0.1", + "to-object-path": "0.3.0", + "union-value": "1.0.1", + "unset-value": "1.0.0" } }, "cacheable-request": { @@ -2983,13 +3010,13 @@ "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", "dev": true, "requires": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^3.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^1.0.2" + "clone-response": "1.0.2", + "get-stream": "5.2.0", + "http-cache-semantics": "4.1.0", + "keyv": "3.1.0", + "lowercase-keys": "2.0.0", + "normalize-url": "4.5.0", + "responselike": "1.0.2" }, "dependencies": { "get-stream": { @@ -2998,7 +3025,7 @@ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, "requires": { - "pump": "^3.0.0" + "pump": "3.0.0" } }, "lowercase-keys": { @@ -3015,7 +3042,7 @@ "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", "dev": true, "requires": { - "callsites": "^2.0.0" + "callsites": "2.0.0" } }, "caller-path": { @@ -3024,7 +3051,7 @@ "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", "dev": true, "requires": { - "caller-callsite": "^2.0.0" + "caller-callsite": "2.0.0" } }, "callsites": { @@ -3039,8 +3066,8 @@ "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", "dev": true, "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" + "no-case": "2.3.2", + "upper-case": "1.1.3" } }, "camelcase": { @@ -3055,8 +3082,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "^2.0.0", - "map-obj": "^1.0.0" + "camelcase": "2.1.1", + "map-obj": "1.0.1" }, "dependencies": { "camelcase": { @@ -3073,10 +3100,10 @@ "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", "dev": true, "requires": { - "browserslist": "^4.0.0", - "caniuse-lite": "^1.0.0", - "lodash.memoize": "^4.1.2", - "lodash.uniq": "^4.5.0" + "browserslist": "4.14.5", + "caniuse-lite": "1.0.30001142", + "lodash.memoize": "4.1.2", + "lodash.uniq": "4.5.0" } }, "caniuse-lite": { @@ -3097,8 +3124,8 @@ "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "ansi-styles": "4.2.1", + "supports-color": "7.2.0" }, "dependencies": { "ansi-styles": { @@ -3107,8 +3134,8 @@ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" + "@types/color-name": "1.1.1", + "color-convert": "2.0.1" } }, "color-convert": { @@ -3117,7 +3144,7 @@ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "color-name": "~1.1.4" + "color-name": "1.1.4" } }, "color-name": { @@ -3138,7 +3165,7 @@ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { - "has-flag": "^4.0.0" + "has-flag": "4.0.0" } } } @@ -3161,14 +3188,14 @@ "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", "dev": true, "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.1.2", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" + "anymatch": "3.1.1", + "braces": "3.0.2", + "fsevents": "2.1.3", + "glob-parent": "5.1.1", + "is-binary-path": "2.1.0", + "is-glob": "4.0.1", + "normalize-path": "3.0.0", + "readdirp": "3.4.0" } }, "chownr": { @@ -3183,7 +3210,7 @@ "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.13.0" }, "dependencies": { "tslib": { @@ -3206,8 +3233,8 @@ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.4", + "safe-buffer": "5.1.2" } }, "class-utils": { @@ -3216,10 +3243,10 @@ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" + "arr-union": "3.1.0", + "define-property": "0.2.5", + "isobject": "3.0.1", + "static-extend": "0.1.2" }, "dependencies": { "define-property": { @@ -3228,7 +3255,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -3239,7 +3266,7 @@ "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", "dev": true, "requires": { - "source-map": "~0.6.0" + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -3262,7 +3289,7 @@ "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, "requires": { - "restore-cursor": "^3.1.0" + "restore-cursor": "3.1.0" } }, "cli-width": { @@ -3277,9 +3304,9 @@ "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "dev": true, "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" + "string-width": "3.1.0", + "strip-ansi": "5.2.0", + "wrap-ansi": "5.1.0" }, "dependencies": { "ansi-regex": { @@ -3300,9 +3327,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "7.0.3", + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "5.2.0" } }, "strip-ansi": { @@ -3311,7 +3338,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "4.1.0" } }, "wrap-ansi": { @@ -3320,9 +3347,9 @@ "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" + "ansi-styles": "3.2.1", + "string-width": "3.1.0", + "strip-ansi": "5.2.0" } } } @@ -3333,9 +3360,9 @@ "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, "requires": { - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.2", - "shallow-clone": "^3.0.0" + "is-plain-object": "2.0.4", + "kind-of": "6.0.3", + "shallow-clone": "3.0.1" } }, "clone-response": { @@ -3344,7 +3371,7 @@ "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", "dev": true, "requires": { - "mimic-response": "^1.0.0" + "mimic-response": "1.0.1" } }, "coa": { @@ -3353,9 +3380,9 @@ "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==", "dev": true, "requires": { - "@types/q": "^1.5.1", - "chalk": "^2.4.1", - "q": "^1.1.2" + "@types/q": "1.5.4", + "chalk": "2.4.2", + "q": "1.5.1" }, "dependencies": { "chalk": { @@ -3364,9 +3391,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } } } @@ -3383,8 +3410,8 @@ "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" + "map-visit": "1.0.0", + "object-visit": "1.0.1" } }, "color": { @@ -3393,8 +3420,8 @@ "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==", "dev": true, "requires": { - "color-convert": "^1.9.1", - "color-string": "^1.5.2" + "color-convert": "1.9.3", + "color-string": "1.5.3" } }, "color-convert": { @@ -3418,8 +3445,8 @@ "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", "dev": true, "requires": { - "color-name": "^1.0.0", - "simple-swizzle": "^0.2.2" + "color-name": "1.1.3", + "simple-swizzle": "0.2.2" } }, "colorette": { @@ -3440,7 +3467,7 @@ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, "requires": { - "delayed-stream": "~1.0.0" + "delayed-stream": "1.0.0" } }, "commander": { @@ -3473,10 +3500,10 @@ "integrity": "sha512-xZm9o6iikekkI0GnXCmAl3LQGZj5TBDj0zLowsqi7tJtEa3FMGSEcHcqrSJIrOAk1UG/NBbDn/F1q+MG/p/EsA==", "dev": true, "requires": { - "buffer-crc32": "^0.2.13", - "crc32-stream": "^4.0.0", - "normalize-path": "^3.0.0", - "readable-stream": "^3.6.0" + "buffer-crc32": "0.2.13", + "crc32-stream": "4.0.0", + "normalize-path": "3.0.0", + "readable-stream": "3.6.0" } }, "compressible": { @@ -3485,7 +3512,7 @@ "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, "requires": { - "mime-db": ">= 1.43.0 < 2" + "mime-db": "1.44.0" } }, "compression": { @@ -3494,13 +3521,13 @@ "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, "requires": { - "accepts": "~1.3.5", + "accepts": "1.3.7", "bytes": "3.0.0", - "compressible": "~2.0.16", + "compressible": "2.0.18", "debug": "2.6.9", - "on-headers": "~1.0.2", + "on-headers": "1.0.2", "safe-buffer": "5.1.2", - "vary": "~1.1.2" + "vary": "1.1.2" }, "dependencies": { "bytes": { @@ -3526,11 +3553,11 @@ "integrity": "sha512-Wcb99O4UkdDZiM+blEw6h+cUfJYCn2kgK0l3fjLOm72Stso9DVMieQpBD4PVpyI7DLL6+zNh0iJV3p4HDwTinQ==", "dev": true, "requires": { - "cacache": "^15.0.5", - "find-cache-dir": "^3.3.1", - "schema-utils": "^2.7.0", - "serialize-javascript": "^4.0.0", - "webpack-sources": "^1.4.3" + "cacache": "15.0.5", + "find-cache-dir": "3.3.1", + "schema-utils": "2.7.1", + "serialize-javascript": "4.0.0", + "webpack-sources": "1.4.3" }, "dependencies": { "find-cache-dir": { @@ -3539,9 +3566,9 @@ "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" + "commondir": "1.0.1", + "make-dir": "3.1.0", + "pkg-dir": "4.2.0" } }, "find-up": { @@ -3550,8 +3577,8 @@ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" + "locate-path": "5.0.0", + "path-exists": "4.0.0" } }, "locate-path": { @@ -3560,7 +3587,7 @@ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "^4.1.0" + "p-locate": "4.1.0" } }, "make-dir": { @@ -3569,7 +3596,7 @@ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { - "semver": "^6.0.0" + "semver": "6.3.0" } }, "p-locate": { @@ -3578,7 +3605,7 @@ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "^2.2.0" + "p-limit": "2.3.0" } }, "path-exists": { @@ -3593,7 +3620,7 @@ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "^4.0.0" + "find-up": "4.1.0" } }, "semver": { @@ -3616,10 +3643,10 @@ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" + "buffer-from": "1.1.1", + "inherits": "2.0.4", + "readable-stream": "2.3.7", + "typedarray": "0.0.6" }, "dependencies": { "readable-stream": { @@ -3628,13 +3655,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -3646,8 +3673,8 @@ "dev": true, "optional": true, "requires": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" + "ini": "1.3.5", + "proto-list": "1.2.4" } }, "connect-history-api-fallback": { @@ -3674,7 +3701,7 @@ "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==", "dev": true, "requires": { - "bluebird": "^3.1.1" + "bluebird": "3.7.2" } }, "constants-browserify": { @@ -3704,7 +3731,7 @@ "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", "dev": true, "requires": { - "safe-buffer": "~5.1.1" + "safe-buffer": "5.1.2" } }, "cookie": { @@ -3725,12 +3752,12 @@ "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", "dev": true, "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" + "aproba": "1.2.0", + "fs-write-stream-atomic": "1.0.10", + "iferr": "0.1.5", + "mkdirp": "0.5.5", + "rimraf": "2.7.1", + "run-queue": "1.0.3" }, "dependencies": { "rimraf": { @@ -3739,7 +3766,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.6" } } } @@ -3756,17 +3783,17 @@ "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==", "dev": true, "requires": { - "cacache": "^15.0.4", - "fast-glob": "^3.2.4", - "find-cache-dir": "^3.3.1", - "glob-parent": "^5.1.1", - "globby": "^11.0.1", - "loader-utils": "^2.0.0", - "normalize-path": "^3.0.0", - "p-limit": "^3.0.1", - "schema-utils": "^2.7.0", - "serialize-javascript": "^4.0.0", - "webpack-sources": "^1.4.3" + "cacache": "15.0.5", + "fast-glob": "3.2.4", + "find-cache-dir": "3.3.1", + "glob-parent": "5.1.1", + "globby": "11.0.1", + "loader-utils": "2.0.0", + "normalize-path": "3.0.0", + "p-limit": "3.0.2", + "schema-utils": "2.7.1", + "serialize-javascript": "4.0.0", + "webpack-sources": "1.4.3" }, "dependencies": { "find-cache-dir": { @@ -3775,9 +3802,9 @@ "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" + "commondir": "1.0.1", + "make-dir": "3.1.0", + "pkg-dir": "4.2.0" } }, "find-up": { @@ -3786,8 +3813,8 @@ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" + "locate-path": "5.0.0", + "path-exists": "4.0.0" } }, "loader-utils": { @@ -3796,9 +3823,9 @@ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" + "big.js": "5.2.2", + "emojis-list": "3.0.0", + "json5": "2.1.3" } }, "locate-path": { @@ -3807,7 +3834,7 @@ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "^4.1.0" + "p-locate": "4.1.0" } }, "make-dir": { @@ -3816,7 +3843,7 @@ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { - "semver": "^6.0.0" + "semver": "6.3.0" } }, "p-limit": { @@ -3825,7 +3852,7 @@ "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==", "dev": true, "requires": { - "p-try": "^2.0.0" + "p-try": "2.2.0" } }, "p-locate": { @@ -3834,7 +3861,7 @@ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "^2.2.0" + "p-limit": "2.3.0" }, "dependencies": { "p-limit": { @@ -3843,7 +3870,7 @@ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "p-try": "^2.0.0" + "p-try": "2.2.0" } } } @@ -3860,7 +3887,7 @@ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "^4.0.0" + "find-up": "4.1.0" } }, "semver": { @@ -3882,7 +3909,7 @@ "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==", "dev": true, "requires": { - "browserslist": "^4.8.5", + "browserslist": "4.14.5", "semver": "7.0.0" }, "dependencies": { @@ -3906,10 +3933,10 @@ "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", "dev": true, "requires": { - "import-fresh": "^2.0.0", - "is-directory": "^0.3.1", - "js-yaml": "^3.13.1", - "parse-json": "^4.0.0" + "import-fresh": "2.0.0", + "is-directory": "0.3.1", + "js-yaml": "3.14.0", + "parse-json": "4.0.0" } }, "crc": { @@ -3918,7 +3945,7 @@ "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", "dev": true, "requires": { - "buffer": "^5.1.0" + "buffer": "5.6.0" } }, "crc32-stream": { @@ -3927,8 +3954,8 @@ "integrity": "sha512-tyMw2IeUX6t9jhgXI6um0eKfWq4EIDpfv5m7GX4Jzp7eVelQ360xd8EPXJhp2mHwLQIkqlnMLjzqSZI3a+0wRw==", "dev": true, "requires": { - "crc": "^3.4.4", - "readable-stream": "^3.4.0" + "crc": "3.8.0", + "readable-stream": "3.6.0" } }, "create-ecdh": { @@ -3937,8 +3964,8 @@ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.5.3" + "bn.js": "4.11.9", + "elliptic": "6.5.3" }, "dependencies": { "bn.js": { @@ -3955,11 +3982,11 @@ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" + "cipher-base": "1.0.4", + "inherits": "2.0.4", + "md5.js": "1.3.5", + "ripemd160": "2.0.2", + "sha.js": "2.4.11" } }, "create-hmac": { @@ -3968,12 +3995,12 @@ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "cipher-base": "1.0.4", + "create-hash": "1.2.0", + "inherits": "2.0.4", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" } }, "cross-spawn": { @@ -3982,9 +4009,9 @@ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" + "path-key": "3.1.1", + "shebang-command": "2.0.0", + "which": "2.0.2" } }, "crypto-browserify": { @@ -3993,17 +4020,17 @@ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "dev": true, "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" + "browserify-cipher": "1.0.1", + "browserify-sign": "4.2.1", + "create-ecdh": "4.0.4", + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "diffie-hellman": "5.0.3", + "inherits": "2.0.4", + "pbkdf2": "3.1.1", + "public-encrypt": "4.0.3", + "randombytes": "2.1.0", + "randomfill": "1.0.4" } }, "css": { @@ -4012,10 +4039,10 @@ "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", "dev": true, "requires": { - "inherits": "^2.0.3", - "source-map": "^0.6.1", - "source-map-resolve": "^0.5.2", - "urix": "^0.1.0" + "inherits": "2.0.4", + "source-map": "0.6.1", + "source-map-resolve": "0.5.3", + "urix": "0.1.0" }, "dependencies": { "source-map": { @@ -4038,8 +4065,8 @@ "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==", "dev": true, "requires": { - "postcss": "^7.0.1", - "timsort": "^0.3.0" + "postcss": "7.0.35", + "timsort": "0.3.0" } }, "css-loader": { @@ -4048,19 +4075,19 @@ "integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==", "dev": true, "requires": { - "camelcase": "^5.3.1", - "cssesc": "^3.0.0", - "icss-utils": "^4.1.1", - "loader-utils": "^1.2.3", - "normalize-path": "^3.0.0", - "postcss": "^7.0.32", - "postcss-modules-extract-imports": "^2.0.0", - "postcss-modules-local-by-default": "^3.0.2", - "postcss-modules-scope": "^2.2.0", - "postcss-modules-values": "^3.0.0", - "postcss-value-parser": "^4.1.0", - "schema-utils": "^2.7.0", - "semver": "^6.3.0" + "camelcase": "5.3.1", + "cssesc": "3.0.0", + "icss-utils": "4.1.1", + "loader-utils": "1.4.0", + "normalize-path": "3.0.0", + "postcss": "7.0.35", + "postcss-modules-extract-imports": "2.0.0", + "postcss-modules-local-by-default": "3.0.3", + "postcss-modules-scope": "2.2.0", + "postcss-modules-values": "3.0.0", + "postcss-value-parser": "4.1.0", + "schema-utils": "2.7.1", + "semver": "6.3.0" }, "dependencies": { "semver": { @@ -4077,7 +4104,7 @@ "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=", "dev": true, "requires": { - "css": "^2.0.0" + "css": "2.2.4" } }, "css-select": { @@ -4086,10 +4113,10 @@ "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", "dev": true, "requires": { - "boolbase": "^1.0.0", - "css-what": "^3.2.1", - "domutils": "^1.7.0", - "nth-check": "^1.0.2" + "boolbase": "1.0.0", + "css-what": "3.4.1", + "domutils": "1.7.0", + "nth-check": "1.0.2" } }, "css-select-base-adapter": { @@ -4105,7 +4132,7 @@ "dev": true, "requires": { "mdn-data": "2.0.4", - "source-map": "^0.6.1" + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -4134,10 +4161,10 @@ "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==", "dev": true, "requires": { - "cosmiconfig": "^5.0.0", - "cssnano-preset-default": "^4.0.7", - "is-resolvable": "^1.0.0", - "postcss": "^7.0.0" + "cosmiconfig": "5.2.1", + "cssnano-preset-default": "4.0.7", + "is-resolvable": "1.1.0", + "postcss": "7.0.35" } }, "cssnano-preset-default": { @@ -4146,36 +4173,36 @@ "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==", "dev": true, "requires": { - "css-declaration-sorter": "^4.0.1", - "cssnano-util-raw-cache": "^4.0.1", - "postcss": "^7.0.0", - "postcss-calc": "^7.0.1", - "postcss-colormin": "^4.0.3", - "postcss-convert-values": "^4.0.1", - "postcss-discard-comments": "^4.0.2", - "postcss-discard-duplicates": "^4.0.2", - "postcss-discard-empty": "^4.0.1", - "postcss-discard-overridden": "^4.0.1", - "postcss-merge-longhand": "^4.0.11", - "postcss-merge-rules": "^4.0.3", - "postcss-minify-font-values": "^4.0.2", - "postcss-minify-gradients": "^4.0.2", - "postcss-minify-params": "^4.0.2", - "postcss-minify-selectors": "^4.0.2", - "postcss-normalize-charset": "^4.0.1", - "postcss-normalize-display-values": "^4.0.2", - "postcss-normalize-positions": "^4.0.2", - "postcss-normalize-repeat-style": "^4.0.2", - "postcss-normalize-string": "^4.0.2", - "postcss-normalize-timing-functions": "^4.0.2", - "postcss-normalize-unicode": "^4.0.1", - "postcss-normalize-url": "^4.0.1", - "postcss-normalize-whitespace": "^4.0.2", - "postcss-ordered-values": "^4.1.2", - "postcss-reduce-initial": "^4.0.3", - "postcss-reduce-transforms": "^4.0.2", - "postcss-svgo": "^4.0.2", - "postcss-unique-selectors": "^4.0.1" + "css-declaration-sorter": "4.0.1", + "cssnano-util-raw-cache": "4.0.1", + "postcss": "7.0.35", + "postcss-calc": "7.0.4", + "postcss-colormin": "4.0.3", + "postcss-convert-values": "4.0.1", + "postcss-discard-comments": "4.0.2", + "postcss-discard-duplicates": "4.0.2", + "postcss-discard-empty": "4.0.1", + "postcss-discard-overridden": "4.0.1", + "postcss-merge-longhand": "4.0.11", + "postcss-merge-rules": "4.0.3", + "postcss-minify-font-values": "4.0.2", + "postcss-minify-gradients": "4.0.2", + "postcss-minify-params": "4.0.2", + "postcss-minify-selectors": "4.0.2", + "postcss-normalize-charset": "4.0.1", + "postcss-normalize-display-values": "4.0.2", + "postcss-normalize-positions": "4.0.2", + "postcss-normalize-repeat-style": "4.0.2", + "postcss-normalize-string": "4.0.2", + "postcss-normalize-timing-functions": "4.0.2", + "postcss-normalize-unicode": "4.0.1", + "postcss-normalize-url": "4.0.1", + "postcss-normalize-whitespace": "4.0.2", + "postcss-ordered-values": "4.1.2", + "postcss-reduce-initial": "4.0.3", + "postcss-reduce-transforms": "4.0.2", + "postcss-svgo": "4.0.2", + "postcss-unique-selectors": "4.0.1" } }, "cssnano-util-get-arguments": { @@ -4196,7 +4223,7 @@ "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==", "dev": true, "requires": { - "postcss": "^7.0.0" + "postcss": "7.0.35" } }, "cssnano-util-same-parent": { @@ -4221,7 +4248,7 @@ "dev": true, "requires": { "mdn-data": "2.0.6", - "source-map": "^0.6.1" + "source-map": "0.6.1" } }, "mdn-data": { @@ -4244,7 +4271,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "^1.0.1" + "array-find-index": "1.0.2" } }, "cyclist": { @@ -4259,7 +4286,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "de-indent": { @@ -4294,7 +4321,7 @@ "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, "requires": { - "mimic-response": "^1.0.0" + "mimic-response": "1.0.1" } }, "deep-equal": { @@ -4303,12 +4330,12 @@ "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", "dev": true, "requires": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", - "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" + "is-arguments": "1.0.4", + "is-date-object": "1.0.2", + "is-regex": "1.1.1", + "object-is": "1.1.3", + "object-keys": "1.1.1", + "regexp.prototype.flags": "1.3.0" } }, "deep-is": { @@ -4329,8 +4356,8 @@ "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", "dev": true, "requires": { - "execa": "^1.0.0", - "ip-regex": "^2.1.0" + "execa": "1.0.0", + "ip-regex": "2.1.0" } }, "defer-to-connect": { @@ -4345,7 +4372,7 @@ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "dev": true, "requires": { - "object-keys": "^1.0.12" + "object-keys": "1.1.1" } }, "define-property": { @@ -4354,8 +4381,8 @@ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" + "is-descriptor": "1.0.2", + "isobject": "3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -4364,7 +4391,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-data-descriptor": { @@ -4373,7 +4400,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-descriptor": { @@ -4382,9 +4409,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.3" } } } @@ -4395,13 +4422,13 @@ "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", "dev": true, "requires": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "pify": "^4.0.1", - "rimraf": "^2.6.3" + "@types/glob": "7.1.3", + "globby": "6.1.0", + "is-path-cwd": "2.2.0", + "is-path-in-cwd": "2.1.0", + "p-map": "2.1.0", + "pify": "4.0.1", + "rimraf": "2.7.1" }, "dependencies": { "array-union": { @@ -4410,7 +4437,7 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { - "array-uniq": "^1.0.1" + "array-uniq": "1.0.3" } }, "globby": { @@ -4419,11 +4446,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "array-union": "1.0.2", + "glob": "7.1.6", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" }, "dependencies": { "pify": { @@ -4446,7 +4473,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.6" } } } @@ -4475,8 +4502,8 @@ "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", "dev": true, "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" + "inherits": "2.0.4", + "minimalistic-assert": "1.0.1" } }, "destroy": { @@ -4497,9 +4524,9 @@ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" + "bn.js": "4.11.9", + "miller-rabin": "4.0.1", + "randombytes": "2.1.0" }, "dependencies": { "bn.js": { @@ -4516,7 +4543,7 @@ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, "requires": { - "path-type": "^4.0.0" + "path-type": "4.0.0" } }, "dns-equal": { @@ -4531,8 +4558,8 @@ "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", "dev": true, "requires": { - "ip": "^1.1.0", - "safe-buffer": "^5.0.1" + "ip": "1.1.5", + "safe-buffer": "5.1.2" } }, "dns-txt": { @@ -4541,7 +4568,7 @@ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { - "buffer-indexof": "^1.0.0" + "buffer-indexof": "1.1.1" } }, "doctrine": { @@ -4550,7 +4577,7 @@ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, "requires": { - "esutils": "^2.0.2" + "esutils": "2.0.3" } }, "dom-converter": { @@ -4559,7 +4586,7 @@ "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", "dev": true, "requires": { - "utila": "~0.4" + "utila": "0.4.0" } }, "dom-serializer": { @@ -4568,8 +4595,8 @@ "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", "dev": true, "requires": { - "domelementtype": "^2.0.1", - "entities": "^2.0.0" + "domelementtype": "2.0.2", + "entities": "2.0.3" }, "dependencies": { "domelementtype": { @@ -4598,7 +4625,7 @@ "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, "requires": { - "domelementtype": "1" + "domelementtype": "1.3.1" } }, "domutils": { @@ -4607,8 +4634,8 @@ "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", "dev": true, "requires": { - "dom-serializer": "0", - "domelementtype": "1" + "dom-serializer": "0.2.2", + "domelementtype": "1.3.1" } }, "dot-case": { @@ -4617,8 +4644,8 @@ "integrity": "sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==", "dev": true, "requires": { - "no-case": "^3.0.3", - "tslib": "^1.10.0" + "no-case": "3.0.3", + "tslib": "1.13.0" }, "dependencies": { "lower-case": { @@ -4627,7 +4654,7 @@ "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==", "dev": true, "requires": { - "tslib": "^1.10.0" + "tslib": "1.13.0" } }, "no-case": { @@ -4636,8 +4663,8 @@ "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==", "dev": true, "requires": { - "lower-case": "^2.0.1", - "tslib": "^1.10.0" + "lower-case": "2.0.1", + "tslib": "1.13.0" } }, "tslib": { @@ -4654,7 +4681,7 @@ "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", "dev": true, "requires": { - "is-obj": "^2.0.0" + "is-obj": "2.0.0" } }, "duplexer": { @@ -4675,10 +4702,10 @@ "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", "dev": true, "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" + "end-of-stream": "1.4.4", + "inherits": "2.0.4", + "readable-stream": "2.3.7", + "stream-shift": "1.0.1" }, "dependencies": { "readable-stream": { @@ -4687,13 +4714,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -4704,8 +4731,8 @@ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "dev": true, "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" + "jsbn": "0.1.1", + "safer-buffer": "2.1.2" } }, "ee-first": { @@ -4726,8 +4753,8 @@ "integrity": "sha512-TpKfJcz4LXl5jiGvZTs5fbEx+wUFXV5u8voeG5WCHWfY/cdgdD8lDZIZRqLVOtR3VO+drgJ9aiSHIO9TYn/fKg==", "dev": true, "requires": { - "debug": "^4.1.1", - "fs-extra": "^8.0.1" + "debug": "4.2.0", + "fs-extra": "8.1.0" }, "dependencies": { "debug": { @@ -4745,9 +4772,9 @@ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "dev": true, "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "graceful-fs": "4.2.4", + "jsonfile": "4.0.0", + "universalify": "0.1.2" } }, "ms": { @@ -4764,12 +4791,12 @@ "integrity": "sha512-wUJPmZJQCs1zgdlQgeIpRcvrf7M5/COQaOV68Va1J/SgmWx5KL2otgg+fAae7luw6qz9R8Gvu/Qpe9tAOu/3xQ==", "dev": true, "requires": { - "bluebird": "^3.5.0", - "compare-version": "^0.1.2", - "debug": "^2.6.8", - "isbinaryfile": "^3.0.2", - "minimist": "^1.2.0", - "plist": "^3.0.1" + "bluebird": "3.7.2", + "compare-version": "0.1.2", + "debug": "2.6.9", + "isbinaryfile": "3.0.3", + "minimist": "1.2.5", + "plist": "3.0.1" }, "dependencies": { "debug": { @@ -4787,7 +4814,7 @@ "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", "dev": true, "requires": { - "buffer-alloc": "^1.2.0" + "buffer-alloc": "1.2.0" } } } @@ -4821,13 +4848,13 @@ "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", "dev": true, "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "bn.js": "4.11.9", + "brorand": "1.1.0", + "hash.js": "1.1.7", + "hmac-drbg": "1.0.1", + "inherits": "2.0.4", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" }, "dependencies": { "bn.js": { @@ -4862,7 +4889,7 @@ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "dev": true, "requires": { - "once": "^1.4.0" + "once": "1.4.0" } }, "enhanced-resolve": { @@ -4871,9 +4898,9 @@ "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.5.0", - "tapable": "^1.0.0" + "graceful-fs": "4.2.4", + "memory-fs": "0.5.0", + "tapable": "1.1.3" } }, "entities": { @@ -4894,7 +4921,7 @@ "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", "dev": true, "requires": { - "prr": "~1.0.1" + "prr": "1.0.1" } }, "error-ex": { @@ -4903,7 +4930,7 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { - "is-arrayish": "^0.2.1" + "is-arrayish": "0.2.1" } }, "error-stack-parser": { @@ -4912,7 +4939,7 @@ "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==", "dev": true, "requires": { - "stackframe": "^1.1.1" + "stackframe": "1.2.0" } }, "es-abstract": { @@ -4921,18 +4948,18 @@ "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", "dev": true, "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-negative-zero": "^2.0.0", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-negative-zero": "2.0.0", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" } }, "es-to-primitive": { @@ -4941,9 +4968,9 @@ "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "is-callable": "1.2.2", + "is-date-object": "1.0.2", + "is-symbol": "1.0.3" } }, "es6-error": { @@ -4977,43 +5004,43 @@ "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "ajv": "^6.10.0", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", - "debug": "^4.0.1", - "doctrine": "^3.0.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^1.4.3", - "eslint-visitor-keys": "^1.1.0", - "espree": "^6.1.2", - "esquery": "^1.0.1", - "esutils": "^2.0.2", - "file-entry-cache": "^5.0.1", - "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.0.0", - "globals": "^12.1.0", - "ignore": "^4.0.6", - "import-fresh": "^3.0.0", - "imurmurhash": "^0.1.4", - "inquirer": "^7.0.0", - "is-glob": "^4.0.0", - "js-yaml": "^3.13.1", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.14", - "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", - "natural-compare": "^1.4.0", - "optionator": "^0.8.3", - "progress": "^2.0.0", - "regexpp": "^2.0.1", - "semver": "^6.1.2", - "strip-ansi": "^5.2.0", - "strip-json-comments": "^3.0.1", - "table": "^5.2.3", - "text-table": "^0.2.0", - "v8-compile-cache": "^2.0.3" + "@babel/code-frame": "7.10.4", + "ajv": "6.12.5", + "chalk": "2.4.2", + "cross-spawn": "6.0.5", + "debug": "4.2.0", + "doctrine": "3.0.0", + "eslint-scope": "5.1.1", + "eslint-utils": "1.4.3", + "eslint-visitor-keys": "1.3.0", + "espree": "6.2.1", + "esquery": "1.3.1", + "esutils": "2.0.3", + "file-entry-cache": "5.0.1", + "functional-red-black-tree": "1.0.1", + "glob-parent": "5.1.1", + "globals": "12.4.0", + "ignore": "4.0.6", + "import-fresh": "3.2.1", + "imurmurhash": "0.1.4", + "inquirer": "7.3.3", + "is-glob": "4.0.1", + "js-yaml": "3.14.0", + "json-stable-stringify-without-jsonify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.20", + "minimatch": "3.0.4", + "mkdirp": "0.5.5", + "natural-compare": "1.4.0", + "optionator": "0.8.3", + "progress": "2.0.3", + "regexpp": "2.0.1", + "semver": "6.3.0", + "strip-ansi": "5.2.0", + "strip-json-comments": "3.1.1", + "table": "5.4.6", + "text-table": "0.2.0", + "v8-compile-cache": "2.1.1" }, "dependencies": { "ansi-regex": { @@ -5028,9 +5055,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "cross-spawn": { @@ -5039,11 +5066,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "nice-try": "1.0.5", + "path-key": "2.0.1", + "semver": "5.7.1", + "shebang-command": "1.2.0", + "which": "1.3.1" }, "dependencies": { "semver": { @@ -5069,8 +5096,8 @@ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" + "esrecurse": "4.3.0", + "estraverse": "4.3.0" } }, "eslint-utils": { @@ -5079,7 +5106,7 @@ "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" + "eslint-visitor-keys": "1.3.0" } }, "globals": { @@ -5088,7 +5115,7 @@ "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", "dev": true, "requires": { - "type-fest": "^0.8.1" + "type-fest": "0.8.1" } }, "ignore": { @@ -5143,7 +5170,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "1.0.0" } }, "shebang-regex": { @@ -5158,7 +5185,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "4.1.0" } }, "strip-json-comments": { @@ -5179,7 +5206,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } } } @@ -5190,7 +5217,7 @@ "integrity": "sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw==", "dev": true, "requires": { - "get-stdin": "^6.0.0" + "get-stdin": "6.0.0" }, "dependencies": { "get-stdin": { @@ -5207,11 +5234,11 @@ "integrity": "sha512-I496aBd+Hi23Y0Cx+sKvw+VwlJre4ScIRlkrvTO6Scq68X/UXbN6F3lAhN8b0Zv8atAyprkyrA42K5QBJtCyaw==", "dev": true, "requires": { - "fs-extra": "^8.1.0", - "loader-fs-cache": "^1.0.3", - "loader-utils": "^1.2.3", - "object-hash": "^2.0.3", - "schema-utils": "^2.6.5" + "fs-extra": "8.1.0", + "loader-fs-cache": "1.0.3", + "loader-utils": "1.4.0", + "object-hash": "2.0.3", + "schema-utils": "2.7.1" }, "dependencies": { "fs-extra": { @@ -5220,9 +5247,9 @@ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "dev": true, "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "graceful-fs": "4.2.4", + "jsonfile": "4.0.0", + "universalify": "0.1.2" } } } @@ -5233,9 +5260,9 @@ "integrity": "sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==", "dev": true, "requires": { - "natural-compare": "^1.4.0", - "semver": "^5.6.0", - "vue-eslint-parser": "^7.0.0" + "natural-compare": "1.4.0", + "semver": "5.7.1", + "vue-eslint-parser": "7.1.0" }, "dependencies": { "semver": { @@ -5252,8 +5279,8 @@ "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", "dev": true, "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "esrecurse": "4.3.0", + "estraverse": "4.3.0" } }, "eslint-utils": { @@ -5262,7 +5289,7 @@ "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" + "eslint-visitor-keys": "1.3.0" } }, "eslint-visitor-keys": { @@ -5277,9 +5304,9 @@ "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", "dev": true, "requires": { - "acorn": "^7.1.1", - "acorn-jsx": "^5.2.0", - "eslint-visitor-keys": "^1.1.0" + "acorn": "7.4.0", + "acorn-jsx": "5.3.1", + "eslint-visitor-keys": "1.3.0" }, "dependencies": { "acorn": { @@ -5302,7 +5329,7 @@ "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", "dev": true, "requires": { - "estraverse": "^5.1.0" + "estraverse": "5.2.0" }, "dependencies": { "estraverse": { @@ -5319,7 +5346,7 @@ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, "requires": { - "estraverse": "^5.2.0" + "estraverse": "5.2.0" }, "dependencies": { "estraverse": { @@ -5366,7 +5393,7 @@ "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", "dev": true, "requires": { - "original": "^1.0.0" + "original": "1.0.2" } }, "evp_bytestokey": { @@ -5375,8 +5402,8 @@ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", "dev": true, "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" + "md5.js": "1.3.5", + "safe-buffer": "5.1.2" } }, "execa": { @@ -5385,13 +5412,13 @@ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "cross-spawn": "6.0.5", + "get-stream": "4.1.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.3", + "strip-eof": "1.0.0" }, "dependencies": { "cross-spawn": { @@ -5400,11 +5427,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "nice-try": "1.0.5", + "path-key": "2.0.1", + "semver": "5.7.1", + "shebang-command": "1.2.0", + "which": "1.3.1" } }, "path-key": { @@ -5425,7 +5452,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "1.0.0" } }, "shebang-regex": { @@ -5440,7 +5467,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } } } @@ -5451,13 +5478,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "posix-character-classes": "0.1.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "debug": { @@ -5475,7 +5502,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -5484,7 +5511,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -5495,36 +5522,36 @@ "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", "dev": true, "requires": { - "accepts": "~1.3.7", + "accepts": "1.3.7", "array-flatten": "1.1.1", "body-parser": "1.19.0", "content-disposition": "0.5.3", - "content-type": "~1.0.4", + "content-type": "1.0.4", "cookie": "0.4.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", + "depd": "1.1.2", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", + "finalhandler": "1.1.2", "fresh": "0.5.2", "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", + "methods": "1.1.2", + "on-finished": "2.3.0", + "parseurl": "1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", + "proxy-addr": "2.0.6", "qs": "6.7.0", - "range-parser": "~1.2.1", + "range-parser": "1.2.1", "safe-buffer": "5.1.2", "send": "0.17.1", "serve-static": "1.14.1", "setprototypeof": "1.1.1", - "statuses": "~1.5.0", - "type-is": "~1.6.18", + "statuses": "1.5.0", + "type-is": "1.6.18", "utils-merge": "1.0.1", - "vary": "~1.1.2" + "vary": "1.1.2" }, "dependencies": { "debug": { @@ -5550,8 +5577,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "assign-symbols": "1.0.0", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -5560,7 +5587,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -5571,9 +5598,9 @@ "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" + "chardet": "0.7.0", + "iconv-lite": "0.4.24", + "tmp": "0.0.33" } }, "extglob": { @@ -5582,14 +5609,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "array-unique": "0.3.2", + "define-property": "1.0.0", + "expand-brackets": "2.1.4", + "extend-shallow": "2.0.1", + "fragment-cache": "0.2.1", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" }, "dependencies": { "define-property": { @@ -5598,7 +5625,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "extend-shallow": { @@ -5607,7 +5634,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } }, "is-accessor-descriptor": { @@ -5616,7 +5643,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-data-descriptor": { @@ -5625,7 +5652,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-descriptor": { @@ -5634,9 +5661,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.3" } } } @@ -5659,12 +5686,12 @@ "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", "dev": true, "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", - "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" + "@nodelib/fs.stat": "2.0.3", + "@nodelib/fs.walk": "1.2.4", + "glob-parent": "5.1.1", + "merge2": "1.4.1", + "micromatch": "4.0.2", + "picomatch": "2.2.2" } }, "fast-json-stable-stringify": { @@ -5685,7 +5712,7 @@ "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", "dev": true, "requires": { - "reusify": "^1.0.4" + "reusify": "1.0.4" } }, "faye-websocket": { @@ -5694,7 +5721,7 @@ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { - "websocket-driver": ">=0.5.1" + "websocket-driver": "0.6.5" } }, "figgy-pudding": { @@ -5709,7 +5736,7 @@ "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, "requires": { - "escape-string-regexp": "^1.0.5" + "escape-string-regexp": "1.0.5" } }, "file-entry-cache": { @@ -5718,7 +5745,7 @@ "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", "dev": true, "requires": { - "flat-cache": "^2.0.1" + "flat-cache": "2.0.1" } }, "file-loader": { @@ -5727,8 +5754,8 @@ "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==", "dev": true, "requires": { - "loader-utils": "^2.0.0", - "schema-utils": "^2.6.5" + "loader-utils": "2.0.0", + "schema-utils": "2.7.1" }, "dependencies": { "loader-utils": { @@ -5737,9 +5764,9 @@ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" + "big.js": "5.2.2", + "emojis-list": "3.0.0", + "json5": "2.1.3" } } } @@ -5756,7 +5783,7 @@ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, "requires": { - "to-regex-range": "^5.0.1" + "to-regex-range": "5.0.1" } }, "finalhandler": { @@ -5766,12 +5793,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "parseurl": "1.3.3", + "statuses": "1.5.0", + "unpipe": "1.0.0" }, "dependencies": { "debug": { @@ -5791,8 +5818,8 @@ "integrity": "sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==", "dev": true, "requires": { - "json5": "^0.5.1", - "path-exists": "^3.0.0" + "json5": "0.5.1", + "path-exists": "3.0.0" }, "dependencies": { "json5": { @@ -5809,9 +5836,9 @@ "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" + "commondir": "1.0.1", + "make-dir": "2.1.0", + "pkg-dir": "3.0.0" } }, "find-up": { @@ -5820,7 +5847,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "^3.0.0" + "locate-path": "3.0.0" } }, "findup": { @@ -5829,8 +5856,8 @@ "integrity": "sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs=", "dev": true, "requires": { - "colors": "~0.6.0-1", - "commander": "~2.1.0" + "colors": "0.6.2", + "commander": "2.1.0" }, "dependencies": { "commander": { @@ -5847,7 +5874,7 @@ "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", "dev": true, "requires": { - "flatted": "^2.0.0", + "flatted": "2.0.2", "rimraf": "2.6.3", "write": "1.0.3" }, @@ -5858,7 +5885,7 @@ "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.6" } } } @@ -5875,8 +5902,8 @@ "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "dev": true, "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" + "inherits": "2.0.4", + "readable-stream": "2.3.7" }, "dependencies": { "readable-stream": { @@ -5885,13 +5912,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -5901,7 +5928,7 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", "requires": { - "debug": "=3.1.0" + "debug": "3.1.0" } }, "for-in": { @@ -5922,13 +5949,13 @@ "integrity": "sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==", "dev": true, "requires": { - "@babel/code-frame": "^7.5.5", - "chalk": "^2.4.1", - "micromatch": "^3.1.10", - "minimatch": "^3.0.4", - "semver": "^5.6.0", - "tapable": "^1.0.0", - "worker-rpc": "^0.1.0" + "@babel/code-frame": "7.10.4", + "chalk": "2.4.2", + "micromatch": "3.1.10", + "minimatch": "3.0.4", + "semver": "5.7.1", + "tapable": "1.1.3", + "worker-rpc": "0.1.1" }, "dependencies": { "braces": { @@ -5937,16 +5964,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" }, "dependencies": { "extend-shallow": { @@ -5955,7 +5982,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -5966,9 +5993,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "fill-range": { @@ -5977,10 +6004,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" }, "dependencies": { "extend-shallow": { @@ -5989,7 +6016,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -6006,7 +6033,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -6015,7 +6042,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6026,19 +6053,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.3", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "semver": { @@ -6053,8 +6080,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "3.0.0", + "repeat-string": "1.6.1" } } } @@ -6065,9 +6092,9 @@ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "dev": true, "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" + "asynckit": "0.4.0", + "combined-stream": "1.0.8", + "mime-types": "2.1.27" } }, "forwarded": { @@ -6082,7 +6109,7 @@ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { - "map-cache": "^0.2.2" + "map-cache": "0.2.2" } }, "fresh": { @@ -6097,9 +6124,9 @@ "integrity": "sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw==", "dev": true, "requires": { - "chalk": "^1.1.3", - "error-stack-parser": "^2.0.0", - "string-width": "^2.0.0" + "chalk": "1.1.3", + "error-stack-parser": "2.0.6", + "string-width": "2.1.1" }, "dependencies": { "ansi-styles": { @@ -6114,11 +6141,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "strip-ansi": { @@ -6127,7 +6154,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "supports-color": { @@ -6144,8 +6171,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" + "inherits": "2.0.4", + "readable-stream": "2.3.7" }, "dependencies": { "readable-stream": { @@ -6154,13 +6181,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -6177,10 +6204,10 @@ "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", "dev": true, "requires": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^1.0.0" + "at-least-node": "1.0.0", + "graceful-fs": "4.2.4", + "jsonfile": "6.0.1", + "universalify": "1.0.0" }, "dependencies": { "jsonfile": { @@ -6189,8 +6216,8 @@ "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", "dev": true, "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^1.0.0" + "graceful-fs": "4.2.4", + "universalify": "1.0.0" } }, "universalify": { @@ -6207,7 +6234,7 @@ "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dev": true, "requires": { - "minipass": "^3.0.0" + "minipass": "3.1.3" } }, "fs-write-stream-atomic": { @@ -6216,10 +6243,10 @@ "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" + "graceful-fs": "4.2.4", + "iferr": "0.1.5", + "imurmurhash": "0.1.4", + "readable-stream": "2.3.7" }, "dependencies": { "readable-stream": { @@ -6228,13 +6255,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -6258,10 +6285,10 @@ "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" + "graceful-fs": "4.2.4", + "inherits": "2.0.4", + "mkdirp": "0.5.5", + "rimraf": "2.7.1" }, "dependencies": { "rimraf": { @@ -6270,7 +6297,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.6" } } } @@ -6293,14 +6320,14 @@ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" + "aproba": "1.2.0", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.3", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.3" }, "dependencies": { "is-fullwidth-code-point": { @@ -6309,7 +6336,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "^1.0.0" + "number-is-nan": "1.0.1" } }, "string-width": { @@ -6318,9 +6345,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" } }, "strip-ansi": { @@ -6329,7 +6356,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } } } @@ -6340,7 +6367,7 @@ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { - "globule": "^1.0.0" + "globule": "1.3.2" } }, "gensync": { @@ -6367,7 +6394,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "^3.0.0" + "pump": "3.0.0" } }, "get-value": { @@ -6382,7 +6409,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "^1.0.0" + "assert-plus": "1.0.0" } }, "glob": { @@ -6391,12 +6418,12 @@ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.4", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" } }, "glob-parent": { @@ -6405,7 +6432,7 @@ "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "dev": true, "requires": { - "is-glob": "^4.0.1" + "is-glob": "4.0.1" } }, "global-agent": { @@ -6415,13 +6442,13 @@ "dev": true, "optional": true, "requires": { - "boolean": "^3.0.1", - "core-js": "^3.6.5", - "es6-error": "^4.1.1", - "matcher": "^3.0.0", - "roarr": "^2.15.3", - "semver": "^7.3.2", - "serialize-error": "^7.0.1" + "boolean": "3.0.1", + "core-js": "3.6.5", + "es6-error": "4.1.1", + "matcher": "3.0.0", + "roarr": "2.15.4", + "semver": "7.3.2", + "serialize-error": "7.0.1" } }, "global-tunnel-ng": { @@ -6431,10 +6458,10 @@ "dev": true, "optional": true, "requires": { - "encodeurl": "^1.0.2", - "lodash": "^4.17.10", - "npm-conf": "^1.1.3", - "tunnel": "^0.0.6" + "encodeurl": "1.0.2", + "lodash": "4.17.20", + "npm-conf": "1.1.3", + "tunnel": "0.0.6" } }, "globals": { @@ -6450,7 +6477,7 @@ "dev": true, "optional": true, "requires": { - "define-properties": "^1.1.3" + "define-properties": "1.1.3" } }, "globby": { @@ -6459,12 +6486,12 @@ "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==", "dev": true, "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", - "slash": "^3.0.0" + "array-union": "2.1.0", + "dir-glob": "3.0.1", + "fast-glob": "3.2.4", + "ignore": "5.1.8", + "merge2": "1.4.1", + "slash": "3.0.0" } }, "globule": { @@ -6473,9 +6500,9 @@ "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==", "dev": true, "requires": { - "glob": "~7.1.1", - "lodash": "~4.17.10", - "minimatch": "~3.0.2" + "glob": "7.1.6", + "lodash": "4.17.20", + "minimatch": "3.0.4" } }, "got": { @@ -6484,17 +6511,17 @@ "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", "dev": true, "requires": { - "@sindresorhus/is": "^0.14.0", - "@szmarczak/http-timer": "^1.1.2", - "cacheable-request": "^6.0.0", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^4.1.0", - "lowercase-keys": "^1.0.1", - "mimic-response": "^1.0.1", - "p-cancelable": "^1.0.0", - "to-readable-stream": "^1.0.0", - "url-parse-lax": "^3.0.0" + "@sindresorhus/is": "0.14.0", + "@szmarczak/http-timer": "1.1.2", + "cacheable-request": "6.1.0", + "decompress-response": "3.3.0", + "duplexer3": "0.1.4", + "get-stream": "4.1.0", + "lowercase-keys": "1.0.1", + "mimic-response": "1.0.1", + "p-cancelable": "1.1.0", + "to-readable-stream": "1.0.0", + "url-parse-lax": "3.0.0" } }, "graceful-fs": { @@ -6509,8 +6536,8 @@ "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==", "dev": true, "requires": { - "duplexer": "^0.1.1", - "pify": "^4.0.1" + "duplexer": "0.1.2", + "pify": "4.0.1" } }, "handle-thing": { @@ -6531,8 +6558,8 @@ "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "dev": true, "requires": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" + "ajv": "6.12.5", + "har-schema": "2.0.0" } }, "has": { @@ -6541,7 +6568,7 @@ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dev": true, "requires": { - "function-bind": "^1.1.1" + "function-bind": "1.1.1" } }, "has-ansi": { @@ -6550,7 +6577,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "has-flag": { @@ -6577,9 +6604,9 @@ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { - "get-value": "^2.0.6", - "has-values": "^1.0.0", - "isobject": "^3.0.0" + "get-value": "2.0.6", + "has-values": "1.0.0", + "isobject": "3.0.1" } }, "has-values": { @@ -6588,8 +6615,8 @@ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { - "is-number": "^3.0.0", - "kind-of": "^4.0.0" + "is-number": "3.0.0", + "kind-of": "4.0.0" }, "dependencies": { "is-buffer": { @@ -6604,7 +6631,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -6613,7 +6640,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6624,7 +6651,7 @@ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -6635,9 +6662,9 @@ "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", "dev": true, "requires": { - "inherits": "^2.0.4", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "inherits": "2.0.4", + "readable-stream": "3.6.0", + "safe-buffer": "5.2.1" }, "dependencies": { "safe-buffer": { @@ -6660,8 +6687,8 @@ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", "dev": true, "requires": { - "inherits": "^2.0.3", - "minimalistic-assert": "^1.0.1" + "inherits": "2.0.4", + "minimalistic-assert": "1.0.1" } }, "he": { @@ -6682,9 +6709,9 @@ "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "^1.0.3", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.1" + "hash.js": "1.1.7", + "minimalistic-assert": "1.0.1", + "minimalistic-crypto-utils": "1.0.1" } }, "hoopy": { @@ -6705,10 +6732,10 @@ "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, "requires": { - "inherits": "^2.0.1", - "obuf": "^1.0.0", - "readable-stream": "^2.0.1", - "wbuf": "^1.1.0" + "inherits": "2.0.4", + "obuf": "1.1.2", + "readable-stream": "2.3.7", + "wbuf": "1.7.3" }, "dependencies": { "readable-stream": { @@ -6717,13 +6744,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -6758,13 +6785,13 @@ "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", "dev": true, "requires": { - "camel-case": "^3.0.0", - "clean-css": "^4.2.1", - "commander": "^2.19.0", - "he": "^1.2.0", - "param-case": "^2.1.1", - "relateurl": "^0.2.7", - "uglify-js": "^3.5.1" + "camel-case": "3.0.0", + "clean-css": "4.2.3", + "commander": "2.20.3", + "he": "1.2.0", + "param-case": "2.1.1", + "relateurl": "0.2.7", + "uglify-js": "3.11.0" } }, "html-minifier-terser": { @@ -6773,13 +6800,13 @@ "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==", "dev": true, "requires": { - "camel-case": "^4.1.1", - "clean-css": "^4.2.3", - "commander": "^4.1.1", - "he": "^1.2.0", - "param-case": "^3.0.3", - "relateurl": "^0.2.7", - "terser": "^4.6.3" + "camel-case": "4.1.1", + "clean-css": "4.2.3", + "commander": "4.1.1", + "he": "1.2.0", + "param-case": "3.0.3", + "relateurl": "0.2.7", + "terser": "4.8.0" }, "dependencies": { "camel-case": { @@ -6788,8 +6815,8 @@ "integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==", "dev": true, "requires": { - "pascal-case": "^3.1.1", - "tslib": "^1.10.0" + "pascal-case": "3.1.1", + "tslib": "1.13.0" } }, "commander": { @@ -6804,8 +6831,8 @@ "integrity": "sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==", "dev": true, "requires": { - "dot-case": "^3.0.3", - "tslib": "^1.10.0" + "dot-case": "3.0.3", + "tslib": "1.13.0" } }, "tslib": { @@ -6822,14 +6849,14 @@ "integrity": "sha512-C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w==", "dev": true, "requires": { - "@types/html-minifier-terser": "^5.0.0", - "@types/tapable": "^1.0.5", - "@types/webpack": "^4.41.8", - "html-minifier-terser": "^5.0.1", - "loader-utils": "^1.2.3", - "lodash": "^4.17.15", - "pretty-error": "^2.1.1", - "tapable": "^1.1.3", + "@types/html-minifier-terser": "5.1.1", + "@types/tapable": "1.0.6", + "@types/webpack": "4.41.22", + "html-minifier-terser": "5.1.1", + "loader-utils": "1.4.0", + "lodash": "4.17.20", + "pretty-error": "2.1.1", + "tapable": "1.1.3", "util.promisify": "1.0.0" }, "dependencies": { @@ -6851,12 +6878,12 @@ "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", "dev": true, "requires": { - "domelementtype": "^1.3.1", - "domhandler": "^2.3.0", - "domutils": "^1.5.1", - "entities": "^1.1.1", - "inherits": "^2.0.1", - "readable-stream": "^3.1.1" + "domelementtype": "1.3.1", + "domhandler": "2.4.2", + "domutils": "1.7.0", + "entities": "1.1.2", + "inherits": "2.0.4", + "readable-stream": "3.6.0" }, "dependencies": { "entities": { @@ -6885,10 +6912,10 @@ "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", "dev": true, "requires": { - "depd": "~1.1.2", + "depd": "1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", + "statuses": "1.5.0", "toidentifier": "1.0.0" }, "dependencies": { @@ -6906,9 +6933,9 @@ "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { - "eventemitter3": "^4.0.0", - "follow-redirects": "^1.0.0", - "requires-port": "^1.0.0" + "eventemitter3": "4.0.7", + "follow-redirects": "1.5.10", + "requires-port": "1.0.0" } }, "http-proxy-middleware": { @@ -6917,10 +6944,10 @@ "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", "dev": true, "requires": { - "http-proxy": "^1.17.0", - "is-glob": "^4.0.0", - "lodash": "^4.17.11", - "micromatch": "^3.1.10" + "http-proxy": "1.18.1", + "is-glob": "4.0.1", + "lodash": "4.17.20", + "micromatch": "3.1.10" }, "dependencies": { "braces": { @@ -6929,16 +6956,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" }, "dependencies": { "extend-shallow": { @@ -6947,7 +6974,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -6958,10 +6985,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" }, "dependencies": { "extend-shallow": { @@ -6970,7 +6997,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -6987,7 +7014,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -6996,7 +7023,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -7007,19 +7034,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.3", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "to-regex-range": { @@ -7028,8 +7055,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "3.0.0", + "repeat-string": "1.6.1" } } } @@ -7040,9 +7067,9 @@ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.16.1" } }, "https-browserify": { @@ -7057,7 +7084,7 @@ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "icss-utils": { @@ -7066,7 +7093,7 @@ "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==", "dev": true, "requires": { - "postcss": "^7.0.14" + "postcss": "7.0.35" } }, "ieee754": { @@ -7093,7 +7120,7 @@ "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", "dev": true, "requires": { - "import-from": "^2.1.0" + "import-from": "2.1.0" } }, "import-fresh": { @@ -7102,8 +7129,8 @@ "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", "dev": true, "requires": { - "caller-path": "^2.0.0", - "resolve-from": "^3.0.0" + "caller-path": "2.0.0", + "resolve-from": "3.0.0" } }, "import-from": { @@ -7112,7 +7139,7 @@ "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", "dev": true, "requires": { - "resolve-from": "^3.0.0" + "resolve-from": "3.0.0" } }, "import-local": { @@ -7121,8 +7148,8 @@ "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", "dev": true, "requires": { - "pkg-dir": "^3.0.0", - "resolve-cwd": "^2.0.0" + "pkg-dir": "3.0.0", + "resolve-cwd": "2.0.0" } }, "imurmurhash": { @@ -7161,8 +7188,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "once": "1.4.0", + "wrappy": "1.0.2" } }, "inherits": { @@ -7184,19 +7211,19 @@ "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", "dev": true, "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.19", + "ansi-escapes": "4.3.1", + "chalk": "4.1.0", + "cli-cursor": "3.1.0", + "cli-width": "3.0.0", + "external-editor": "3.1.0", + "figures": "3.2.0", + "lodash": "4.17.20", "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.6.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" + "run-async": "2.4.1", + "rxjs": "6.6.3", + "string-width": "4.2.0", + "strip-ansi": "6.0.0", + "through": "2.3.8" }, "dependencies": { "is-fullwidth-code-point": { @@ -7211,9 +7238,9 @@ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "emoji-regex": "8.0.0", + "is-fullwidth-code-point": "3.0.0", + "strip-ansi": "6.0.0" } } } @@ -7224,8 +7251,8 @@ "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==", "dev": true, "requires": { - "default-gateway": "^4.2.0", - "ipaddr.js": "^1.9.0" + "default-gateway": "4.2.0", + "ipaddr.js": "1.9.1" } }, "invariant": { @@ -7234,7 +7261,7 @@ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dev": true, "requires": { - "loose-envify": "^1.0.0" + "loose-envify": "1.4.0" } }, "ip": { @@ -7267,7 +7294,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "is-buffer": { @@ -7282,7 +7309,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -7305,7 +7332,7 @@ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, "requires": { - "binary-extensions": "^2.0.0" + "binary-extensions": "2.1.0" } }, "is-buffer": { @@ -7325,12 +7352,12 @@ "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=", "dev": true, "requires": { - "css-color-names": "^0.0.4", - "hex-color-regex": "^1.1.0", - "hsl-regex": "^1.0.0", - "hsla-regex": "^1.0.0", - "rgb-regex": "^1.0.1", - "rgba-regex": "^1.0.0" + "css-color-names": "0.0.4", + "hex-color-regex": "1.1.0", + "hsl-regex": "1.0.0", + "hsla-regex": "1.0.0", + "rgb-regex": "1.0.1", + "rgba-regex": "1.0.0" } }, "is-data-descriptor": { @@ -7339,7 +7366,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "is-buffer": { @@ -7354,7 +7381,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -7371,9 +7398,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" + "is-accessor-descriptor": "0.1.6", + "is-data-descriptor": "0.1.4", + "kind-of": "5.1.0" }, "dependencies": { "kind-of": { @@ -7426,7 +7453,7 @@ "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "dev": true, "requires": { - "is-extglob": "^2.1.1" + "is-extglob": "2.1.1" } }, "is-negative-zero": { @@ -7459,7 +7486,7 @@ "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", "dev": true, "requires": { - "is-path-inside": "^2.1.0" + "is-path-inside": "2.1.0" } }, "is-path-inside": { @@ -7468,7 +7495,7 @@ "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", "dev": true, "requires": { - "path-is-inside": "^1.0.2" + "path-is-inside": "1.0.2" } }, "is-plain-obj": { @@ -7483,7 +7510,7 @@ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "is-regex": { @@ -7492,7 +7519,7 @@ "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", "dev": true, "requires": { - "has-symbols": "^1.0.1" + "has-symbols": "1.0.1" } }, "is-resolvable": { @@ -7513,7 +7540,7 @@ "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==", "dev": true, "requires": { - "html-comment-regex": "^1.1.0" + "html-comment-regex": "1.1.2" } }, "is-symbol": { @@ -7522,7 +7549,7 @@ "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", "dev": true, "requires": { - "has-symbols": "^1.0.1" + "has-symbols": "1.0.1" } }, "is-typedarray": { @@ -7549,7 +7576,7 @@ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, "requires": { - "is-docker": "^2.0.0" + "is-docker": "2.1.1" } }, "isarray": { @@ -7594,9 +7621,9 @@ "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==", "dev": true, "requires": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^7.0.0" + "@types/node": "10.17.35", + "merge-stream": "2.0.0", + "supports-color": "7.2.0" }, "dependencies": { "has-flag": { @@ -7611,7 +7638,7 @@ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { - "has-flag": "^4.0.0" + "has-flag": "4.0.0" } } } @@ -7634,8 +7661,8 @@ "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "1.0.10", + "esprima": "4.0.1" } }, "jsbn": { @@ -7698,7 +7725,7 @@ "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "dev": true, "requires": { - "minimist": "^1.2.5" + "minimist": "1.2.5" } }, "jsonfile": { @@ -7707,7 +7734,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "^4.1.6" + "graceful-fs": "4.2.4" } }, "jsprim": { @@ -7749,8 +7776,8 @@ "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==", "dev": true, "requires": { - "lodash": "^4.17.5", - "webpack-sources": "^1.1.0" + "lodash": "4.17.20", + "webpack-sources": "1.4.3" } }, "launch-editor": { @@ -7759,8 +7786,8 @@ "integrity": "sha512-On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw==", "dev": true, "requires": { - "chalk": "^2.3.0", - "shell-quote": "^1.6.1" + "chalk": "2.4.2", + "shell-quote": "1.7.2" }, "dependencies": { "chalk": { @@ -7769,9 +7796,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } } } @@ -7782,7 +7809,7 @@ "integrity": "sha512-s0UO2/gEGiCgei3/2UN3SMuUj1phjQN8lcpnvgLSz26fAzNWPQ6Nf/kF5IFClnfU2ehp6LrmKdMU/beveO+2jg==", "dev": true, "requires": { - "launch-editor": "^2.2.1" + "launch-editor": "2.2.1" } }, "lazystream": { @@ -7791,7 +7818,7 @@ "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", "dev": true, "requires": { - "readable-stream": "^2.0.5" + "readable-stream": "2.3.7" }, "dependencies": { "readable-stream": { @@ -7800,13 +7827,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -7823,7 +7850,7 @@ "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==", "dev": true, "requires": { - "leven": "^3.1.0" + "leven": "3.1.0" } }, "levn": { @@ -7832,8 +7859,8 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" + "prelude-ls": "1.1.2", + "type-check": "0.3.2" } }, "load-json-file": { @@ -7842,11 +7869,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" + "graceful-fs": "4.2.4", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" }, "dependencies": { "parse-json": { @@ -7855,7 +7882,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "^1.2.0" + "error-ex": "1.3.2" } }, "pify": { @@ -7872,8 +7899,8 @@ "integrity": "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==", "dev": true, "requires": { - "find-cache-dir": "^0.1.1", - "mkdirp": "^0.5.1" + "find-cache-dir": "0.1.1", + "mkdirp": "0.5.5" }, "dependencies": { "find-cache-dir": { @@ -7882,9 +7909,9 @@ "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", "dev": true, "requires": { - "commondir": "^1.0.1", - "mkdirp": "^0.5.1", - "pkg-dir": "^1.0.0" + "commondir": "1.0.1", + "mkdirp": "0.5.5", + "pkg-dir": "1.0.0" } }, "find-up": { @@ -7893,8 +7920,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } }, "path-exists": { @@ -7903,7 +7930,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } }, "pkg-dir": { @@ -7912,7 +7939,7 @@ "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { - "find-up": "^1.0.0" + "find-up": "1.1.2" } } } @@ -7929,9 +7956,9 @@ "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", "dev": true, "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "big.js": "5.2.2", + "emojis-list": "3.0.0", + "json5": "1.0.1" }, "dependencies": { "json5": { @@ -7940,7 +7967,7 @@ "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "requires": { - "minimist": "^1.2.0" + "minimist": "1.2.5" } } } @@ -7951,8 +7978,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "^3.0.0", - "path-exists": "^3.0.0" + "p-locate": "3.0.0", + "path-exists": "3.0.0" } }, "lodash": { @@ -8015,8 +8042,8 @@ "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", "dev": true, "requires": { - "lodash._reinterpolate": "^3.0.0", - "lodash.templatesettings": "^4.0.0" + "lodash._reinterpolate": "3.0.0", + "lodash.templatesettings": "4.2.0" } }, "lodash.templatesettings": { @@ -8025,7 +8052,7 @@ "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", "dev": true, "requires": { - "lodash._reinterpolate": "^3.0.0" + "lodash._reinterpolate": "3.0.0" } }, "lodash.throttle": { @@ -8052,10 +8079,10 @@ "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", "dev": true, "requires": { - "ansi-escapes": "^4.3.0", - "cli-cursor": "^3.1.0", - "slice-ansi": "^4.0.0", - "wrap-ansi": "^6.2.0" + "ansi-escapes": "4.3.1", + "cli-cursor": "3.1.0", + "slice-ansi": "4.0.0", + "wrap-ansi": "6.2.0" } }, "loglevel": { @@ -8070,7 +8097,7 @@ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "dev": true, "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" + "js-tokens": "4.0.0" } }, "loud-rejection": { @@ -8079,8 +8106,8 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "^0.4.1", - "signal-exit": "^3.0.0" + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.3" } }, "lower-case": { @@ -8101,7 +8128,7 @@ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { - "yallist": "^4.0.0" + "yallist": "4.0.0" } }, "make-dir": { @@ -8110,8 +8137,8 @@ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, "requires": { - "pify": "^4.0.1", - "semver": "^5.6.0" + "pify": "4.0.1", + "semver": "5.7.1" }, "dependencies": { "semver": { @@ -8140,7 +8167,7 @@ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { - "object-visit": "^1.0.0" + "object-visit": "1.0.1" } }, "matcher": { @@ -8150,7 +8177,7 @@ "dev": true, "optional": true, "requires": { - "escape-string-regexp": "^4.0.0" + "escape-string-regexp": "4.0.0" }, "dependencies": { "escape-string-regexp": { @@ -8168,9 +8195,9 @@ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", "dev": true, "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" + "hash-base": "3.1.0", + "inherits": "2.0.4", + "safe-buffer": "5.1.2" } }, "mdn-data": { @@ -8191,8 +8218,8 @@ "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", "dev": true, "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" + "errno": "0.1.7", + "readable-stream": "2.3.7" }, "dependencies": { "readable-stream": { @@ -8201,13 +8228,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -8218,16 +8245,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "^2.0.0", - "decamelize": "^1.1.2", - "loud-rejection": "^1.0.0", - "map-obj": "^1.0.1", - "minimist": "^1.1.3", - "normalize-package-data": "^2.3.4", - "object-assign": "^4.0.1", - "read-pkg-up": "^1.0.1", - "redent": "^1.0.0", - "trim-newlines": "^1.0.0" + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.5", + "normalize-package-data": "2.5.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" } }, "merge-descriptors": { @@ -8242,7 +8269,7 @@ "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", "dev": true, "requires": { - "source-map": "^0.6.1" + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -8283,8 +8310,8 @@ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", "dev": true, "requires": { - "braces": "^3.0.1", - "picomatch": "^2.0.5" + "braces": "3.0.2", + "picomatch": "2.2.2" } }, "miller-rabin": { @@ -8293,8 +8320,8 @@ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", "dev": true, "requires": { - "bn.js": "^4.0.0", - "brorand": "^1.0.1" + "bn.js": "4.11.9", + "brorand": "1.1.0" }, "dependencies": { "bn.js": { @@ -8344,10 +8371,10 @@ "integrity": "sha512-QgKgJBjaJhxVPwrLNqqwNS0AGkuQQ31Hp4xGXEK/P7wehEg6qmNtReHKai3zRXqY60wGVWLYcOMJK2b98aGc3A==", "dev": true, "requires": { - "loader-utils": "^1.1.0", + "loader-utils": "1.4.0", "normalize-url": "1.9.1", - "schema-utils": "^1.0.0", - "webpack-sources": "^1.1.0" + "schema-utils": "1.0.0", + "webpack-sources": "1.4.3" }, "dependencies": { "normalize-url": { @@ -8399,7 +8426,7 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "brace-expansion": "^1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { @@ -8414,7 +8441,7 @@ "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==", "dev": true, "requires": { - "yallist": "^4.0.0" + "yallist": "4.0.0" } }, "minipass-collect": { @@ -8423,7 +8450,7 @@ "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", "dev": true, "requires": { - "minipass": "^3.0.0" + "minipass": "3.1.3" } }, "minipass-flush": { @@ -8432,7 +8459,7 @@ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", "dev": true, "requires": { - "minipass": "^3.0.0" + "minipass": "3.1.3" } }, "minipass-pipeline": { @@ -8441,7 +8468,7 @@ "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", "dev": true, "requires": { - "minipass": "^3.0.0" + "minipass": "3.1.3" } }, "minizlib": { @@ -8450,8 +8477,8 @@ "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "dev": true, "requires": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" + "minipass": "3.1.3", + "yallist": "4.0.0" } }, "mississippi": { @@ -8460,16 +8487,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" + "concat-stream": "1.6.2", + "duplexify": "3.7.1", + "end-of-stream": "1.4.4", + "flush-write-stream": "1.1.1", + "from2": "2.3.0", + "parallel-transform": "1.2.0", + "pump": "3.0.0", + "pumpify": "1.5.1", + "stream-each": "1.2.3", + "through2": "2.0.5" } }, "mixin-deep": { @@ -8478,8 +8505,8 @@ "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { - "for-in": "^1.0.2", - "is-extendable": "^1.0.1" + "for-in": "1.0.2", + "is-extendable": "1.0.1" }, "dependencies": { "is-extendable": { @@ -8488,7 +8515,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "^2.0.4" + "is-plain-object": "2.0.4" } } } @@ -8499,7 +8526,7 @@ "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, "requires": { - "minimist": "^1.2.5" + "minimist": "1.2.5" } }, "moment": { @@ -8514,12 +8541,12 @@ "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "dev": true, "requires": { - "aproba": "^1.1.1", - "copy-concurrently": "^1.0.0", - "fs-write-stream-atomic": "^1.0.8", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.3" + "aproba": "1.2.0", + "copy-concurrently": "1.0.5", + "fs-write-stream-atomic": "1.0.10", + "mkdirp": "0.5.5", + "rimraf": "2.7.1", + "run-queue": "1.0.3" }, "dependencies": { "rimraf": { @@ -8528,7 +8555,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.6" } } } @@ -8544,8 +8571,8 @@ "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", "dev": true, "requires": { - "dns-packet": "^1.3.1", - "thunky": "^1.0.2" + "dns-packet": "1.3.1", + "thunky": "1.1.0" } }, "multicast-dns-service-types": { @@ -8572,17 +8599,17 @@ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "fragment-cache": "^0.2.1", - "is-windows": "^1.0.2", - "kind-of": "^6.0.2", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "fragment-cache": "0.2.1", + "is-windows": "1.0.2", + "kind-of": "6.0.3", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "natural-compare": { @@ -8615,7 +8642,16 @@ "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", "dev": true, "requires": { - "lower-case": "^1.1.1" + "lower-case": "1.1.4" + } + }, + "node-dir": { + "version": "0.1.17", + "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", + "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=", + "dev": true, + "requires": { + "minimatch": "3.0.4" } }, "node-forge": { @@ -8630,18 +8666,18 @@ "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", "dev": true, "requires": { - "fstream": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "osenv": "0", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", - "tar": "^2.0.0", - "which": "1" + "fstream": "1.0.12", + "glob": "7.1.6", + "graceful-fs": "4.2.4", + "mkdirp": "0.5.5", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.5", + "request": "2.88.2", + "rimraf": "2.7.1", + "semver": "5.3.0", + "tar": "2.2.2", + "which": "1.3.1" }, "dependencies": { "rimraf": { @@ -8650,7 +8686,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.6" } }, "semver": { @@ -8665,9 +8701,9 @@ "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", "dev": true, "requires": { - "block-stream": "*", - "fstream": "^1.0.12", - "inherits": "2" + "block-stream": "0.0.9", + "fstream": "1.0.12", + "inherits": "2.0.4" } }, "which": { @@ -8676,7 +8712,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } } } @@ -8687,29 +8723,29 @@ "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", "dev": true, "requires": { - "assert": "^1.1.1", - "browserify-zlib": "^0.2.0", - "buffer": "^4.3.0", - "console-browserify": "^1.1.0", - "constants-browserify": "^1.0.0", - "crypto-browserify": "^3.11.0", - "domain-browser": "^1.1.1", - "events": "^3.0.0", - "https-browserify": "^1.0.0", - "os-browserify": "^0.3.0", + "assert": "1.5.0", + "browserify-zlib": "0.2.0", + "buffer": "4.9.2", + "console-browserify": "1.2.0", + "constants-browserify": "1.0.0", + "crypto-browserify": "3.12.0", + "domain-browser": "1.2.0", + "events": "3.2.0", + "https-browserify": "1.0.0", + "os-browserify": "0.3.0", "path-browserify": "0.0.1", - "process": "^0.11.10", - "punycode": "^1.2.4", - "querystring-es3": "^0.2.0", - "readable-stream": "^2.3.3", - "stream-browserify": "^2.0.1", - "stream-http": "^2.7.2", - "string_decoder": "^1.0.0", - "timers-browserify": "^2.0.4", + "process": "0.11.10", + "punycode": "1.4.1", + "querystring-es3": "0.2.1", + "readable-stream": "2.3.7", + "stream-browserify": "2.0.2", + "stream-http": "2.8.3", + "string_decoder": "1.1.1", + "timers-browserify": "2.0.11", "tty-browserify": "0.0.0", - "url": "^0.11.0", - "util": "^0.11.0", - "vm-browserify": "^1.0.1" + "url": "0.11.0", + "util": "0.11.1", + "vm-browserify": "1.1.2" }, "dependencies": { "buffer": { @@ -8718,9 +8754,9 @@ "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", "dev": true, "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" + "base64-js": "1.3.1", + "ieee754": "1.1.13", + "isarray": "1.0.0" } }, "punycode": { @@ -8735,13 +8771,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -8752,8 +8788,8 @@ "integrity": "sha512-0So+BicZSQaY4sLqeutdkXWiTsmr+QrlGtm5dn4OPJBcnZRmjupFbWnZbDLec95KQTZHAwt8+vk+nEIXzPHxGw==", "dev": true, "requires": { - "loader-utils": "^2.0.0", - "schema-utils": "^2.7.0" + "loader-utils": "2.0.0", + "schema-utils": "2.7.1" }, "dependencies": { "loader-utils": { @@ -8762,9 +8798,9 @@ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" + "big.js": "5.2.2", + "emojis-list": "3.0.0", + "json5": "2.1.3" } } } @@ -8781,23 +8817,23 @@ "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", "dev": true, "requires": { - "async-foreach": "^0.1.3", - "chalk": "^1.1.1", - "cross-spawn": "^3.0.0", - "gaze": "^1.0.0", - "get-stdin": "^4.0.1", - "glob": "^7.0.3", - "in-publish": "^2.0.0", - "lodash": "^4.17.15", - "meow": "^3.7.0", - "mkdirp": "^0.5.1", - "nan": "^2.13.2", - "node-gyp": "^3.8.0", - "npmlog": "^4.0.0", - "request": "^2.88.0", + "async-foreach": "0.1.3", + "chalk": "1.1.3", + "cross-spawn": "3.0.1", + "gaze": "1.1.3", + "get-stdin": "4.0.1", + "glob": "7.1.6", + "in-publish": "2.0.1", + "lodash": "4.17.20", + "meow": "3.7.0", + "mkdirp": "0.5.5", + "nan": "2.14.1", + "node-gyp": "3.8.0", + "npmlog": "4.1.2", + "request": "2.88.2", "sass-graph": "2.2.5", - "stdout-stream": "^1.4.0", - "true-case-path": "^1.0.2" + "stdout-stream": "1.4.1", + "true-case-path": "1.0.3" }, "dependencies": { "ansi-styles": { @@ -8812,11 +8848,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "cross-spawn": { @@ -8825,8 +8861,8 @@ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" + "lru-cache": "4.1.5", + "which": "1.3.1" } }, "lru-cache": { @@ -8835,8 +8871,8 @@ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dev": true, "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "pseudomap": "1.0.2", + "yallist": "2.1.2" } }, "strip-ansi": { @@ -8845,7 +8881,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "supports-color": { @@ -8860,7 +8896,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "yallist": { @@ -8877,7 +8913,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1" + "abbrev": "1.1.1" } }, "normalize-package-data": { @@ -8886,10 +8922,10 @@ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" + "hosted-git-info": "2.8.8", + "resolve": "1.17.0", + "semver": "5.7.1", + "validate-npm-package-license": "3.0.4" }, "dependencies": { "semver": { @@ -8925,8 +8961,8 @@ "dev": true, "optional": true, "requires": { - "config-chain": "^1.1.11", - "pify": "^3.0.0" + "config-chain": "1.1.12", + "pify": "3.0.0" }, "dependencies": { "pify": { @@ -8944,7 +8980,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "^2.0.0" + "path-key": "2.0.1" }, "dependencies": { "path-key": { @@ -8961,10 +8997,10 @@ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "are-we-there-yet": "1.1.5", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" } }, "nth-check": { @@ -8973,7 +9009,7 @@ "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", "dev": true, "requires": { - "boolbase": "~1.0.0" + "boolbase": "1.0.0" } }, "num2fraction": { @@ -9006,9 +9042,9 @@ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { - "copy-descriptor": "^0.1.0", - "define-property": "^0.2.5", - "kind-of": "^3.0.3" + "copy-descriptor": "0.1.1", + "define-property": "0.2.5", + "kind-of": "3.2.2" }, "dependencies": { "define-property": { @@ -9017,7 +9053,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "is-buffer": { @@ -9032,7 +9068,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -9055,8 +9091,8 @@ "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.1" + "define-properties": "1.1.3", + "es-abstract": "1.18.0-next.1" } }, "object-keys": { @@ -9071,7 +9107,7 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { - "isobject": "^3.0.0" + "isobject": "3.0.1" } }, "object.assign": { @@ -9080,10 +9116,10 @@ "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.18.0-next.0", - "has-symbols": "^1.0.1", - "object-keys": "^1.1.1" + "define-properties": "1.1.3", + "es-abstract": "1.18.0-next.1", + "has-symbols": "1.0.1", + "object-keys": "1.1.1" } }, "object.getownpropertydescriptors": { @@ -9092,8 +9128,8 @@ "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" + "define-properties": "1.1.3", + "es-abstract": "1.17.7" }, "dependencies": { "es-abstract": { @@ -9102,17 +9138,17 @@ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" } } } @@ -9123,7 +9159,7 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { - "isobject": "^3.0.1" + "isobject": "3.0.1" } }, "object.values": { @@ -9132,10 +9168,10 @@ "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1", - "function-bind": "^1.1.1", - "has": "^1.0.3" + "define-properties": "1.1.3", + "es-abstract": "1.17.7", + "function-bind": "1.1.1", + "has": "1.0.3" }, "dependencies": { "es-abstract": { @@ -9144,17 +9180,17 @@ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" } } } @@ -9186,7 +9222,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1" + "wrappy": "1.0.2" } }, "onetime": { @@ -9195,7 +9231,7 @@ "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, "requires": { - "mimic-fn": "^2.1.0" + "mimic-fn": "2.1.0" } }, "open": { @@ -9204,8 +9240,8 @@ "integrity": "sha512-lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA==", "dev": true, "requires": { - "is-docker": "^2.0.0", - "is-wsl": "^2.1.1" + "is-docker": "2.1.1", + "is-wsl": "2.2.0" } }, "opener": { @@ -9220,7 +9256,7 @@ "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", "dev": true, "requires": { - "is-wsl": "^1.1.0" + "is-wsl": "1.1.0" }, "dependencies": { "is-wsl": { @@ -9237,8 +9273,8 @@ "integrity": "sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA==", "dev": true, "requires": { - "cssnano": "^4.1.10", - "last-call-webpack-plugin": "^3.0.0" + "cssnano": "4.1.10", + "last-call-webpack-plugin": "3.0.0" } }, "optionator": { @@ -9247,12 +9283,12 @@ "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", "dev": true, "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "word-wrap": "1.2.3" } }, "original": { @@ -9261,7 +9297,7 @@ "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", "dev": true, "requires": { - "url-parse": "^1.4.3" + "url-parse": "1.4.7" } }, "os-browserify": { @@ -9288,8 +9324,8 @@ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" } }, "ouch": { @@ -9299,9 +9335,9 @@ "dev": true, "requires": { "@positron/stack-trace": "1.0.0", - "ejs": "^2.3.1", - "escape-html": "^1.0.1", - "lodash": "^4.17.10" + "ejs": "2.7.4", + "escape-html": "1.0.3", + "lodash": "4.17.20" } }, "p-cancelable": { @@ -9322,7 +9358,7 @@ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "p-try": "^2.0.0" + "p-try": "2.2.0" } }, "p-locate": { @@ -9331,7 +9367,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "^2.0.0" + "p-limit": "2.3.0" } }, "p-map": { @@ -9340,7 +9376,7 @@ "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, "requires": { - "aggregate-error": "^3.0.0" + "aggregate-error": "3.1.0" } }, "p-retry": { @@ -9349,7 +9385,7 @@ "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", "dev": true, "requires": { - "retry": "^0.12.0" + "retry": "0.12.0" } }, "p-try": { @@ -9370,9 +9406,9 @@ "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", "dev": true, "requires": { - "cyclist": "^1.0.1", - "inherits": "^2.0.3", - "readable-stream": "^2.1.5" + "cyclist": "1.0.1", + "inherits": "2.0.4", + "readable-stream": "2.3.7" }, "dependencies": { "readable-stream": { @@ -9381,13 +9417,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -9398,7 +9434,7 @@ "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", "dev": true, "requires": { - "no-case": "^2.2.0" + "no-case": "2.3.2" } }, "parent-module": { @@ -9407,7 +9443,7 @@ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, "requires": { - "callsites": "^3.0.0" + "callsites": "3.1.0" }, "dependencies": { "callsites": { @@ -9424,11 +9460,11 @@ "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", "dev": true, "requires": { - "asn1.js": "^5.2.0", - "browserify-aes": "^1.0.0", - "evp_bytestokey": "^1.0.0", - "pbkdf2": "^3.0.3", - "safe-buffer": "^5.1.1" + "asn1.js": "5.4.1", + "browserify-aes": "1.2.0", + "evp_bytestokey": "1.0.3", + "pbkdf2": "3.1.1", + "safe-buffer": "5.1.2" } }, "parse-json": { @@ -9437,8 +9473,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" + "error-ex": "1.3.2", + "json-parse-better-errors": "1.0.2" } }, "parseurl": { @@ -9453,8 +9489,8 @@ "integrity": "sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==", "dev": true, "requires": { - "no-case": "^3.0.3", - "tslib": "^1.10.0" + "no-case": "3.0.3", + "tslib": "1.13.0" }, "dependencies": { "lower-case": { @@ -9463,7 +9499,7 @@ "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==", "dev": true, "requires": { - "tslib": "^1.10.0" + "tslib": "1.13.0" } }, "no-case": { @@ -9472,8 +9508,8 @@ "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==", "dev": true, "requires": { - "lower-case": "^2.0.1", - "tslib": "^1.10.0" + "lower-case": "2.0.1", + "tslib": "1.13.0" } }, "tslib": { @@ -9550,11 +9586,11 @@ "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==", "dev": true, "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "create-hash": "1.2.0", + "create-hmac": "1.1.7", + "ripemd160": "2.0.2", + "safe-buffer": "5.1.2", + "sha.js": "2.4.11" } }, "performance-now": { @@ -9587,7 +9623,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "^2.0.0" + "pinkie": "2.0.4" } }, "pkg-dir": { @@ -9596,7 +9632,7 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "^3.0.0" + "find-up": "3.0.0" } }, "pkg-up": { @@ -9605,7 +9641,7 @@ "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", "dev": true, "requires": { - "find-up": "^3.0.0" + "find-up": "3.0.0" } }, "plist": { @@ -9614,9 +9650,9 @@ "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==", "dev": true, "requires": { - "base64-js": "^1.2.3", - "xmlbuilder": "^9.0.7", - "xmldom": "0.1.x" + "base64-js": "1.3.1", + "xmlbuilder": "9.0.7", + "xmldom": "0.1.31" } }, "portfinder": { @@ -9625,9 +9661,9 @@ "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", "dev": true, "requires": { - "async": "^2.6.2", - "debug": "^3.1.1", - "mkdirp": "^0.5.5" + "async": "2.6.3", + "debug": "3.2.6", + "mkdirp": "0.5.5" }, "dependencies": { "async": { @@ -9636,7 +9672,7 @@ "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", "dev": true, "requires": { - "lodash": "^4.17.14" + "lodash": "4.17.20" } }, "debug": { @@ -9668,9 +9704,9 @@ "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", "dev": true, "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" + "chalk": "2.4.2", + "source-map": "0.6.1", + "supports-color": "6.1.0" }, "dependencies": { "chalk": { @@ -9679,9 +9715,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" }, "dependencies": { "supports-color": { @@ -9690,7 +9726,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } } } @@ -9718,9 +9754,9 @@ "integrity": "sha512-0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw==", "dev": true, "requires": { - "postcss": "^7.0.27", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.0.2" + "postcss": "7.0.35", + "postcss-selector-parser": "6.0.4", + "postcss-value-parser": "4.1.0" } }, "postcss-colormin": { @@ -9729,11 +9765,11 @@ "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==", "dev": true, "requires": { - "browserslist": "^4.0.0", - "color": "^3.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "browserslist": "4.14.5", + "color": "3.1.2", + "has": "1.0.3", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -9750,8 +9786,8 @@ "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==", "dev": true, "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -9768,7 +9804,7 @@ "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==", "dev": true, "requires": { - "postcss": "^7.0.0" + "postcss": "7.0.35" } }, "postcss-discard-duplicates": { @@ -9777,7 +9813,7 @@ "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==", "dev": true, "requires": { - "postcss": "^7.0.0" + "postcss": "7.0.35" } }, "postcss-discard-empty": { @@ -9786,7 +9822,7 @@ "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==", "dev": true, "requires": { - "postcss": "^7.0.0" + "postcss": "7.0.35" } }, "postcss-discard-overridden": { @@ -9795,7 +9831,7 @@ "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==", "dev": true, "requires": { - "postcss": "^7.0.0" + "postcss": "7.0.35" } }, "postcss-load-config": { @@ -9804,8 +9840,8 @@ "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==", "dev": true, "requires": { - "cosmiconfig": "^5.0.0", - "import-cwd": "^2.0.0" + "cosmiconfig": "5.2.1", + "import-cwd": "2.1.0" } }, "postcss-loader": { @@ -9814,10 +9850,10 @@ "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", "dev": true, "requires": { - "loader-utils": "^1.1.0", - "postcss": "^7.0.0", - "postcss-load-config": "^2.0.0", - "schema-utils": "^1.0.0" + "loader-utils": "1.4.0", + "postcss": "7.0.35", + "postcss-load-config": "2.1.2", + "schema-utils": "1.0.0" }, "dependencies": { "schema-utils": { @@ -9826,9 +9862,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "ajv": "6.12.5", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.5.2" } } } @@ -9840,9 +9876,9 @@ "dev": true, "requires": { "css-color-names": "0.0.4", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "stylehacks": "^4.0.0" + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1", + "stylehacks": "4.0.3" }, "dependencies": { "postcss-value-parser": { @@ -9859,12 +9895,12 @@ "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==", "dev": true, "requires": { - "browserslist": "^4.0.0", - "caniuse-api": "^3.0.0", - "cssnano-util-same-parent": "^4.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0", - "vendors": "^1.0.0" + "browserslist": "4.14.5", + "caniuse-api": "3.0.0", + "cssnano-util-same-parent": "4.0.1", + "postcss": "7.0.35", + "postcss-selector-parser": "3.1.2", + "vendors": "1.0.4" }, "dependencies": { "postcss-selector-parser": { @@ -9873,9 +9909,9 @@ "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "dot-prop": "5.2.0", + "indexes-of": "1.0.1", + "uniq": "1.0.1" } } } @@ -9886,8 +9922,8 @@ "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==", "dev": true, "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -9904,10 +9940,10 @@ "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==", "dev": true, "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "is-color-stop": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-arguments": "4.0.0", + "is-color-stop": "1.1.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -9924,12 +9960,12 @@ "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==", "dev": true, "requires": { - "alphanum-sort": "^1.0.0", - "browserslist": "^4.0.0", - "cssnano-util-get-arguments": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "uniqs": "^2.0.0" + "alphanum-sort": "1.0.2", + "browserslist": "4.14.5", + "cssnano-util-get-arguments": "4.0.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1", + "uniqs": "2.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9946,10 +9982,10 @@ "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==", "dev": true, "requires": { - "alphanum-sort": "^1.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0" + "alphanum-sort": "1.0.2", + "has": "1.0.3", + "postcss": "7.0.35", + "postcss-selector-parser": "3.1.2" }, "dependencies": { "postcss-selector-parser": { @@ -9958,9 +9994,9 @@ "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "dot-prop": "5.2.0", + "indexes-of": "1.0.1", + "uniq": "1.0.1" } } } @@ -9971,7 +10007,7 @@ "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==", "dev": true, "requires": { - "postcss": "^7.0.5" + "postcss": "7.0.35" } }, "postcss-modules-local-by-default": { @@ -9980,10 +10016,10 @@ "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==", "dev": true, "requires": { - "icss-utils": "^4.1.1", - "postcss": "^7.0.32", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.1.0" + "icss-utils": "4.1.1", + "postcss": "7.0.35", + "postcss-selector-parser": "6.0.4", + "postcss-value-parser": "4.1.0" } }, "postcss-modules-scope": { @@ -9992,8 +10028,8 @@ "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==", "dev": true, "requires": { - "postcss": "^7.0.6", - "postcss-selector-parser": "^6.0.0" + "postcss": "7.0.35", + "postcss-selector-parser": "6.0.4" } }, "postcss-modules-values": { @@ -10002,8 +10038,8 @@ "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==", "dev": true, "requires": { - "icss-utils": "^4.0.0", - "postcss": "^7.0.6" + "icss-utils": "4.1.1", + "postcss": "7.0.35" } }, "postcss-normalize-charset": { @@ -10012,7 +10048,7 @@ "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==", "dev": true, "requires": { - "postcss": "^7.0.0" + "postcss": "7.0.35" } }, "postcss-normalize-display-values": { @@ -10021,9 +10057,9 @@ "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==", "dev": true, "requires": { - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-match": "4.0.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -10040,10 +10076,10 @@ "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==", "dev": true, "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-arguments": "4.0.0", + "has": "1.0.3", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -10060,10 +10096,10 @@ "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==", "dev": true, "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-arguments": "4.0.0", + "cssnano-util-get-match": "4.0.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -10080,9 +10116,9 @@ "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==", "dev": true, "requires": { - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "has": "1.0.3", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -10099,9 +10135,9 @@ "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==", "dev": true, "requires": { - "cssnano-util-get-match": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-match": "4.0.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -10118,9 +10154,9 @@ "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==", "dev": true, "requires": { - "browserslist": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "browserslist": "4.14.5", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -10137,10 +10173,10 @@ "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==", "dev": true, "requires": { - "is-absolute-url": "^2.0.0", - "normalize-url": "^3.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "is-absolute-url": "2.1.0", + "normalize-url": "3.3.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "normalize-url": { @@ -10163,8 +10199,8 @@ "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==", "dev": true, "requires": { - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -10181,9 +10217,9 @@ "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==", "dev": true, "requires": { - "cssnano-util-get-arguments": "^4.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-arguments": "4.0.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -10200,10 +10236,10 @@ "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==", "dev": true, "requires": { - "browserslist": "^4.0.0", - "caniuse-api": "^3.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0" + "browserslist": "4.14.5", + "caniuse-api": "3.0.0", + "has": "1.0.3", + "postcss": "7.0.35" } }, "postcss-reduce-transforms": { @@ -10212,10 +10248,10 @@ "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==", "dev": true, "requires": { - "cssnano-util-get-match": "^4.0.0", - "has": "^1.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0" + "cssnano-util-get-match": "4.0.0", + "has": "1.0.3", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1" }, "dependencies": { "postcss-value-parser": { @@ -10241,7 +10277,7 @@ "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==", "dev": true, "requires": { - "postcss": "^7.0.26" + "postcss": "7.0.35" } }, "postcss-selector-parser": { @@ -10250,10 +10286,10 @@ "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==", "dev": true, "requires": { - "cssesc": "^3.0.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1", - "util-deprecate": "^1.0.2" + "cssesc": "3.0.0", + "indexes-of": "1.0.1", + "uniq": "1.0.1", + "util-deprecate": "1.0.2" } }, "postcss-svgo": { @@ -10262,10 +10298,10 @@ "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==", "dev": true, "requires": { - "is-svg": "^3.0.0", - "postcss": "^7.0.0", - "postcss-value-parser": "^3.0.0", - "svgo": "^1.0.0" + "is-svg": "3.0.0", + "postcss": "7.0.35", + "postcss-value-parser": "3.3.1", + "svgo": "1.3.2" }, "dependencies": { "postcss-value-parser": { @@ -10282,9 +10318,9 @@ "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==", "dev": true, "requires": { - "alphanum-sort": "^1.0.0", - "postcss": "^7.0.0", - "uniqs": "^2.0.0" + "alphanum-sort": "1.0.2", + "postcss": "7.0.35", + "uniqs": "2.0.0" } }, "postcss-value-parser": { @@ -10318,8 +10354,8 @@ "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", "dev": true, "requires": { - "renderkid": "^2.0.1", - "utila": "~0.4" + "renderkid": "2.0.3", + "utila": "0.4.0" } }, "process": { @@ -10359,7 +10395,7 @@ "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", "dev": true, "requires": { - "forwarded": "~0.1.2", + "forwarded": "0.1.2", "ipaddr.js": "1.9.1" } }, @@ -10387,12 +10423,12 @@ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "parse-asn1": "^5.0.0", - "randombytes": "^2.0.1", - "safe-buffer": "^5.1.2" + "bn.js": "4.11.9", + "browserify-rsa": "4.0.1", + "create-hash": "1.2.0", + "parse-asn1": "5.1.6", + "randombytes": "2.1.0", + "safe-buffer": "5.1.2" }, "dependencies": { "bn.js": { @@ -10409,8 +10445,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "end-of-stream": "1.4.4", + "once": "1.4.0" } }, "pumpify": { @@ -10419,9 +10455,9 @@ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "dev": true, "requires": { - "duplexify": "^3.6.0", - "inherits": "^2.0.3", - "pump": "^2.0.0" + "duplexify": "3.7.1", + "inherits": "2.0.4", + "pump": "2.0.1" }, "dependencies": { "pump": { @@ -10430,8 +10466,8 @@ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" + "end-of-stream": "1.4.4", + "once": "1.4.0" } } } @@ -10465,8 +10501,8 @@ "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", "dev": true, "requires": { - "object-assign": "^4.1.0", - "strict-uri-encode": "^1.0.0" + "object-assign": "4.1.1", + "strict-uri-encode": "1.1.0" } }, "querystring": { @@ -10493,7 +10529,7 @@ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, "requires": { - "safe-buffer": "^5.1.0" + "safe-buffer": "5.1.2" } }, "randomfill": { @@ -10502,8 +10538,8 @@ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "dev": true, "requires": { - "randombytes": "^2.0.5", - "safe-buffer": "^5.1.0" + "randombytes": "2.1.0", + "safe-buffer": "5.1.2" } }, "range-parser": { @@ -10530,9 +10566,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" + "load-json-file": "1.1.0", + "normalize-package-data": "2.5.0", + "path-type": "1.1.0" }, "dependencies": { "path-type": { @@ -10541,9 +10577,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "graceful-fs": "4.2.4", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pify": { @@ -10560,8 +10596,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" }, "dependencies": { "find-up": { @@ -10570,8 +10606,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" } }, "path-exists": { @@ -10580,7 +10616,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "pinkie-promise": "2.0.1" } } } @@ -10591,9 +10627,9 @@ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "inherits": "2.0.4", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "readdir-glob": { @@ -10602,7 +10638,7 @@ "integrity": "sha512-KgT0oXPIDQRRRYFf+06AUaodICTep2Q5635BORLzTEzp7rEqcR14a47j3Vzm3ix7FeI1lp8mYyG7r8lTB06Pyg==", "dev": true, "requires": { - "minimatch": "^3.0.4" + "minimatch": "3.0.4" } }, "readdirp": { @@ -10611,7 +10647,7 @@ "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", "dev": true, "requires": { - "picomatch": "^2.2.1" + "picomatch": "2.2.2" } }, "redent": { @@ -10620,8 +10656,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "^2.1.0", - "strip-indent": "^1.0.1" + "indent-string": "2.1.0", + "strip-indent": "1.0.1" }, "dependencies": { "indent-string": { @@ -10630,7 +10666,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "^2.0.0" + "repeating": "2.0.1" } } } @@ -10647,7 +10683,7 @@ "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", "dev": true, "requires": { - "regenerate": "^1.4.0" + "regenerate": "1.4.1" } }, "regenerator-runtime": { @@ -10662,7 +10698,7 @@ "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", "dev": true, "requires": { - "@babel/runtime": "^7.8.4" + "@babel/runtime": "7.11.2" } }, "regex-not": { @@ -10671,8 +10707,8 @@ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "dev": true, "requires": { - "extend-shallow": "^3.0.2", - "safe-regex": "^1.1.0" + "extend-shallow": "3.0.2", + "safe-regex": "1.1.0" } }, "regexp.prototype.flags": { @@ -10681,8 +10717,8 @@ "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.0-next.1" + "define-properties": "1.1.3", + "es-abstract": "1.17.7" }, "dependencies": { "es-abstract": { @@ -10691,17 +10727,17 @@ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" } } } @@ -10718,12 +10754,12 @@ "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==", "dev": true, "requires": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.2.0", - "regjsgen": "^0.5.1", - "regjsparser": "^0.6.4", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.2.0" + "regenerate": "1.4.1", + "regenerate-unicode-properties": "8.2.0", + "regjsgen": "0.5.2", + "regjsparser": "0.6.4", + "unicode-match-property-ecmascript": "1.0.4", + "unicode-match-property-value-ecmascript": "1.2.0" } }, "register-service-worker": { @@ -10744,7 +10780,7 @@ "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", "dev": true, "requires": { - "jsesc": "~0.5.0" + "jsesc": "0.5.0" }, "dependencies": { "jsesc": { @@ -10773,11 +10809,11 @@ "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==", "dev": true, "requires": { - "css-select": "^1.1.0", - "dom-converter": "^0.2", - "htmlparser2": "^3.3.0", - "strip-ansi": "^3.0.0", - "utila": "^0.4.0" + "css-select": "1.2.0", + "dom-converter": "0.2.0", + "htmlparser2": "3.10.1", + "strip-ansi": "3.0.1", + "utila": "0.4.0" }, "dependencies": { "css-select": { @@ -10786,10 +10822,10 @@ "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "dev": true, "requires": { - "boolbase": "~1.0.0", - "css-what": "2.1", + "boolbase": "1.0.0", + "css-what": "2.1.3", "domutils": "1.5.1", - "nth-check": "~1.0.1" + "nth-check": "1.0.2" } }, "css-what": { @@ -10804,8 +10840,8 @@ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "dev": true, "requires": { - "dom-serializer": "0", - "domelementtype": "1" + "dom-serializer": "0.2.2", + "domelementtype": "1.3.1" } }, "strip-ansi": { @@ -10814,7 +10850,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } } } @@ -10837,7 +10873,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "^1.0.0" + "is-finite": "1.1.0" } }, "request": { @@ -10846,26 +10882,26 @@ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "dev": true, "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" + "aws-sign2": "0.7.0", + "aws4": "1.10.1", + "caseless": "0.12.0", + "combined-stream": "1.0.8", + "extend": "3.0.2", + "forever-agent": "0.6.1", + "form-data": "2.3.3", + "har-validator": "5.1.5", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.27", + "oauth-sign": "0.9.0", + "performance-now": "2.1.0", + "qs": "6.5.2", + "safe-buffer": "5.1.2", + "tough-cookie": "2.5.0", + "tunnel-agent": "0.6.0", + "uuid": "3.4.0" }, "dependencies": { "qs": { @@ -10876,6 +10912,15 @@ } } }, + "require-context": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/require-context/-/require-context-1.1.0.tgz", + "integrity": "sha512-nfYSy3Q9W3W1fCo0nief19bDq216IGY9+wOUsmCWAJ5jssyak0r110rvqIj4KJYoUYDxLDaeA66ONOYy4PJEUw==", + "dev": true, + "requires": { + "node-dir": "0.1.17" + } + }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -10906,7 +10951,7 @@ "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { - "path-parse": "^1.0.6" + "path-parse": "1.0.6" } }, "resolve-cwd": { @@ -10915,7 +10960,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "^3.0.0" + "resolve-from": "3.0.0" } }, "resolve-from": { @@ -10936,7 +10981,7 @@ "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", "dev": true, "requires": { - "lowercase-keys": "^1.0.0" + "lowercase-keys": "1.0.1" } }, "restore-cursor": { @@ -10945,8 +10990,8 @@ "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" + "onetime": "5.1.2", + "signal-exit": "3.0.3" } }, "ret": { @@ -10985,7 +11030,7 @@ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.6" } }, "ripemd160": { @@ -10994,8 +11039,8 @@ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" + "hash-base": "3.1.0", + "inherits": "2.0.4" } }, "roarr": { @@ -11005,12 +11050,12 @@ "dev": true, "optional": true, "requires": { - "boolean": "^3.0.1", - "detect-node": "^2.0.4", - "globalthis": "^1.0.1", - "json-stringify-safe": "^5.0.1", - "semver-compare": "^1.0.0", - "sprintf-js": "^1.1.2" + "boolean": "3.0.1", + "detect-node": "2.0.4", + "globalthis": "1.0.1", + "json-stringify-safe": "5.0.1", + "semver-compare": "1.0.0", + "sprintf-js": "1.1.2" } }, "rtlcss": { @@ -11019,11 +11064,11 @@ "integrity": "sha512-NCVdF45w70/3CQeqVvQ84bu2HN8agNn+CDjw+RxXaiWb7mPOmEvltdd1z4qzm9kin4Jnu9ShFBIx28yvWerZ2g==", "dev": true, "requires": { - "chalk": "^2.4.2", - "findup": "^0.1.5", - "mkdirp": "^0.5.1", - "postcss": "^6.0.23", - "strip-json-comments": "^2.0.0" + "chalk": "2.4.2", + "findup": "0.1.5", + "mkdirp": "0.5.5", + "postcss": "6.0.23", + "strip-json-comments": "2.0.1" }, "dependencies": { "chalk": { @@ -11032,9 +11077,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "postcss": { @@ -11043,9 +11088,9 @@ "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", "dev": true, "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" + "chalk": "2.4.2", + "source-map": "0.6.1", + "supports-color": "5.5.0" } }, "source-map": { @@ -11074,7 +11119,7 @@ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { - "aproba": "^1.1.1" + "aproba": "1.2.0" } }, "rxjs": { @@ -11083,7 +11128,7 @@ "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", "dev": true, "requires": { - "tslib": "^1.9.0" + "tslib": "1.13.0" }, "dependencies": { "tslib": { @@ -11106,7 +11151,7 @@ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { - "ret": "~0.1.10" + "ret": "0.1.15" } }, "safer-buffer": { @@ -11121,7 +11166,7 @@ "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==", "dev": true, "requires": { - "truncate-utf8-bytes": "^1.0.0" + "truncate-utf8-bytes": "1.0.2" } }, "sass-graph": { @@ -11130,10 +11175,10 @@ "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", "dev": true, "requires": { - "glob": "^7.0.0", - "lodash": "^4.0.0", - "scss-tokenizer": "^0.2.3", - "yargs": "^13.3.2" + "glob": "7.1.6", + "lodash": "4.17.20", + "scss-tokenizer": "0.2.3", + "yargs": "13.3.2" }, "dependencies": { "ansi-regex": { @@ -11154,9 +11199,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "7.0.3", + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "5.2.0" } }, "strip-ansi": { @@ -11165,7 +11210,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "4.1.0" } }, "yargs": { @@ -11174,16 +11219,16 @@ "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" + "cliui": "5.0.0", + "find-up": "3.0.0", + "get-caller-file": "2.0.5", + "require-directory": "2.1.1", + "require-main-filename": "2.0.0", + "set-blocking": "2.0.0", + "string-width": "3.1.0", + "which-module": "2.0.0", + "y18n": "4.0.0", + "yargs-parser": "13.1.2" } } } @@ -11194,11 +11239,11 @@ "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==", "dev": true, "requires": { - "clone-deep": "^4.0.1", - "loader-utils": "^1.2.3", - "neo-async": "^2.6.1", - "schema-utils": "^2.6.1", - "semver": "^6.3.0" + "clone-deep": "4.0.1", + "loader-utils": "1.4.0", + "neo-async": "2.6.2", + "schema-utils": "2.7.1", + "semver": "6.3.0" }, "dependencies": { "semver": { @@ -11221,9 +11266,9 @@ "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", "dev": true, "requires": { - "@types/json-schema": "^7.0.5", - "ajv": "^6.12.4", - "ajv-keywords": "^3.5.2" + "@types/json-schema": "7.0.6", + "ajv": "6.12.5", + "ajv-keywords": "3.5.2" } }, "scss-tokenizer": { @@ -11232,8 +11277,8 @@ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "requires": { - "js-base64": "^2.1.8", - "source-map": "^0.4.2" + "js-base64": "2.6.4", + "source-map": "0.4.4" }, "dependencies": { "source-map": { @@ -11242,7 +11287,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": ">=0.0.4" + "amdefine": "1.0.1" } } } @@ -11259,7 +11304,7 @@ "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", "dev": true, "requires": { - "node-forge": "^0.10.0" + "node-forge": "0.10.0" } }, "semver": { @@ -11282,18 +11327,18 @@ "dev": true, "requires": { "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", + "depd": "1.1.2", + "destroy": "1.0.4", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "etag": "1.8.1", "fresh": "0.5.2", - "http-errors": "~1.7.2", + "http-errors": "1.7.2", "mime": "1.6.0", "ms": "2.1.1", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" + "on-finished": "2.3.0", + "range-parser": "1.2.1", + "statuses": "1.5.0" }, "dependencies": { "debug": { @@ -11328,7 +11373,7 @@ "dev": true, "optional": true, "requires": { - "type-fest": "^0.13.1" + "type-fest": "0.13.1" } }, "serialize-javascript": { @@ -11337,7 +11382,7 @@ "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", "dev": true, "requires": { - "randombytes": "^2.1.0" + "randombytes": "2.1.0" } }, "serve-index": { @@ -11346,13 +11391,13 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { - "accepts": "~1.3.4", + "accepts": "1.3.7", "batch": "0.6.1", "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" + "escape-html": "1.0.3", + "http-errors": "1.6.3", + "mime-types": "2.1.27", + "parseurl": "1.3.3" }, "dependencies": { "debug": { @@ -11370,10 +11415,10 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "~1.1.2", + "depd": "1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" + "statuses": "1.5.0" } }, "inherits": { @@ -11396,9 +11441,9 @@ "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", "dev": true, "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", + "encodeurl": "1.0.2", + "escape-html": "1.0.3", + "parseurl": "1.3.3", "send": "0.17.1" } }, @@ -11414,10 +11459,10 @@ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" + "extend-shallow": "2.0.1", + "is-extendable": "0.1.1", + "is-plain-object": "2.0.4", + "split-string": "3.1.0" }, "dependencies": { "extend-shallow": { @@ -11426,7 +11471,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -11449,8 +11494,8 @@ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "2.0.4", + "safe-buffer": "5.1.2" } }, "shallow-clone": { @@ -11459,7 +11504,7 @@ "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, "requires": { - "kind-of": "^6.0.2" + "kind-of": "6.0.3" } }, "shebang-command": { @@ -11468,7 +11513,7 @@ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { - "shebang-regex": "^3.0.0" + "shebang-regex": "3.0.0" } }, "shebang-regex": { @@ -11495,7 +11540,7 @@ "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", "dev": true, "requires": { - "is-arrayish": "^0.3.1" + "is-arrayish": "0.3.2" }, "dependencies": { "is-arrayish": { @@ -11518,9 +11563,9 @@ "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" + "ansi-styles": "4.2.1", + "astral-regex": "2.0.0", + "is-fullwidth-code-point": "3.0.0" }, "dependencies": { "ansi-styles": { @@ -11529,8 +11574,8 @@ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" + "@types/color-name": "1.1.1", + "color-convert": "2.0.1" } }, "color-convert": { @@ -11539,7 +11584,7 @@ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "color-name": "~1.1.4" + "color-name": "1.1.4" } }, "color-name": { @@ -11562,14 +11607,14 @@ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "dev": true, "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" + "base": "0.11.2", + "debug": "2.6.9", + "define-property": "0.2.5", + "extend-shallow": "2.0.1", + "map-cache": "0.2.2", + "source-map": "0.5.7", + "source-map-resolve": "0.5.3", + "use": "3.1.1" }, "dependencies": { "debug": { @@ -11587,7 +11632,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } }, "extend-shallow": { @@ -11596,7 +11641,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -11607,9 +11652,9 @@ "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" + "define-property": "1.0.0", + "isobject": "3.0.1", + "snapdragon-util": "3.0.1" }, "dependencies": { "define-property": { @@ -11618,7 +11663,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "^1.0.0" + "is-descriptor": "1.0.2" } }, "is-accessor-descriptor": { @@ -11627,7 +11672,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-data-descriptor": { @@ -11636,7 +11681,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "kind-of": "6.0.3" } }, "is-descriptor": { @@ -11645,9 +11690,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "is-accessor-descriptor": "1.0.0", + "is-data-descriptor": "1.0.0", + "kind-of": "6.0.3" } } } @@ -11658,7 +11703,7 @@ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, "requires": { - "kind-of": "^3.2.0" + "kind-of": "3.2.2" }, "dependencies": { "is-buffer": { @@ -11673,7 +11718,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -11684,8 +11729,8 @@ "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==", "dev": true, "requires": { - "faye-websocket": "^0.10.0", - "uuid": "^3.4.0", + "faye-websocket": "0.10.0", + "uuid": "3.4.0", "websocket-driver": "0.6.5" } }, @@ -11695,12 +11740,12 @@ "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", "dev": true, "requires": { - "debug": "^3.2.5", - "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" + "debug": "3.2.6", + "eventsource": "1.0.7", + "faye-websocket": "0.11.3", + "inherits": "2.0.4", + "json3": "3.3.3", + "url-parse": "1.4.7" }, "dependencies": { "debug": { @@ -11709,7 +11754,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "faye-websocket": { @@ -11718,7 +11763,7 @@ "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", "dev": true, "requires": { - "websocket-driver": ">=0.5.1" + "websocket-driver": "0.6.5" } }, "ms": { @@ -11735,7 +11780,7 @@ "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", "dev": true, "requires": { - "is-plain-obj": "^1.0.0" + "is-plain-obj": "1.1.0" } }, "source-list-map": { @@ -11756,11 +11801,11 @@ "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", "dev": true, "requires": { - "atob": "^2.1.2", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" + "atob": "2.1.2", + "decode-uri-component": "0.2.0", + "resolve-url": "0.2.1", + "source-map-url": "0.4.0", + "urix": "0.1.0" } }, "source-map-support": { @@ -11769,8 +11814,8 @@ "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" + "buffer-from": "1.1.1", + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -11793,8 +11838,8 @@ "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", "dev": true, "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" + "spdx-expression-parse": "3.0.1", + "spdx-license-ids": "3.0.6" } }, "spdx-exceptions": { @@ -11809,8 +11854,8 @@ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "spdx-exceptions": "2.3.0", + "spdx-license-ids": "3.0.6" } }, "spdx-license-ids": { @@ -11825,11 +11870,11 @@ "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", "dev": true, "requires": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" + "debug": "4.2.0", + "handle-thing": "2.0.1", + "http-deceiver": "1.2.7", + "select-hose": "2.0.0", + "spdy-transport": "3.0.0" }, "dependencies": { "debug": { @@ -11855,12 +11900,12 @@ "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, "requires": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" + "debug": "4.2.0", + "detect-node": "2.0.4", + "hpack.js": "2.1.6", + "obuf": "1.1.2", + "readable-stream": "3.6.0", + "wbuf": "1.7.3" }, "dependencies": { "debug": { @@ -11886,7 +11931,7 @@ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dev": true, "requires": { - "extend-shallow": "^3.0.0" + "extend-shallow": "3.0.2" } }, "sprintf-js": { @@ -11902,15 +11947,15 @@ "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", "dev": true, "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" + "asn1": "0.2.4", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.2", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.2", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "safer-buffer": "2.1.2", + "tweetnacl": "0.14.5" } }, "ssri": { @@ -11919,7 +11964,7 @@ "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==", "dev": true, "requires": { - "minipass": "^3.1.1" + "minipass": "3.1.3" } }, "stable": { @@ -11940,8 +11985,8 @@ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" + "define-property": "0.2.5", + "object-copy": "0.1.0" }, "dependencies": { "define-property": { @@ -11950,7 +11995,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "is-descriptor": "0.1.6" } } } @@ -11967,7 +12012,7 @@ "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", "dev": true, "requires": { - "readable-stream": "^2.0.1" + "readable-stream": "2.3.7" }, "dependencies": { "readable-stream": { @@ -11976,13 +12021,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -11993,8 +12038,8 @@ "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "dev": true, "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" + "inherits": "2.0.4", + "readable-stream": "2.3.7" }, "dependencies": { "readable-stream": { @@ -12003,13 +12048,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -12020,8 +12065,8 @@ "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" + "end-of-stream": "1.4.4", + "stream-shift": "1.0.1" } }, "stream-http": { @@ -12030,11 +12075,11 @@ "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", "dev": true, "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" + "builtin-status-codes": "3.0.0", + "inherits": "2.0.4", + "readable-stream": "2.3.7", + "to-arraybuffer": "1.0.1", + "xtend": "4.0.2" }, "dependencies": { "readable-stream": { @@ -12043,13 +12088,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -12072,8 +12117,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" }, "dependencies": { "ansi-regex": { @@ -12088,7 +12133,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "3.0.0" } } } @@ -12099,8 +12144,8 @@ "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" + "define-properties": "1.1.3", + "es-abstract": "1.17.7" }, "dependencies": { "es-abstract": { @@ -12109,17 +12154,17 @@ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" } } } @@ -12130,8 +12175,8 @@ "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" + "define-properties": "1.1.3", + "es-abstract": "1.17.7" }, "dependencies": { "es-abstract": { @@ -12140,17 +12185,17 @@ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" } } } @@ -12161,7 +12206,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "~5.1.0" + "safe-buffer": "5.1.2" } }, "strip-ansi": { @@ -12170,7 +12215,7 @@ "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "ansi-regex": "5.0.0" }, "dependencies": { "ansi-regex": { @@ -12187,7 +12232,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "^0.2.0" + "is-utf8": "0.2.1" } }, "strip-eof": { @@ -12202,7 +12247,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "^4.0.1" + "get-stdin": "4.0.1" } }, "strip-json-comments": { @@ -12217,9 +12262,9 @@ "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==", "dev": true, "requires": { - "browserslist": "^4.0.0", - "postcss": "^7.0.0", - "postcss-selector-parser": "^3.0.0" + "browserslist": "4.14.5", + "postcss": "7.0.35", + "postcss-selector-parser": "3.1.2" }, "dependencies": { "postcss-selector-parser": { @@ -12228,9 +12273,9 @@ "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "^5.2.0", - "indexes-of": "^1.0.1", - "uniq": "^1.0.1" + "dot-prop": "5.2.0", + "indexes-of": "1.0.1", + "uniq": "1.0.1" } } } @@ -12241,14 +12286,14 @@ "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==", "dev": true, "requires": { - "css-parse": "~2.0.0", - "debug": "~3.1.0", - "glob": "^7.1.6", - "mkdirp": "~1.0.4", - "safer-buffer": "^2.1.2", - "sax": "~1.2.4", - "semver": "^6.3.0", - "source-map": "^0.7.3" + "css-parse": "2.0.0", + "debug": "3.1.0", + "glob": "7.1.6", + "mkdirp": "1.0.4", + "safer-buffer": "2.1.2", + "sax": "1.2.4", + "semver": "6.3.0", + "source-map": "0.7.3" }, "dependencies": { "mkdirp": { @@ -12277,9 +12322,9 @@ "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", "dev": true, "requires": { - "loader-utils": "^1.0.2", - "lodash.clonedeep": "^4.5.0", - "when": "~3.6.x" + "loader-utils": "1.4.0", + "lodash.clonedeep": "4.5.0", + "when": "3.6.4" } }, "sumchecker": { @@ -12288,7 +12333,7 @@ "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", "dev": true, "requires": { - "debug": "^4.1.0" + "debug": "4.2.0" }, "dependencies": { "debug": { @@ -12314,7 +12359,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } }, "svgo": { @@ -12323,19 +12368,19 @@ "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", "dev": true, "requires": { - "chalk": "^2.4.1", - "coa": "^2.0.2", - "css-select": "^2.0.0", - "css-select-base-adapter": "^0.1.1", + "chalk": "2.4.2", + "coa": "2.0.2", + "css-select": "2.1.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" + "csso": "4.0.3", + "js-yaml": "3.14.0", + "mkdirp": "0.5.5", + "object.values": "1.1.1", + "sax": "1.2.4", + "stable": "0.1.8", + "unquote": "1.1.1", + "util.promisify": "1.0.1" }, "dependencies": { "chalk": { @@ -12344,9 +12389,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } } } @@ -12357,10 +12402,10 @@ "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", "dev": true, "requires": { - "ajv": "^6.10.2", - "lodash": "^4.17.14", - "slice-ansi": "^2.1.0", - "string-width": "^3.0.0" + "ajv": "6.12.5", + "lodash": "4.17.20", + "slice-ansi": "2.1.0", + "string-width": "3.1.0" }, "dependencies": { "ansi-regex": { @@ -12387,9 +12432,9 @@ "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.0", - "astral-regex": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0" + "ansi-styles": "3.2.1", + "astral-regex": "1.0.0", + "is-fullwidth-code-point": "2.0.0" } }, "string-width": { @@ -12398,9 +12443,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "7.0.3", + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "5.2.0" } }, "strip-ansi": { @@ -12409,7 +12454,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "4.1.0" } } } @@ -12426,12 +12471,12 @@ "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==", "dev": true, "requires": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^3.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" + "chownr": "2.0.0", + "fs-minipass": "2.1.0", + "minipass": "3.1.3", + "minizlib": "2.1.2", + "mkdirp": "1.0.4", + "yallist": "4.0.0" }, "dependencies": { "mkdirp": { @@ -12448,11 +12493,11 @@ "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==", "dev": true, "requires": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" + "bl": "4.0.3", + "end-of-stream": "1.4.4", + "fs-constants": "1.0.0", + "inherits": "2.0.4", + "readable-stream": "3.6.0" } }, "terser": { @@ -12461,9 +12506,9 @@ "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", "dev": true, "requires": { - "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" + "commander": "2.20.3", + "source-map": "0.6.1", + "source-map-support": "0.5.19" }, "dependencies": { "source-map": { @@ -12480,15 +12525,15 @@ "integrity": "sha512-0ZWDPIP8BtEDZdChbufcXUigOYk6dOX/P/X0hWxqDDcVAQLb8Yy/0FAaemSfax3PAA67+DJR778oz8qVbmy4hA==", "dev": true, "requires": { - "cacache": "^15.0.5", - "find-cache-dir": "^3.3.1", - "jest-worker": "^26.3.0", - "p-limit": "^3.0.2", - "schema-utils": "^2.6.6", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^5.0.0", - "webpack-sources": "^1.4.3" + "cacache": "15.0.5", + "find-cache-dir": "3.3.1", + "jest-worker": "26.3.0", + "p-limit": "3.0.2", + "schema-utils": "2.7.1", + "serialize-javascript": "4.0.0", + "source-map": "0.6.1", + "terser": "5.3.3", + "webpack-sources": "1.4.3" }, "dependencies": { "find-cache-dir": { @@ -12497,9 +12542,9 @@ "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "dev": true, "requires": { - "commondir": "^1.0.1", - "make-dir": "^3.0.2", - "pkg-dir": "^4.1.0" + "commondir": "1.0.1", + "make-dir": "3.1.0", + "pkg-dir": "4.2.0" } }, "find-up": { @@ -12508,8 +12553,8 @@ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" + "locate-path": "5.0.0", + "path-exists": "4.0.0" } }, "locate-path": { @@ -12518,7 +12563,7 @@ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "^4.1.0" + "p-locate": "4.1.0" } }, "make-dir": { @@ -12527,7 +12572,7 @@ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { - "semver": "^6.0.0" + "semver": "6.3.0" } }, "p-limit": { @@ -12536,7 +12581,7 @@ "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==", "dev": true, "requires": { - "p-try": "^2.0.0" + "p-try": "2.2.0" } }, "p-locate": { @@ -12545,7 +12590,7 @@ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "^2.2.0" + "p-limit": "2.3.0" }, "dependencies": { "p-limit": { @@ -12554,7 +12599,7 @@ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "p-try": "^2.0.0" + "p-try": "2.2.0" } } } @@ -12571,7 +12616,7 @@ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "^4.0.0" + "find-up": "4.1.0" } }, "semver": { @@ -12592,9 +12637,9 @@ "integrity": "sha512-vRQDIlD+2Pg8YMwVK9kMM3yGylG95EIwzBai1Bw7Ot4OBfn3VP1TZn3EWx4ep2jERN/AmnVaTiGuelZSN7ds/A==", "dev": true, "requires": { - "commander": "^2.20.0", - "source-map": "~0.7.2", - "source-map-support": "~0.5.19" + "commander": "2.20.3", + "source-map": "0.7.3", + "source-map-support": "0.5.19" }, "dependencies": { "source-map": { @@ -12625,8 +12670,8 @@ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" + "readable-stream": "2.3.7", + "xtend": "4.0.2" }, "dependencies": { "readable-stream": { @@ -12635,13 +12680,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -12658,7 +12703,7 @@ "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", "dev": true, "requires": { - "setimmediate": "^1.0.4" + "setimmediate": "1.0.5" } }, "timsort": { @@ -12673,7 +12718,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "~1.0.2" + "os-tmpdir": "1.0.2" } }, "to-arraybuffer": { @@ -12694,7 +12739,7 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "is-buffer": { @@ -12709,7 +12754,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -12726,10 +12771,10 @@ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "dev": true, "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "regex-not": "1.0.2", + "safe-regex": "1.1.0" } }, "to-regex-range": { @@ -12738,7 +12783,7 @@ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { - "is-number": "^7.0.0" + "is-number": "7.0.0" } }, "toidentifier": { @@ -12753,8 +12798,8 @@ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "dev": true, "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "psl": "1.8.0", + "punycode": "2.1.1" } }, "trim-newlines": { @@ -12769,7 +12814,7 @@ "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", "dev": true, "requires": { - "glob": "^7.1.2" + "glob": "7.1.6" } }, "truncate-utf8-bytes": { @@ -12778,7 +12823,7 @@ "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=", "dev": true, "requires": { - "utf8-byte-length": "^1.0.1" + "utf8-byte-length": "1.0.4" } }, "tryer": { @@ -12793,11 +12838,11 @@ "integrity": "sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==", "dev": true, "requires": { - "chalk": "^2.3.0", - "enhanced-resolve": "^4.0.0", - "loader-utils": "^1.0.2", - "micromatch": "^4.0.0", - "semver": "^6.0.0" + "chalk": "2.4.2", + "enhanced-resolve": "4.3.0", + "loader-utils": "1.4.0", + "micromatch": "4.0.2", + "semver": "6.3.0" }, "dependencies": { "chalk": { @@ -12806,9 +12851,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } }, "semver": { @@ -12830,7 +12875,7 @@ "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", "dev": true, "requires": { - "tslib": "^1.8.1" + "tslib": "1.13.0" }, "dependencies": { "tslib": { @@ -12860,7 +12905,7 @@ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { - "safe-buffer": "^5.0.1" + "safe-buffer": "5.1.2" } }, "tweetnacl": { @@ -12875,7 +12920,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "~1.1.2" + "prelude-ls": "1.1.2" } }, "type-fest": { @@ -12892,7 +12937,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "~2.1.24" + "mime-types": "2.1.27" } }, "typedarray": { @@ -12925,8 +12970,8 @@ "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", "dev": true, "requires": { - "unicode-canonical-property-names-ecmascript": "^1.0.4", - "unicode-property-aliases-ecmascript": "^1.0.4" + "unicode-canonical-property-names-ecmascript": "1.0.4", + "unicode-property-aliases-ecmascript": "1.1.0" } }, "unicode-match-property-value-ecmascript": { @@ -12947,10 +12992,10 @@ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" + "arr-union": "3.1.0", + "get-value": "2.0.6", + "is-extendable": "0.1.1", + "set-value": "2.0.1" } }, "uniq": { @@ -12971,7 +13016,7 @@ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "dev": true, "requires": { - "unique-slug": "^2.0.0" + "unique-slug": "2.0.2" } }, "unique-slug": { @@ -12980,7 +13025,7 @@ "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", "dev": true, "requires": { - "imurmurhash": "^0.1.4" + "imurmurhash": "0.1.4" } }, "universalify": { @@ -13007,8 +13052,8 @@ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" + "has-value": "0.3.1", + "isobject": "3.0.1" }, "dependencies": { "has-value": { @@ -13017,9 +13062,9 @@ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" + "get-value": "2.0.6", + "has-values": "0.1.4", + "isobject": "2.1.0" }, "dependencies": { "isobject": { @@ -13059,7 +13104,7 @@ "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", "dev": true, "requires": { - "punycode": "^2.1.0" + "punycode": "2.1.1" } }, "urix": { @@ -13092,9 +13137,9 @@ "integrity": "sha512-IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw==", "dev": true, "requires": { - "loader-utils": "^2.0.0", - "mime-types": "^2.1.26", - "schema-utils": "^2.6.5" + "loader-utils": "2.0.0", + "mime-types": "2.1.27", + "schema-utils": "2.7.1" }, "dependencies": { "loader-utils": { @@ -13103,9 +13148,9 @@ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" + "big.js": "5.2.2", + "emojis-list": "3.0.0", + "json5": "2.1.3" } } } @@ -13116,8 +13161,8 @@ "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", "dev": true, "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" + "querystringify": "2.2.0", + "requires-port": "1.0.0" } }, "url-parse-lax": { @@ -13126,7 +13171,7 @@ "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "dev": true, "requires": { - "prepend-http": "^2.0.0" + "prepend-http": "2.0.0" } }, "use": { @@ -13170,10 +13215,10 @@ "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==", "dev": true, "requires": { - "define-properties": "^1.1.3", - "es-abstract": "^1.17.2", - "has-symbols": "^1.0.1", - "object.getownpropertydescriptors": "^2.1.0" + "define-properties": "1.1.3", + "es-abstract": "1.17.7", + "has-symbols": "1.0.1", + "object.getownpropertydescriptors": "2.1.0" }, "dependencies": { "es-abstract": { @@ -13182,17 +13227,17 @@ "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.2", - "is-regex": "^1.1.1", - "object-inspect": "^1.8.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.1", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" + "es-to-primitive": "1.2.1", + "function-bind": "1.1.1", + "has": "1.0.3", + "has-symbols": "1.0.1", + "is-callable": "1.2.2", + "is-regex": "1.1.1", + "object-inspect": "1.8.0", + "object-keys": "1.1.1", + "object.assign": "4.1.1", + "string.prototype.trimend": "1.0.1", + "string.prototype.trimstart": "1.0.1" } } } @@ -13227,8 +13272,8 @@ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" + "spdx-correct": "3.1.1", + "spdx-expression-parse": "3.0.1" } }, "vary": { @@ -13249,9 +13294,9 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "^1.0.0", + "assert-plus": "1.0.0", "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" + "extsprintf": "1.3.0" } }, "vm-browserify": { @@ -13272,12 +13317,12 @@ "integrity": "sha512-Kr21uPfthDc63nDl27AGQEhtt9VrZ9nkYk/NTftJ2ws9XiJwzJJCnCr3AITQ2jpRMA0XPGDECxYH8E027qMK9Q==", "dev": true, "requires": { - "debug": "^4.1.1", - "eslint-scope": "^5.0.0", - "eslint-visitor-keys": "^1.1.0", - "espree": "^6.2.1", - "esquery": "^1.0.1", - "lodash": "^4.17.15" + "debug": "4.2.0", + "eslint-scope": "5.1.1", + "eslint-visitor-keys": "1.3.0", + "espree": "6.2.1", + "esquery": "1.3.1", + "lodash": "4.17.20" }, "dependencies": { "debug": { @@ -13295,8 +13340,8 @@ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" + "esrecurse": "4.3.0", + "estraverse": "4.3.0" } }, "ms": { @@ -13319,11 +13364,11 @@ "integrity": "sha512-Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA==", "dev": true, "requires": { - "@vue/component-compiler-utils": "^3.1.0", - "hash-sum": "^1.0.2", - "loader-utils": "^1.1.0", - "vue-hot-reload-api": "^2.3.0", - "vue-style-loader": "^4.1.0" + "@vue/component-compiler-utils": "3.2.0", + "hash-sum": "1.0.2", + "loader-utils": "1.4.0", + "vue-hot-reload-api": "2.3.4", + "vue-style-loader": "4.1.2" } }, "vue-router": { @@ -13338,13 +13383,13 @@ "integrity": "sha512-3LODaOsnQx7iMFTBLjki8xSyOxhCtbZ+nQie0wWY4iOVeEtTg1a3YQAjd82WvKxrWHHTshjvLb7OXMc2/dYuxw==", "dev": true, "requires": { - "chalk": "^1.1.3", - "hash-sum": "^1.0.2", - "he": "^1.1.0", - "lodash.template": "^4.5.0", - "lodash.uniq": "^4.5.0", - "resolve": "^1.2.0", - "serialize-javascript": "^3.1.0", + "chalk": "1.1.3", + "hash-sum": "1.0.2", + "he": "1.2.0", + "lodash.template": "4.5.0", + "lodash.uniq": "4.5.0", + "resolve": "1.17.0", + "serialize-javascript": "3.1.0", "source-map": "0.5.6" }, "dependencies": { @@ -13360,11 +13405,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" } }, "serialize-javascript": { @@ -13373,7 +13418,7 @@ "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", "dev": true, "requires": { - "randombytes": "^2.1.0" + "randombytes": "2.1.0" } }, "source-map": { @@ -13388,7 +13433,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "supports-color": { @@ -13405,8 +13450,8 @@ "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==", "dev": true, "requires": { - "hash-sum": "^1.0.2", - "loader-utils": "^1.0.2" + "hash-sum": "1.0.2", + "loader-utils": "1.4.0" } }, "vue-template-compiler": { @@ -13415,8 +13460,8 @@ "integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==", "dev": true, "requires": { - "de-indent": "^1.0.2", - "he": "^1.1.0" + "de-indent": "1.0.2", + "he": "1.2.0" } }, "vue-template-es2015-compiler": { @@ -13437,10 +13482,10 @@ "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==", "dev": true, "requires": { - "chokidar": "^3.4.1", - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0", - "watchpack-chokidar2": "^2.0.0" + "chokidar": "3.4.2", + "graceful-fs": "4.2.4", + "neo-async": "2.6.2", + "watchpack-chokidar2": "2.0.0" } }, "watchpack-chokidar2": { @@ -13450,7 +13495,7 @@ "dev": true, "optional": true, "requires": { - "chokidar": "^2.1.8" + "chokidar": "2.1.8" }, "dependencies": { "anymatch": { @@ -13460,8 +13505,8 @@ "dev": true, "optional": true, "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" + "micromatch": "3.1.10", + "normalize-path": "2.1.1" }, "dependencies": { "normalize-path": { @@ -13471,7 +13516,7 @@ "dev": true, "optional": true, "requires": { - "remove-trailing-separator": "^1.0.1" + "remove-trailing-separator": "1.1.0" } } } @@ -13488,18 +13533,17 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, - "optional": true, "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" }, "dependencies": { "extend-shallow": { @@ -13507,9 +13551,8 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, - "optional": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -13521,18 +13564,18 @@ "dev": true, "optional": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" + "anymatch": "2.0.0", + "async-each": "1.0.3", + "braces": "2.3.2", + "fsevents": "1.2.13", + "glob-parent": "3.1.0", + "inherits": "2.0.4", + "is-binary-path": "1.0.1", + "is-glob": "4.0.1", + "normalize-path": "3.0.0", + "path-is-absolute": "1.0.1", + "readdirp": "2.2.1", + "upath": "1.2.0" } }, "fill-range": { @@ -13540,12 +13583,11 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, - "optional": true, "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" }, "dependencies": { "extend-shallow": { @@ -13553,9 +13595,8 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, - "optional": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -13567,7 +13608,7 @@ "dev": true, "optional": true, "requires": { - "nan": "^2.12.1" + "nan": "2.14.1" } }, "glob-parent": { @@ -13577,8 +13618,8 @@ "dev": true, "optional": true, "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" + "is-glob": "3.1.0", + "path-dirname": "1.0.2" }, "dependencies": { "is-glob": { @@ -13588,7 +13629,7 @@ "dev": true, "optional": true, "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "2.1.1" } } } @@ -13600,24 +13641,22 @@ "dev": true, "optional": true, "requires": { - "binary-extensions": "^1.0.0" + "binary-extensions": "1.13.1" } }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true, - "optional": true + "dev": true }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, - "optional": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -13625,9 +13664,8 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, - "optional": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -13637,21 +13675,20 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, - "optional": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.3", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "readable-stream": { @@ -13661,13 +13698,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "readdirp": { @@ -13677,9 +13714,9 @@ "dev": true, "optional": true, "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" + "graceful-fs": "4.2.4", + "micromatch": "3.1.10", + "readable-stream": "2.3.7" } }, "to-regex-range": { @@ -13687,10 +13724,9 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, - "optional": true, "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "3.0.0", + "repeat-string": "1.6.1" } } } @@ -13701,7 +13737,7 @@ "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, "requires": { - "minimalistic-assert": "^1.0.0" + "minimalistic-assert": "1.0.1" } }, "webpack": { @@ -13714,25 +13750,25 @@ "@webassemblyjs/helper-module-context": "1.9.0", "@webassemblyjs/wasm-edit": "1.9.0", "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "^6.4.1", - "ajv": "^6.10.2", - "ajv-keywords": "^3.4.1", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^4.3.0", - "eslint-scope": "^4.0.3", - "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.4.0", - "loader-utils": "^1.2.3", - "memory-fs": "^0.4.1", - "micromatch": "^3.1.10", - "mkdirp": "^0.5.3", - "neo-async": "^2.6.1", - "node-libs-browser": "^2.2.1", - "schema-utils": "^1.0.0", - "tapable": "^1.1.3", - "terser-webpack-plugin": "^1.4.3", - "watchpack": "^1.7.4", - "webpack-sources": "^1.4.1" + "acorn": "6.4.1", + "ajv": "6.12.5", + "ajv-keywords": "3.5.2", + "chrome-trace-event": "1.0.2", + "enhanced-resolve": "4.3.0", + "eslint-scope": "4.0.3", + "json-parse-better-errors": "1.0.2", + "loader-runner": "2.4.0", + "loader-utils": "1.4.0", + "memory-fs": "0.4.1", + "micromatch": "3.1.10", + "mkdirp": "0.5.5", + "neo-async": "2.6.2", + "node-libs-browser": "2.2.1", + "schema-utils": "1.0.0", + "tapable": "1.1.3", + "terser-webpack-plugin": "1.4.5", + "watchpack": "1.7.4", + "webpack-sources": "1.4.3" }, "dependencies": { "braces": { @@ -13741,16 +13777,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" }, "dependencies": { "extend-shallow": { @@ -13759,7 +13795,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -13770,21 +13806,21 @@ "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", "dev": true, "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" + "bluebird": "3.7.2", + "chownr": "1.1.4", + "figgy-pudding": "3.5.2", + "glob": "7.1.6", + "graceful-fs": "4.2.4", + "infer-owner": "1.0.4", + "lru-cache": "5.1.1", + "mississippi": "3.0.0", + "mkdirp": "0.5.5", + "move-concurrently": "1.0.1", + "promise-inflight": "1.0.1", + "rimraf": "2.7.1", + "ssri": "6.0.1", + "unique-filename": "1.1.1", + "y18n": "4.0.0" } }, "chownr": { @@ -13799,10 +13835,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" }, "dependencies": { "extend-shallow": { @@ -13811,7 +13847,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -13828,7 +13864,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -13837,7 +13873,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -13854,7 +13890,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "^3.0.2" + "yallist": "3.1.1" } }, "memory-fs": { @@ -13863,8 +13899,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" + "errno": "0.1.7", + "readable-stream": "2.3.7" } }, "micromatch": { @@ -13873,19 +13909,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.3", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "readable-stream": { @@ -13894,13 +13930,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "rimraf": { @@ -13909,7 +13945,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "^7.1.3" + "glob": "7.1.6" } }, "schema-utils": { @@ -13918,9 +13954,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "ajv": "6.12.5", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.5.2" } }, "source-map": { @@ -13935,7 +13971,7 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "^3.5.1" + "figgy-pudding": "3.5.2" } }, "terser-webpack-plugin": { @@ -13944,15 +13980,15 @@ "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", "dev": true, "requires": { - "cacache": "^12.0.2", - "find-cache-dir": "^2.1.0", - "is-wsl": "^1.1.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^4.0.0", - "source-map": "^0.6.1", - "terser": "^4.1.2", - "webpack-sources": "^1.4.0", - "worker-farm": "^1.7.0" + "cacache": "12.0.4", + "find-cache-dir": "2.1.0", + "is-wsl": "1.1.0", + "schema-utils": "1.0.0", + "serialize-javascript": "4.0.0", + "source-map": "0.6.1", + "terser": "4.8.0", + "webpack-sources": "1.4.3", + "worker-farm": "1.7.0" } }, "to-regex-range": { @@ -13961,8 +13997,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "3.0.0", + "repeat-string": "1.6.1" } }, "yallist": { @@ -13979,19 +14015,19 @@ "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==", "dev": true, "requires": { - "acorn": "^7.1.1", - "acorn-walk": "^7.1.1", - "bfj": "^6.1.1", - "chalk": "^2.4.1", - "commander": "^2.18.0", - "ejs": "^2.6.1", - "express": "^4.16.3", - "filesize": "^3.6.1", - "gzip-size": "^5.0.0", - "lodash": "^4.17.15", - "mkdirp": "^0.5.1", - "opener": "^1.5.1", - "ws": "^6.0.0" + "acorn": "7.4.0", + "acorn-walk": "7.2.0", + "bfj": "6.1.2", + "chalk": "2.4.2", + "commander": "2.20.3", + "ejs": "2.7.4", + "express": "4.17.1", + "filesize": "3.6.1", + "gzip-size": "5.1.1", + "lodash": "4.17.20", + "mkdirp": "0.5.5", + "opener": "1.5.2", + "ws": "6.2.1" }, "dependencies": { "acorn": { @@ -14006,9 +14042,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } } } @@ -14019,8 +14055,8 @@ "integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==", "dev": true, "requires": { - "deepmerge": "^1.5.2", - "javascript-stringify": "^2.0.1" + "deepmerge": "1.5.2", + "javascript-stringify": "2.0.1" } }, "webpack-dev-middleware": { @@ -14029,11 +14065,11 @@ "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==", "dev": true, "requires": { - "memory-fs": "^0.4.1", - "mime": "^2.4.4", - "mkdirp": "^0.5.1", - "range-parser": "^1.2.1", - "webpack-log": "^2.0.0" + "memory-fs": "0.4.1", + "mime": "2.4.6", + "mkdirp": "0.5.5", + "range-parser": "1.2.1", + "webpack-log": "2.0.0" }, "dependencies": { "memory-fs": { @@ -14042,8 +14078,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "^0.1.3", - "readable-stream": "^2.0.1" + "errno": "0.1.7", + "readable-stream": "2.3.7" } }, "mime": { @@ -14058,13 +14094,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } } } @@ -14076,38 +14112,38 @@ "dev": true, "requires": { "ansi-html": "0.0.7", - "bonjour": "^3.5.0", - "chokidar": "^2.1.8", - "compression": "^1.7.4", - "connect-history-api-fallback": "^1.6.0", - "debug": "^4.1.1", - "del": "^4.1.1", - "express": "^4.17.1", - "html-entities": "^1.3.1", + "bonjour": "3.5.0", + "chokidar": "2.1.8", + "compression": "1.7.4", + "connect-history-api-fallback": "1.6.0", + "debug": "4.2.0", + "del": "4.1.1", + "express": "4.17.1", + "html-entities": "1.3.1", "http-proxy-middleware": "0.19.1", - "import-local": "^2.0.0", - "internal-ip": "^4.3.0", - "ip": "^1.1.5", - "is-absolute-url": "^3.0.3", - "killable": "^1.0.1", - "loglevel": "^1.6.8", - "opn": "^5.5.0", - "p-retry": "^3.0.1", - "portfinder": "^1.0.26", - "schema-utils": "^1.0.0", - "selfsigned": "^1.10.7", - "semver": "^6.3.0", - "serve-index": "^1.9.1", + "import-local": "2.0.0", + "internal-ip": "4.3.0", + "ip": "1.1.5", + "is-absolute-url": "3.0.3", + "killable": "1.0.1", + "loglevel": "1.7.0", + "opn": "5.5.0", + "p-retry": "3.0.1", + "portfinder": "1.0.28", + "schema-utils": "1.0.0", + "selfsigned": "1.10.8", + "semver": "6.3.0", + "serve-index": "1.9.1", "sockjs": "0.3.20", "sockjs-client": "1.4.0", - "spdy": "^4.0.2", - "strip-ansi": "^3.0.1", - "supports-color": "^6.1.0", - "url": "^0.11.0", - "webpack-dev-middleware": "^3.7.2", - "webpack-log": "^2.0.0", - "ws": "^6.2.1", - "yargs": "^13.3.2" + "spdy": "4.0.2", + "strip-ansi": "3.0.1", + "supports-color": "6.1.0", + "url": "0.11.0", + "webpack-dev-middleware": "3.7.2", + "webpack-log": "2.0.0", + "ws": "6.2.1", + "yargs": "13.3.2" }, "dependencies": { "anymatch": { @@ -14116,8 +14152,8 @@ "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" + "micromatch": "3.1.10", + "normalize-path": "2.1.1" }, "dependencies": { "normalize-path": { @@ -14126,7 +14162,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "^1.0.1" + "remove-trailing-separator": "1.1.0" } } } @@ -14143,16 +14179,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" + "arr-flatten": "1.1.0", + "array-unique": "0.3.2", + "extend-shallow": "2.0.1", + "fill-range": "4.0.0", + "isobject": "3.0.1", + "repeat-element": "1.1.3", + "snapdragon": "0.8.2", + "snapdragon-node": "2.1.1", + "split-string": "3.1.0", + "to-regex": "3.0.2" }, "dependencies": { "extend-shallow": { @@ -14161,7 +14197,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -14172,18 +14208,18 @@ "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", "dev": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" + "anymatch": "2.0.0", + "async-each": "1.0.3", + "braces": "2.3.2", + "fsevents": "1.2.13", + "glob-parent": "3.1.0", + "inherits": "2.0.4", + "is-binary-path": "1.0.1", + "is-glob": "4.0.1", + "normalize-path": "3.0.0", + "path-is-absolute": "1.0.1", + "readdirp": "2.2.1", + "upath": "1.2.0" } }, "debug": { @@ -14207,10 +14243,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" + "extend-shallow": "2.0.1", + "is-number": "3.0.0", + "repeat-string": "1.6.1", + "to-regex-range": "2.1.1" }, "dependencies": { "extend-shallow": { @@ -14219,7 +14255,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "is-extendable": "0.1.1" } } } @@ -14231,7 +14267,7 @@ "dev": true, "optional": true, "requires": { - "nan": "^2.12.1" + "nan": "2.14.1" } }, "glob-parent": { @@ -14240,8 +14276,8 @@ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" + "is-glob": "3.1.0", + "path-dirname": "1.0.2" }, "dependencies": { "is-glob": { @@ -14250,7 +14286,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "2.1.1" } } } @@ -14267,7 +14303,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "^1.0.0" + "binary-extensions": "1.13.1" } }, "is-buffer": { @@ -14282,7 +14318,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "^3.0.2" + "kind-of": "3.2.2" }, "dependencies": { "kind-of": { @@ -14291,7 +14327,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "^1.1.5" + "is-buffer": "1.1.6" } } } @@ -14302,19 +14338,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "arr-diff": "4.0.0", + "array-unique": "0.3.2", + "braces": "2.3.2", + "define-property": "2.0.2", + "extend-shallow": "3.0.2", + "extglob": "2.0.4", + "fragment-cache": "0.2.1", + "kind-of": "6.0.3", + "nanomatch": "1.2.13", + "object.pick": "1.3.0", + "regex-not": "1.0.2", + "snapdragon": "0.8.2", + "to-regex": "3.0.2" } }, "ms": { @@ -14329,13 +14365,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "core-util-is": "1.0.2", + "inherits": "2.0.4", + "isarray": "1.0.0", + "process-nextick-args": "2.0.1", + "safe-buffer": "5.1.2", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" } }, "readdirp": { @@ -14344,9 +14380,9 @@ "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" + "graceful-fs": "4.2.4", + "micromatch": "3.1.10", + "readable-stream": "2.3.7" } }, "schema-utils": { @@ -14355,9 +14391,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "ajv": "6.12.5", + "ajv-errors": "1.0.1", + "ajv-keywords": "3.5.2" } }, "semver": { @@ -14372,9 +14408,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "emoji-regex": "7.0.3", + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "5.2.0" }, "dependencies": { "ansi-regex": { @@ -14389,7 +14425,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "ansi-regex": "4.1.0" } } } @@ -14400,7 +14436,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "2.1.1" } }, "supports-color": { @@ -14409,7 +14445,7 @@ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "has-flag": "3.0.0" } }, "to-regex-range": { @@ -14418,8 +14454,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "is-number": "3.0.0", + "repeat-string": "1.6.1" } }, "yargs": { @@ -14428,16 +14464,16 @@ "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.2" + "cliui": "5.0.0", + "find-up": "3.0.0", + "get-caller-file": "2.0.5", + "require-directory": "2.1.1", + "require-main-filename": "2.0.0", + "set-blocking": "2.0.0", + "string-width": "3.1.0", + "which-module": "2.0.0", + "y18n": "4.0.0", + "yargs-parser": "13.1.2" } } } @@ -14448,8 +14484,8 @@ "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", "dev": true, "requires": { - "ansi-colors": "^3.0.0", - "uuid": "^3.3.2" + "ansi-colors": "3.2.4", + "uuid": "3.4.0" } }, "webpack-merge": { @@ -14458,7 +14494,7 @@ "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", "dev": true, "requires": { - "lodash": "^4.17.15" + "lodash": "4.17.20" } }, "webpack-node-externals": { @@ -14473,8 +14509,8 @@ "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", "dev": true, "requires": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" + "source-list-map": "2.0.1", + "source-map": "0.6.1" }, "dependencies": { "source-map": { @@ -14491,7 +14527,7 @@ "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=", "dev": true, "requires": { - "websocket-extensions": ">=0.1.1" + "websocket-extensions": "0.1.4" } }, "websocket-extensions": { @@ -14512,7 +14548,7 @@ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "requires": { - "isexe": "^2.0.0" + "isexe": "2.0.0" } }, "which-module": { @@ -14527,7 +14563,7 @@ "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "requires": { - "string-width": "^1.0.2 || 2" + "string-width": "2.1.1" } }, "word-wrap": { @@ -14542,7 +14578,7 @@ "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", "dev": true, "requires": { - "errno": "~0.1.7" + "errno": "0.1.7" } }, "worker-rpc": { @@ -14551,7 +14587,7 @@ "integrity": "sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==", "dev": true, "requires": { - "microevent.ts": "~0.1.1" + "microevent.ts": "0.1.1" } }, "wrap-ansi": { @@ -14560,9 +14596,9 @@ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "ansi-styles": "4.2.1", + "string-width": "4.2.0", + "strip-ansi": "6.0.0" }, "dependencies": { "ansi-styles": { @@ -14571,8 +14607,8 @@ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/color-name": "^1.1.1", - "color-convert": "^2.0.1" + "@types/color-name": "1.1.1", + "color-convert": "2.0.1" } }, "color-convert": { @@ -14581,7 +14617,7 @@ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "color-name": "~1.1.4" + "color-name": "1.1.4" } }, "color-name": { @@ -14602,9 +14638,9 @@ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.0" + "emoji-regex": "8.0.0", + "is-fullwidth-code-point": "3.0.0", + "strip-ansi": "6.0.0" } } } @@ -14621,7 +14657,7 @@ "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", "dev": true, "requires": { - "mkdirp": "^0.5.1" + "mkdirp": "0.5.5" } }, "write-file-atomic": { @@ -14630,9 +14666,9 @@ "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.2" + "graceful-fs": "4.2.4", + "imurmurhash": "0.1.4", + "signal-exit": "3.0.3" } }, "write-file-webpack-plugin": { @@ -14641,13 +14677,13 @@ "integrity": "sha512-AZ7qJUvhTCBiOtG21aFJUcNuLVo2FFM6JMGKvaUGAH+QDqQAp2iG0nq3GcuXmJOFQR2JjpjhyYkyPrbFKhdjNQ==", "dev": true, "requires": { - "chalk": "^2.4.0", - "debug": "^3.1.0", - "filesize": "^3.6.1", - "lodash": "^4.17.13", - "mkdirp": "^0.5.1", - "moment": "^2.22.1", - "write-file-atomic": "^2.3.0" + "chalk": "2.4.2", + "debug": "3.1.0", + "filesize": "3.6.1", + "lodash": "4.17.20", + "mkdirp": "0.5.5", + "moment": "2.29.0", + "write-file-atomic": "2.4.3" }, "dependencies": { "chalk": { @@ -14656,9 +14692,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.5.0" } } } @@ -14669,7 +14705,7 @@ "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", "dev": true, "requires": { - "async-limiter": "~1.0.0" + "async-limiter": "1.0.1" } }, "xmlbuilder": { @@ -14708,17 +14744,17 @@ "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dev": true, "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" + "cliui": "6.0.0", + "decamelize": "1.2.0", + "find-up": "4.1.0", + "get-caller-file": "2.0.5", + "require-directory": "2.1.1", + "require-main-filename": "2.0.0", + "set-blocking": "2.0.0", + "string-width": "4.2.0", + "which-module": "2.0.0", + "y18n": "4.0.0", + "yargs-parser": "18.1.3" }, "dependencies": { "cliui": { @@ -14727,9 +14763,9 @@ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" + "string-width": "4.2.0", + "strip-ansi": "6.0.0", + "wrap-ansi": "6.2.0" } }, "find-up": { @@ -14789,8 +14825,8 @@ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "camelcase": "5.3.1", + "decamelize": "1.2.0" } } } @@ -14801,8 +14837,8 @@ "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "dev": true, "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "camelcase": "5.3.1", + "decamelize": "1.2.0" } }, "zip-stream": { @@ -14811,9 +14847,9 @@ "integrity": "sha512-TGxB2g+1ur6MHkvM644DuZr8Uzyz0k0OYWtS3YlpfWBEmK4woaC2t3+pozEL3dBfIPmpgmClR5B2QRcMgGt22g==", "dev": true, "requires": { - "archiver-utils": "^2.1.0", - "compress-commons": "^4.0.0", - "readable-stream": "^3.6.0" + "archiver-utils": "2.1.0", + "compress-commons": "4.0.1", + "readable-stream": "3.6.0" } }, "zlib": { diff --git a/package.json b/package.json index 443ebba..b3d9381 100644 --- a/package.json +++ b/package.json @@ -19,13 +19,16 @@ "devDependencies": { "@quasar/app": "^2.0.0", "@types/node": "^10.17.15", + "@types/webpack": "^4.41.22", + "@types/webpack-env": "^1.15.3", "@typescript-eslint/eslint-plugin": "^3.3.0", "@typescript-eslint/parser": "^3.3.0", "babel-eslint": "^10.0.1", "eslint": "^6.8.0", "eslint-config-prettier": "^6.9.0", "eslint-loader": "^3.0.3", - "eslint-plugin-vue": "^6.1.2" + "eslint-plugin-vue": "^6.1.2", + "require-context": "^1.1.0" }, "browserslist": [ "last 10 Chrome versions", diff --git a/quasar.conf.js b/quasar.conf.js index 2960d54..08ce14e 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -8,8 +8,9 @@ /* eslint-env node */ /* eslint-disable @typescript-eslint/no-var-requires */ const { configure } = require('quasar/wrappers'); +const { path } = require('path'); -module.exports = configure(function (ctx) { +module.exports = configure(function(ctx) { return { // https://quasar.dev/quasar-cli/supporting-ts supportTS: { @@ -24,15 +25,10 @@ module.exports = configure(function (ctx) { // app boot file (/src/boot) // --> boot files are part of "main.js" // https://quasar.dev/quasar-cli/boot-files - boot: [ - 'composition-api', - 'axios', - ], + boot: ['composition-api', 'axios', 'plugins'], // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css - css: [ - 'app.scss' - ], + css: ['app.scss'], // https://github.com/quasarframework/quasar/tree/dev/extras extras: [ @@ -45,7 +41,7 @@ module.exports = configure(function (ctx) { // 'roboto-font-latin-ext', // this or either 'roboto-font', NEVER both! 'roboto-font', // optional, you are not bound to it - 'material-icons', // optional, you are not bound to it + 'material-icons' // optional, you are not bound to it ], // Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-build @@ -69,7 +65,7 @@ module.exports = configure(function (ctx) { // extractCSS: false, // https://quasar.dev/quasar-cli/handling-webpack - extendWebpack (cfg) { + extendWebpack(cfg) { // linting is slow in TS projects, we execute it only for production builds if (ctx.prod) { cfg.module.rules.push({ @@ -77,22 +73,27 @@ module.exports = configure(function (ctx) { test: /\.(js|vue)$/, loader: 'eslint-loader', exclude: /node_modules/ - }) + }); } - }, + cfg.resolve.alias = { + ...cfg.resolve.alias + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access + //flaschngeist_plugin: path.resolve(__dirname, './src/plugins') + }; + } }, // Full list of options: https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-devServer devServer: { https: false, port: 8080, - open: true // opens browser window automatically + open: false // opens browser window automatically }, // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework framework: { iconSet: 'material-icons', // Quasar icon set - lang: 'en-us', // Quasar language pack + lang: 'de', // Quasar language pack config: {}, // Possible values for "importStrategy": @@ -178,13 +179,11 @@ module.exports = configure(function (ctx) { packager: { // https://github.com/electron-userland/electron-packager/blob/master/docs/api.md#options - // OS X / Mac App Store // appBundleId: '', // appCategoryType: '', // osxSign: '', // protocol: 'myapp://path', - // Windows only // win32metadata: { ... } }, @@ -198,10 +197,10 @@ module.exports = configure(function (ctx) { // More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration nodeIntegration: true, - extendWebpack (/* cfg */) { + extendWebpack(/* cfg */) { // do something with Electron main process Webpack cfg // chainWebpack also available besides this extendWebpack } } - } + }; }); diff --git a/src/boot/plugins.ts b/src/boot/plugins.ts new file mode 100644 index 0000000..0d368e9 --- /dev/null +++ b/src/boot/plugins.ts @@ -0,0 +1,44 @@ +import { boot } from 'quasar/wrappers'; +import { RouteConfig } from 'vue-router'; +import { Module } from 'vuex'; +import {} from 'webpack'; + +interface PluginRouteConfig extends RouteConfig { + example?: unknown; +} + +interface EssentialLink { + title: string; + link: string; + icon?: string; +} + +interface Plugin { + router: PluginRouteConfig[]; + store?: Module; + mainLink: EssentialLink; +} + +export { PluginRouteConfig, Plugin }; + +// "async" is optional; +// more info on params: https://quasar.dev/quasar-cli/cli-documentation/boot-files#Anatomy-of-a-boot-file +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore +export default boot(({ Vue, router, store }) => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access + const plugins: any = require.context('src/plugins', true, /.+\/plugin.ts$/); + // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access + let mop = []; + // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access + plugins.keys().forEach((fileName: any) => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-call + + // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access + router.addRoutes(plugins(fileName).default.router); + // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access + mop.push(plugins(fileName).default.mainLink); + }); + Vue.prototype.$flaschengeist_plugins = mop; + console.log(plugins); +}); diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index ed5f05c..cd868fb 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -53,6 +53,13 @@ :link="link.link" :icon="link.icon" /> + diff --git a/src/pages/home/Home.vue b/src/pages/home/Home.vue index c5dd22d..0f28c92 100644 --- a/src/pages/home/Home.vue +++ b/src/pages/home/Home.vue @@ -4,6 +4,9 @@ Home + + {{ a }} + @@ -11,8 +14,11 @@ diff --git a/src/plugins/plugin-example-2/components/navigation/PluginLinks.vue b/src/plugins/plugin-example-2/components/navigation/PluginLinks.vue new file mode 100644 index 0000000..2fd0060 --- /dev/null +++ b/src/plugins/plugin-example-2/components/navigation/PluginLinks.vue @@ -0,0 +1,32 @@ + + + diff --git a/src/plugins/plugin-example-2/pages/NewPlugin.vue b/src/plugins/plugin-example-2/pages/NewPlugin.vue new file mode 100644 index 0000000..b528993 --- /dev/null +++ b/src/plugins/plugin-example-2/pages/NewPlugin.vue @@ -0,0 +1,17 @@ + + + diff --git a/src/plugins/plugin-example-2/pages/OldPlugin.vue b/src/plugins/plugin-example-2/pages/OldPlugin.vue new file mode 100644 index 0000000..b025fee --- /dev/null +++ b/src/plugins/plugin-example-2/pages/OldPlugin.vue @@ -0,0 +1,16 @@ + + + diff --git a/src/plugins/plugin-example-2/pages/Plugin.vue b/src/plugins/plugin-example-2/pages/Plugin.vue new file mode 100644 index 0000000..d462cfb --- /dev/null +++ b/src/plugins/plugin-example-2/pages/Plugin.vue @@ -0,0 +1,22 @@ + + + diff --git a/src/plugins/plugin-example-2/plugin.ts b/src/plugins/plugin-example-2/plugin.ts new file mode 100644 index 0000000..4a80d63 --- /dev/null +++ b/src/plugins/plugin-example-2/plugin.ts @@ -0,0 +1,12 @@ +import { PluginRouteConfig, Plugin } from 'boot/plugins'; +import { RouteConfig } from 'vue-router'; +import routes from 'src/plugins/plugin-example-2/routes'; + +const plugin: Plugin = { + router: routes, + mainLink: { title: 'Plugin2', link: 'plugin2', icon: 'mdi-toy-brick-plus' } +}; + +const mainLink = plugin.mainLink; +export { mainLink }; +export default plugin; diff --git a/src/plugins/plugin-example-2/routes/index.ts b/src/plugins/plugin-example-2/routes/index.ts new file mode 100644 index 0000000..3a4fcf7 --- /dev/null +++ b/src/plugins/plugin-example-2/routes/index.ts @@ -0,0 +1,34 @@ +import { RouteConfig } from 'vue-router'; + +const routes: RouteConfig[] = [ + { + path: '/main', + components: { + default: () => import('layouts/MainLayout.vue') + }, + children: [ + { + path: 'plugin2', + name: 'plugin2', + components: { + default: () => import('../pages/Plugin.vue'), + 'plugin-nav': () => import('../components/navigation/PluginLinks.vue') + }, + children: [ + { + path: 'plugin2_1', + name: 'plugin2_1', + component: () => import('../pages/NewPlugin.vue') + }, + { + path: 'plugin2_2', + name: 'plugin2_2', + component: () => import('../pages/OldPlugin.vue') + } + ] + } + ] + } +]; + +export default routes; diff --git a/src/plugins/plugin-example/components/navigation/PluginLinks.vue b/src/plugins/plugin-example/components/navigation/PluginLinks.vue new file mode 100644 index 0000000..84b5d02 --- /dev/null +++ b/src/plugins/plugin-example/components/navigation/PluginLinks.vue @@ -0,0 +1,32 @@ + + + diff --git a/src/plugins/plugin-example/pages/NewPlugin.vue b/src/plugins/plugin-example/pages/NewPlugin.vue new file mode 100644 index 0000000..b528993 --- /dev/null +++ b/src/plugins/plugin-example/pages/NewPlugin.vue @@ -0,0 +1,17 @@ + + + diff --git a/src/plugins/plugin-example/pages/OldPlugin.vue b/src/plugins/plugin-example/pages/OldPlugin.vue new file mode 100644 index 0000000..b025fee --- /dev/null +++ b/src/plugins/plugin-example/pages/OldPlugin.vue @@ -0,0 +1,16 @@ + + + diff --git a/src/plugins/plugin-example/pages/Plugin.vue b/src/plugins/plugin-example/pages/Plugin.vue new file mode 100644 index 0000000..d462cfb --- /dev/null +++ b/src/plugins/plugin-example/pages/Plugin.vue @@ -0,0 +1,22 @@ + + + diff --git a/src/plugins/plugin-example/plugin.ts b/src/plugins/plugin-example/plugin.ts new file mode 100644 index 0000000..42dcaaf --- /dev/null +++ b/src/plugins/plugin-example/plugin.ts @@ -0,0 +1,14 @@ +import { PluginRouteConfig, Plugin } from 'boot/plugins'; +import { RouteConfig } from 'vue-router'; +import routes from 'src/plugins/plugin-example/routes'; + +const plugin: Plugin = { + router: routes, + mainLink: { title: 'Plugin1', link: 'plugin1', icon: 'mdi-toy-brick' } +}; + +const mainLink = plugin.mainLink; + +export { mainLink }; + +export default plugin; diff --git a/src/plugins/plugin-example/routes/index.ts b/src/plugins/plugin-example/routes/index.ts new file mode 100644 index 0000000..354659c --- /dev/null +++ b/src/plugins/plugin-example/routes/index.ts @@ -0,0 +1,34 @@ +import { RouteConfig } from 'vue-router'; + +const routes: RouteConfig[] = [ + { + path: '/main', + components: { + default: () => import('layouts/MainLayout.vue') + }, + children: [ + { + path: 'plugin1', + name: 'plugin1', + components: { + default: () => import('../pages/Plugin.vue'), + 'plugin-nav': () => import('../components/navigation/PluginLinks.vue') + }, + children: [ + { + path: 'plugin1_1', + name: 'plugin1_1', + component: () => import('../pages/NewPlugin.vue') + }, + { + path: 'plugin1_2', + name: 'plugin1_2', + component: () => import('../pages/OldPlugin.vue') + } + ] + } + ] + } +]; + +export default routes; diff --git a/src/store/index.ts b/src/store/index.ts index 83d76c2..76aafdb 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -16,7 +16,7 @@ export interface StateInterface { example: unknown; } -export default store(function ({ Vue }) { +export default store(function({ Vue }) { Vue.use(Vuex); const Store = new Vuex.Store({ diff --git a/tsconfig.json b/tsconfig.json index d7fb0a3..f07c6ef 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "@quasar/app/tsconfig-preset", "compilerOptions": { + "types": ["node", "webpack-env"], "baseUrl": "." } } From dddafef3a1e9d9354f916c67106bb392a2ed7046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Tue, 13 Oct 2020 11:27:27 +0200 Subject: [PATCH 024/448] Fixed Error und Warnings --- package-lock.json | 30 ++----- package.json | 2 +- quasar.conf.js | 6 -- src/boot/composition-api.ts | 3 +- src/boot/plugins.ts | 42 +++++---- ...nLinksHome.vue => PluginChildrenLinks.vue} | 0 .../navigation/PluginLinksAbout.vue | 28 ------ src/layouts/MainLayout.vue | 90 +++++++++++++++++-- src/layouts/OutLayout.vue | 18 ++-- src/pages/Login.vue | 4 +- src/pages/home/Home.vue | 2 +- src/plugins/plugin-example-2/pages/Plugin.vue | 2 +- src/plugins/plugin-example-2/plugin.ts | 24 ++++- src/plugins/plugin-example/pages/Plugin.vue | 2 +- src/plugins/plugin-example/plugin.ts | 24 ++++- src/router/routes.ts | 12 +-- tsconfig.json | 2 +- 17 files changed, 172 insertions(+), 119 deletions(-) rename src/components/navigation/{PluginLinksHome.vue => PluginChildrenLinks.vue} (100%) delete mode 100644 src/components/navigation/PluginLinksAbout.vue diff --git a/package-lock.json b/package-lock.json index 8cd8737..dd37519 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1376,6 +1376,12 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true + }, + "typescript": { + "version": "3.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz", + "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==", + "dev": true } } }, @@ -8645,15 +8651,6 @@ "lower-case": "1.1.4" } }, - "node-dir": { - "version": "0.1.17", - "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", - "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=", - "dev": true, - "requires": { - "minimatch": "3.0.4" - } - }, "node-forge": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", @@ -10912,15 +10909,6 @@ } } }, - "require-context": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/require-context/-/require-context-1.1.0.tgz", - "integrity": "sha512-nfYSy3Q9W3W1fCo0nief19bDq216IGY9+wOUsmCWAJ5jssyak0r110rvqIj4KJYoUYDxLDaeA66ONOYy4PJEUw==", - "dev": true, - "requires": { - "node-dir": "0.1.17" - } - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -12947,9 +12935,9 @@ "dev": true }, "typescript": { - "version": "3.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz", - "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz", + "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index b3d9381..7b12e13 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "eslint-config-prettier": "^6.9.0", "eslint-loader": "^3.0.3", "eslint-plugin-vue": "^6.1.2", - "require-context": "^1.1.0" + "typescript": "^4.0.3" }, "browserslist": [ "last 10 Chrome versions", diff --git a/quasar.conf.js b/quasar.conf.js index 08ce14e..73977b8 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -8,7 +8,6 @@ /* eslint-env node */ /* eslint-disable @typescript-eslint/no-var-requires */ const { configure } = require('quasar/wrappers'); -const { path } = require('path'); module.exports = configure(function(ctx) { return { @@ -75,11 +74,6 @@ module.exports = configure(function(ctx) { exclude: /node_modules/ }); } - cfg.resolve.alias = { - ...cfg.resolve.alias - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access - //flaschngeist_plugin: path.resolve(__dirname, './src/plugins') - }; } }, diff --git a/src/boot/composition-api.ts b/src/boot/composition-api.ts index 0880600..cac99ea 100644 --- a/src/boot/composition-api.ts +++ b/src/boot/composition-api.ts @@ -1,6 +1,7 @@ import VueCompositionApi from '@vue/composition-api'; +import { VueConstructor } from 'vue'; import { boot } from 'quasar/wrappers'; -export default boot(({ Vue }) => { +export default boot(({ Vue }: { Vue: VueConstructor }) => { Vue.use(VueCompositionApi); }); diff --git a/src/boot/plugins.ts b/src/boot/plugins.ts index 0d368e9..cdddfdd 100644 --- a/src/boot/plugins.ts +++ b/src/boot/plugins.ts @@ -1,7 +1,6 @@ import { boot } from 'quasar/wrappers'; import { RouteConfig } from 'vue-router'; import { Module } from 'vuex'; -import {} from 'webpack'; interface PluginRouteConfig extends RouteConfig { example?: unknown; @@ -15,30 +14,35 @@ interface EssentialLink { interface Plugin { router: PluginRouteConfig[]; - store?: Module; - mainLink: EssentialLink; + store?: Module; + mainLink: PluginMainLink; } -export { PluginRouteConfig, Plugin }; +interface PluginMainLink extends PluginChildLink { + children: PluginChildLink[] | []; +} + +interface PluginChildLink { + name: string; + title: string; + link: string; + icon: string; +} + +export { PluginRouteConfig, Plugin, PluginChildLink, PluginMainLink }; // "async" is optional; // more info on params: https://quasar.dev/quasar-cli/cli-documentation/boot-files#Anatomy-of-a-boot-file -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore -export default boot(({ Vue, router, store }) => { - // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access - const plugins: any = require.context('src/plugins', true, /.+\/plugin.ts$/); - // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access - let mop = []; - // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access - plugins.keys().forEach((fileName: any) => { - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-call - - // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access +export default boot(({ Vue, router }) => { + const plugins = require.context('src/plugins', true, /.+\/plugin.ts$/); + const pluginMainLinks: PluginMainLink[] = []; + plugins.keys().forEach((fileName: string) => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access router.addRoutes(plugins(fileName).default.router); - // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access - mop.push(plugins(fileName).default.mainLink); + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access + pluginMainLinks.push(plugins(fileName).default.mainLink); }); - Vue.prototype.$flaschengeist_plugins = mop; + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access + Vue.prototype.$flaschengeist_plugins = pluginMainLinks; console.log(plugins); }); diff --git a/src/components/navigation/PluginLinksHome.vue b/src/components/navigation/PluginChildrenLinks.vue similarity index 100% rename from src/components/navigation/PluginLinksHome.vue rename to src/components/navigation/PluginChildrenLinks.vue diff --git a/src/components/navigation/PluginLinksAbout.vue b/src/components/navigation/PluginLinksAbout.vue deleted file mode 100644 index 7e12254..0000000 --- a/src/components/navigation/PluginLinksAbout.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index cd868fb..c24dc45 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -48,14 +48,14 @@ - + + + + + +
import EssentialLink from 'components/navigation/EssentialLink.vue'; -import { event, Screen } from 'quasar'; -import { defineComponent, ref, reactive, computed } from '@vue/composition-api'; +import { Screen } from 'quasar'; +import { PluginMainLink } from 'boot/plugins'; +import { defineComponent, ref, computed } from '@vue/composition-api'; const links = [ - { title: 'home', icon: 'mdi-home' }, - { title: 'about', link: 'about', icon: 'mdi-information' } + { + name: 'home', + title: 'home', + icon: 'mdi-home', + children: [ + { title: 'Neues Home', link: 'newHome', icon: 'mdi-google-home' }, + { title: 'Altes Home', link: 'oldHome', icon: 'mdi-home-modern' } + ] + }, + { + name: 'about', + title: 'about', + link: 'about', + icon: 'mdi-information', + children: [ + { + title: 'Neues About', + link: 'newAbout', + icon: 'mdi-information-outline' + }, + { + title: 'Altes About', + link: 'oldAbout', + icon: 'mdi-information-variant' + } + ] + } ]; +declare module 'vue/types/vue' { + interface Vue { + $flaschengeist_plugins: PluginMainLink[]; + } +} + export default defineComponent({ name: 'MainLayout', components: { EssentialLink }, - setup() { + setup(_, ctx) { const leftDrawer = ref(false); const leftDrawerOpen = ref( @@ -114,7 +157,36 @@ export default defineComponent({ } } - return { leftDrawerOpen, leftDrawerMini, leftDrawerClicker, links }; + const pluginChildLinks = computed(() => { + const test: + | PluginMainLink + | undefined = ctx.root.$flaschengeist_plugins.find( + (plugin: PluginMainLink) => { + return plugin.name == ctx.root.$route.matched[1].name; + } + ); + console.log(test); + if (typeof test == undefined) { + return []; + } else { + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + //@ts-ignore + return test.children; + } + }); + + function showRoute() { + console.log(ctx.root.$route); + } + + return { + leftDrawerOpen, + leftDrawerMini, + leftDrawerClicker, + links, + pluginChildLinks, + showRoute + }; } }); diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue index 400ea93..1857789 100644 --- a/src/layouts/OutLayout.vue +++ b/src/layouts/OutLayout.vue @@ -1,12 +1,13 @@ diff --git a/src/pages/Login.vue b/src/pages/Login.vue index e492340..3716c18 100644 --- a/src/pages/Login.vue +++ b/src/pages/Login.vue @@ -38,7 +38,7 @@ import { defineComponent, ref } from '@vue/composition-api'; export default defineComponent({ // name: 'PageName' - setup() { + setup(_, ctx) { const username = ref(''); const password = ref(''); const rules = [ @@ -47,7 +47,7 @@ export default defineComponent({ function doLogin() { console.log(username.value, password.value); - this.$router.push({ name: 'home' }); + void ctx.root.$router.push({ name: 'home' }); } return { username, password, doLogin, rules }; diff --git a/src/pages/home/Home.vue b/src/pages/home/Home.vue index 0f28c92..57ba773 100644 --- a/src/pages/home/Home.vue +++ b/src/pages/home/Home.vue @@ -13,7 +13,7 @@ diff --git a/src/pages/home/NewHome.vue b/src/pages/home/NewHome.vue deleted file mode 100644 index 8d8dba7..0000000 --- a/src/pages/home/NewHome.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/src/pages/home/OldHome.vue b/src/pages/home/OldHome.vue deleted file mode 100644 index 6c18ea2..0000000 --- a/src/pages/home/OldHome.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/src/plugins/plugin-example-2/plugin.ts b/src/plugins/plugin-example-2/plugin.ts deleted file mode 100644 index 34157f7..0000000 --- a/src/plugins/plugin-example-2/plugin.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Plugin } from 'boot/plugins'; -import routes from 'src/plugins/plugin-example-2/routes'; - -const plugin: Plugin = { - router: routes, - mainLink: { - name: 'plugin2', - title: 'Plugin2', - link: 'plugin2', - icon: 'mdi-toy-brick-plus', - children: [ - { - name: 'plugin2', - title: 'Neues Plugin2', - link: 'plugin2_1', - icon: 'mdi-information-outline' - }, - { - name: 'plugin2', - title: 'Altes Plugin2', - link: 'plugin2_2', - icon: 'mdi-information-variant' - } - ] - } -}; - -const mainLink = plugin.mainLink; -export { mainLink }; -export default plugin; diff --git a/src/plugins/plugin-example/plugin.ts b/src/plugins/plugin-example/plugin.ts index 2b5b250..8708048 100644 --- a/src/plugins/plugin-example/plugin.ts +++ b/src/plugins/plugin-example/plugin.ts @@ -1,31 +1,33 @@ -import { Plugin } from 'boot/plugins'; +import { Plugin, PluginMainLink } from 'boot/plugins'; import routes from 'src/plugins/plugin-example/routes'; -const plugin: Plugin = { - router: routes, - mainLink: { - name: 'plugin1', - title: 'Plugin1', - link: 'plugin1', - icon: 'mdi-toy-brick', - children: [ - { - name: 'plugin1', - title: 'Neues Plugin1', - link: 'plugin1_1', - icon: 'mdi-information-outline' - }, - { - name: 'plugin1', - title: 'Altes Plugin1', - link: 'plugin1_2', - icon: 'mdi-information-variant' - } - ] - } +const mainLink: PluginMainLink = { + name: 'plugin1', + title: 'Plugin1', + link: 'plugin1', + icon: 'mdi-toy-brick', + children: [ + { + name: 'plugin1', + title: 'Neues Plugin1', + link: 'plugin1_1', + icon: 'mdi-information-outline' + }, + { + name: 'plugin1', + title: 'Altes Plugin1', + link: 'plugin1_2', + icon: 'mdi-information-variant' + } + ] }; -const mainLink = plugin.mainLink; +const plugin: Plugin = { + routes, + mainLink, + name: mainLink.name, + requiredModules: [] +}; export { mainLink }; diff --git a/src/plugins/plugin-example-2/components/navigation/PluginLinks.vue b/src/plugins/user-plugin/components/navigation/PluginLinks.vue similarity index 100% rename from src/plugins/plugin-example-2/components/navigation/PluginLinks.vue rename to src/plugins/user-plugin/components/navigation/PluginLinks.vue diff --git a/src/plugins/plugin-example-2/pages/NewPlugin.vue b/src/plugins/user-plugin/pages/NewPlugin.vue similarity index 100% rename from src/plugins/plugin-example-2/pages/NewPlugin.vue rename to src/plugins/user-plugin/pages/NewPlugin.vue diff --git a/src/plugins/plugin-example-2/pages/OldPlugin.vue b/src/plugins/user-plugin/pages/OldPlugin.vue similarity index 100% rename from src/plugins/plugin-example-2/pages/OldPlugin.vue rename to src/plugins/user-plugin/pages/OldPlugin.vue diff --git a/src/plugins/plugin-example-2/pages/Plugin.vue b/src/plugins/user-plugin/pages/Plugin.vue similarity index 100% rename from src/plugins/plugin-example-2/pages/Plugin.vue rename to src/plugins/user-plugin/pages/Plugin.vue diff --git a/src/plugins/user-plugin/plugin.ts b/src/plugins/user-plugin/plugin.ts new file mode 100644 index 0000000..e850196 --- /dev/null +++ b/src/plugins/user-plugin/plugin.ts @@ -0,0 +1,33 @@ +import { Plugin, PluginMainLink } from 'boot/plugins'; +import routes from './routes'; + +const mainLink: PluginMainLink = { + name: 'user-plugin', + title: 'User', + link: 'user', + icon: 'mdi-account', + children: [ + { + name: 'user-plugin', + title: 'Erstes Plugin für User', + link: 'user-plugin1', + icon: 'mdi-account-plus' + }, + { + name: 'user-plugin', + title: 'Zweites Plugin für User', + link: 'user-plugin2', + icon: 'mdi-account-minus' + } + ] +}; + +const plugin: Plugin = { + routes, + mainLink, + name: mainLink.name, + requiredModules: ['user'] +}; + +export { mainLink }; +export default plugin; diff --git a/src/plugins/plugin-example-2/routes/index.ts b/src/plugins/user-plugin/routes/index.ts similarity index 56% rename from src/plugins/plugin-example-2/routes/index.ts rename to src/plugins/user-plugin/routes/index.ts index 3a4fcf7..c0c2ee1 100644 --- a/src/plugins/plugin-example-2/routes/index.ts +++ b/src/plugins/user-plugin/routes/index.ts @@ -8,21 +8,18 @@ const routes: RouteConfig[] = [ }, children: [ { - path: 'plugin2', - name: 'plugin2', - components: { - default: () => import('../pages/Plugin.vue'), - 'plugin-nav': () => import('../components/navigation/PluginLinks.vue') - }, + path: 'user', + name: 'user', + component: () => import('src/plugins/user/pages/User.vue'), children: [ { - path: 'plugin2_1', - name: 'plugin2_1', + path: 'user-plugin', + name: 'user-plugin1', component: () => import('../pages/NewPlugin.vue') }, { - path: 'plugin2_2', - name: 'plugin2_2', + path: 'user-plugin2', + name: 'user-plugin2', component: () => import('../pages/OldPlugin.vue') } ] diff --git a/src/plugins/user/pages/User.vue b/src/plugins/user/pages/User.vue new file mode 100644 index 0000000..4ff0feb --- /dev/null +++ b/src/plugins/user/pages/User.vue @@ -0,0 +1,28 @@ + + + diff --git a/src/plugins/user/plugin.ts b/src/plugins/user/plugin.ts new file mode 100644 index 0000000..7a04344 --- /dev/null +++ b/src/plugins/user/plugin.ts @@ -0,0 +1,21 @@ +import { Plugin, PluginMainLink } from 'boot/plugins'; +import routes from './routes'; + +const mainLink: PluginMainLink = { + name: 'user', + title: 'User', + link: 'user', + icon: 'mdi-account', + children: [] +}; + +const plugin: Plugin = { + routes, + mainLink, + name: mainLink.name, + requiredModules: [] +}; + +export { mainLink }; + +export default plugin; diff --git a/src/plugins/user/routes/index.ts b/src/plugins/user/routes/index.ts new file mode 100644 index 0000000..e176de9 --- /dev/null +++ b/src/plugins/user/routes/index.ts @@ -0,0 +1,17 @@ +import { RouteConfig } from 'vue-router'; + +const routes: RouteConfig[] = [ + { + path: '/main', + component: () => import('layouts/MainLayout.vue'), + children: [ + { + path: 'user', + name: 'user', + component: () => import('../pages/User.vue') + } + ] + } +]; + +export default routes; diff --git a/src/router/routes.ts b/src/router/routes.ts index aec091d..774aac9 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -15,25 +15,9 @@ const routes: RouteConfig[] = [ }, { path: '/main', + name: 'main', component: () => import('layouts/MainLayout.vue'), children: [ - { - name: 'home', - path: 'home', - component: () => import('pages/home/Home.vue'), - children: [ - { - name: 'newHome', - path: 'newHome', - component: () => import('pages/home/NewHome.vue') - }, - { - name: 'oldHome', - path: 'oldHome', - component: () => import('pages/home/OldHome.vue') - } - ] - }, { name: 'about', path: 'about', From 61a679dfb1c78ae070ecaa5a114019fb6cfe3c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Tue, 13 Oct 2020 23:13:42 +0200 Subject: [PATCH 026/448] =?UTF-8?q?About-Page=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit kwt --- src/boot/plugins.ts | 4 +- src/components/about/Developer.vue | 52 ++++++++++ src/layouts/MainLayout.vue | 39 +++---- src/layouts/OutLayout.vue | 16 +++ src/pages/about/About.vue | 106 +++++++++++++++++++- src/pages/about/NewAbout.vue | 14 --- src/pages/about/OldAbout.vue | 14 --- src/plugins/plugin-example/pages/Plugin.vue | 2 +- src/plugins/user-plugin/pages/Plugin.vue | 2 +- src/plugins/user/pages/User.vue | 2 +- src/router/routes.ts | 19 ++-- 11 files changed, 196 insertions(+), 74 deletions(-) create mode 100644 src/components/about/Developer.vue delete mode 100644 src/pages/about/NewAbout.vue delete mode 100644 src/pages/about/OldAbout.vue diff --git a/src/boot/plugins.ts b/src/boot/plugins.ts index f70c55b..f4eeede 100644 --- a/src/boot/plugins.ts +++ b/src/boot/plugins.ts @@ -161,6 +161,8 @@ export default boot(({ Vue, router, store }) => { console.log(routes); router.addRoutes(routes); // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - Vue.prototype.$flaschengeist_plugins = pluginMainLinks; + Vue.prototype.$flaschengeistPluginsMainLinks = pluginMainLinks; + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access + Vue.prototype.$flaschengeistPlugins = plugins; console.log(pluginMainLinks); }); diff --git a/src/components/about/Developer.vue b/src/components/about/Developer.vue new file mode 100644 index 0000000..70cd302 --- /dev/null +++ b/src/components/about/Developer.vue @@ -0,0 +1,52 @@ + + + diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index a336a9c..e5d2370 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -47,14 +47,7 @@ -
+ + + + @@ -105,27 +108,15 @@ import { defineComponent, ref, computed } from '@vue/composition-api'; const links = [ { name: 'about', - title: 'about', + title: 'Über Flaschengeist', link: 'about', - icon: 'mdi-information', - children: [ - { - title: 'Neues About', - link: 'newAbout', - icon: 'mdi-information-outline' - }, - { - title: 'Altes About', - link: 'oldAbout', - icon: 'mdi-information-variant' - } - ] + icon: 'mdi-information' } ]; declare module 'vue/types/vue' { interface Vue { - $flaschengeist_plugins: PluginMainLink[]; + $flaschengeistPluginsMainLinks: PluginMainLink[]; } } @@ -151,7 +142,7 @@ export default defineComponent({ const pluginChildLinks = computed(() => { const test: | PluginMainLink - | undefined = ctx.root.$flaschengeist_plugins.find( + | undefined = ctx.root.$flaschengeistPluginsMainLinks.find( (plugin: PluginMainLink) => { if (ctx.root.$route.matched.length > 1) { return plugin.name == ctx.root.$route.matched[1].name; diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue index 1857789..9c4807e 100644 --- a/src/layouts/OutLayout.vue +++ b/src/layouts/OutLayout.vue @@ -13,6 +13,22 @@ Flaschengeist + + diff --git a/src/pages/about/About.vue b/src/pages/about/About.vue index 622af68..231ef63 100644 --- a/src/pages/about/About.vue +++ b/src/pages/about/About.vue @@ -1,17 +1,113 @@ diff --git a/src/pages/about/NewAbout.vue b/src/pages/about/NewAbout.vue deleted file mode 100644 index 8bda575..0000000 --- a/src/pages/about/NewAbout.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/src/pages/about/OldAbout.vue b/src/pages/about/OldAbout.vue deleted file mode 100644 index 99333f4..0000000 --- a/src/pages/about/OldAbout.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/src/plugins/plugin-example/pages/Plugin.vue b/src/plugins/plugin-example/pages/Plugin.vue index e17f683..0beeb75 100644 --- a/src/plugins/plugin-example/pages/Plugin.vue +++ b/src/plugins/plugin-example/pages/Plugin.vue @@ -15,7 +15,7 @@ import { mainLink } from '../plugin'; export default defineComponent({ // name: 'PageName' setup(_, ctx) { - const a = ctx.root.$flaschengeist_plugins; + const a = ctx.root.$flaschengeistPluginsMainLinks; return { a, mainLink }; } }); diff --git a/src/plugins/user-plugin/pages/Plugin.vue b/src/plugins/user-plugin/pages/Plugin.vue index e17f683..0beeb75 100644 --- a/src/plugins/user-plugin/pages/Plugin.vue +++ b/src/plugins/user-plugin/pages/Plugin.vue @@ -15,7 +15,7 @@ import { mainLink } from '../plugin'; export default defineComponent({ // name: 'PageName' setup(_, ctx) { - const a = ctx.root.$flaschengeist_plugins; + const a = ctx.root.$flaschengeistPluginsMainLinks; return { a, mainLink }; } }); diff --git a/src/plugins/user/pages/User.vue b/src/plugins/user/pages/User.vue index 4ff0feb..7ac07fd 100644 --- a/src/plugins/user/pages/User.vue +++ b/src/plugins/user/pages/User.vue @@ -21,7 +21,7 @@ import { mainLink } from '../plugin'; export default defineComponent({ // name: 'PageName' setup(_, ctx) { - const a = ctx.root.$flaschengeist_plugins; + const a = ctx.root.$flaschengeistPluginsMainLinks; return { a, mainLink }; } }); diff --git a/src/router/routes.ts b/src/router/routes.ts index 774aac9..ca5c399 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -10,6 +10,11 @@ const routes: RouteConfig[] = [ name: 'login', path: 'login', component: () => import('pages/Login.vue') + }, + { + name: 'about_out', + path: 'about', + component: () => import('pages/about/About.vue') } ] }, @@ -21,19 +26,7 @@ const routes: RouteConfig[] = [ { name: 'about', path: 'about', - component: () => import('pages/about/About.vue'), - children: [ - { - name: 'newAbout', - path: 'newAbout', - component: () => import('pages/about/NewAbout.vue') - }, - { - name: 'oldAbout', - path: 'oldAbout', - component: () => import('pages/about/OldAbout.vue') - } - ] + component: () => import('pages/about/About.vue') } ] }, From 10c1b57c64ef86c73eb3c4dd63ef387ae007fa25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Wed, 14 Oct 2020 15:00:13 +0200 Subject: [PATCH 027/448] fixed bug: tag developer in home hatte kein 'key' --- src/pages/about/About.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/about/About.vue b/src/pages/about/About.vue index 231ef63..7781ae1 100644 --- a/src/pages/about/About.vue +++ b/src/pages/about/About.vue @@ -54,8 +54,8 @@ class="fit row inline wrap justify-around items-start content-start q-gutter-sm" > Date: Wed, 14 Oct 2020 17:13:03 +0200 Subject: [PATCH 028/448] update invertiertes Logo --- public/logo-dark.svg | 388 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 379 insertions(+), 9 deletions(-) diff --git a/public/logo-dark.svg b/public/logo-dark.svg index ce9ce36..6110815 100644 --- a/public/logo-dark.svg +++ b/public/logo-dark.svg @@ -12,7 +12,7 @@ id="svg3052" version="1.1" inkscape:version="0.48.5 r10040" - sodipodi:docname="Loewe_hellaufdunkel.svg"> + sodipodi:docname="Loewe_dunkelaufhell.svg"> @@ -21,6 +21,7 @@ image/svg+xml + @@ -43,16 +44,385 @@ fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" - inkscape:zoom="0.60299194" - inkscape:cx="269.43314" - inkscape:cy="330.40328" + inkscape:zoom="0.82402179" + inkscape:cx="262.55905" + inkscape:cy="317.95276" inkscape:window-x="0" inkscape:window-y="25" inkscape:window-maximized="1" - inkscape:current-layer="svg3052" /> + inkscape:current-layer="svg3052" + showguides="true" + inkscape:guide-bbox="true" /> + style="fill:#000000;stroke:none;stroke-opacity:1;fill-opacity:1" + d="m 302.43314,25.002222 c 6.553,9.444 14.412,5.55 25,7.665 22.576,4.51 46.413,3.319 66,17.335 -0.433,2.331 -0.861,4.626 -0.961,7.002 -0.803,19.117 28.163,-1.909 36.961,12.998 l -19,0 0,2 15,1 -1,3 c 5.604,0.015 14.814,-0.831 16,6 l 13,2 -2,4 16,5 0,1 -10,0 8,5 -11,3.999998 0,2 c 8.174,2.765 13.451,3.617 11,13 l 22,5 -1,6 15,7 c -0.397,7.726 5.939,9.128 12,12 l -2,2 6,9 -4,-1 9,11 -21,-10 7,8 -13,-5 0,1 13,8 0,1 -16,-6 19,13 0,1 -23,-8 17,16 -4,0 11,6 -4,6 11,0 c -3.583,5.677 -10.296,3.721 -16,3 l 5,7 -18,-1 17,48 -15,-9 18.197,80 9.803,63 -1,0 -12,-20 c -1.523,16.752 14.065,32.866 9,50 l -11,-28 -4,7 13,48 -1,0 -7,-8 2,22 -10,-7 0,36 -8,-11 -1,0 0,34 -11,-13 -1,0 -1,22 -1,0 -6,-13 -1,32 c -12.745,-6.973 -13.742,-30.391 -11,-43 l 1,0 5,19 c 4.199,-8.727 2,-23.253 2,-33 l 17,13 -1,-35 15,17 -5,-40 10,6 c -1.702,-13.395 -4.452,-26.656 -6.427,-40 -0.943,-6.366 -1.045,-12.426 -8.573,-13 l 6,17 -9,-7 8,19 -9,-5 2,29 -1,0 -10,-15 4,49 -18,-22 -1,32 -11,-11 -3,50 -1,0 -6,-22 -2,26 -8,-9 -1,38 -1,0 -5,-30 -5,16 -5,-8 -1,0 c -2.982,7.685 -6.474,24.104 -13,29 l 0,-7 c -10.929,10.907 -10.752,32.088 -16,46 l -1,0 -4,-28 -6,10 -6,-16 -2,0 -3,13 c -3.688,-2.807 -2.997,-7.717 -3,-12 l -9,10 0,-5 -6,8 -1,0 -6,-11 -7,37 -1,0 -4,-42 c -11.141,10.183 -8.273,27.757 -8,41 -8.508,-5.823 -9,-23.73 -9,-33 l -1,0 c -1.745,13.807 -0.665,41.737 -13,51 l -2,-31 -1,0 -3,32 -1,0 -5,-34 -6,12 -1,0 -1,-26 -7,6 0,-12 -6,8 1,-19 -4,6 -1,0 c 0,-9.624 -0.076,-14.927 9,-20 l 2,14 2,0 9,-11 c -0.092,11.067 -4.242,21.488 5,30 l 3,-17 1,0 5,21 1,0 12,-35 1,0 3,14 c 8.296,-4.708 12.803,-20.878 17.734,-28.985 7.513,-12.353 16.391,-25.551 25.281,-37.015 6.304,-8.13 14.962,-16.495 18.985,-26 l -10,6 16,-26 -12,10 16,-54 -32,32 10,-1 -6,9 9,-3 -9,12 7,-3 -16,33 7,-2 -6.637,12.012 -9.548,5.132 -14.815,24.856 -1,-4 -1,0 -2,8 -7,-8 -4,21 -1,0 -1,-3 -1,0 -3,13 -2,0 -6,-10 -1,0 -9,-0.758 -14,3.758 -2,0 c -2.337,-2.413 -3.336,-3.233 -6,-1 l -3,0 -1,-3 -1,0 -2,15 -1,0 -2,-14 -1,0 -3,21 -11,-13 1,8 -1,0 -4,-9 -2,9 -2,0 -7,-28 -4,8 -1,0 -3,-14 -4,7 -1,0 -1,-12 -3,2 -5,-3 -3.6,-38.985 -14.4,-18.015 2,0 -9,-17 3,1 -3,-23 -6,4 1,-18 -5,4 0,-7 -5.609,14 -7.923,20 -0.468,43 -1,0 -4,-5 0,31 -1,0 -5,-18 -1,0 -1,6 -1,0 -1,-8 -4,7 -5,-3 -8,10 12,-42 1,0 0,8 6.91,-21 12.09,-46 1,0 1,3 5,-32 1,0 5,5 1,-18 -3,4 -2,0 -6,-10 0,-9 -3,2 0,-6 -10,6 c 1.372,-6.806 7.595,-12.902 13,-17 l 1,3 4,-3 -1,7 8,-9 0,17 6,-3 0,14 3,-2 1,0 -6,21 3,-3 1,0 1,9 1,0 2,-5 1,0 c -1.173,14.859 -7.608,31.588 7,42 l 2,19 5,0 -4,9 5,-2 c 5.22,10.662 5.302,21.605 5,33 l 3,-2 4,3 -1,7 5,-4 -6,24 3,-3 1,0 3,5 0,4 4,-2 -2,6 7,-4 6,0 -6,13 6,-4 0,6 4,-4 1,0 -2,17 7,-7 c 1.499,4.719 1.798,9.422 7,11 l 0,9 8,-24 1,0 2,6 2,0 4,-7 1,4 1,0 3,-8 1,0 1,8 2,0 1,-6 1,0 2,5 3,-4 4,6 1,-5 3,3 3,0 0,-3 3,4 2,0 1,-5 1,0 1,3 1,0 1,-4 1,0 1,12 1,0 5,-19 1,0 1,10 1,0 1,-18 1,0 8,6 0,-12 9,9 -3,-16 5,2 -1,-8 1,-1 5,0 -4,-9 6,2 0,-11 4,0 -5,-13 5,2 c 0,-6.318 -1.168,-13.973 0.969,-20 7.838,-22.108 30.482,-42.303 21.031,-67 l 5,1 1,-1 -1,-18 5,2 -1,-11 5,4 c -0.982,-7.762 -2.973,-20.126 5,-25 l 0,12 1,0 c 2.297,-5.61 4.881,-4.758 10,-3 l -3,-22 1,0 4,7 -1,-26 1,0 6,12 c -0.802,-4.322 -0.184,-10.13 -2.742,-13.826 -10.862,-15.694 -38.618,-21.294 -46.258,-39.174 l 47,34 c -2.72,-12.83 -3.796,-30.406 -11.363,-41.891 -2.722,-4.133 -14.033,-7.517 -18.073,-3.621 -2.839,2.737 -3.392,8.846 -4.564,12.512 l -1,0 c -0.039,-14.058 -6.361,-15.552 -18,-19 7.003,-6.759 12.896,-5.634 13,-18 l -5,-1 c 1.515,-6.349 -2.328,-8.461 -7,-12.2 -13.444,-10.76 -20.833,-5.938 -36,-1.8 1.216,-5.303 10.331,-14.962 1.978,-18.214 -8.992,-3.5 -14.48,15.03 -19.397,19.245 -12.527,10.737 -39.528,19.173 -29.738,41.969 2.256,5.251 7.628,8.005 10.157,13 l -14,2 2,8 17,-10 1,1 -2,5 c 6.86,2.018 9.941,5.484 17,2 l -1,5 35,13 -17,-14 c 10.764,4.08 18.773,14.392 30,17.433 7.449,2.018 10.851,-4.71 7,-10.433 2.921,-5.846 -0.958,-11.131 -2,-17 l 5,-2 c 12.807,16.076 30.348,22.607 37,44 l -8,-11 -1,0 3,21 -4,-2 2,11 -4,-2 0,8 -1,0 -3,-3 -3,16 -1,0 -2,-28 6,3 1,-1 -6,-28 3,1 c -4.124,-9.905 -9.171,-17.105 -19,-22 1.719,5.423 4.318,12.256 3.737,18 -0.558,5.515 -3.889,10.336 -3.104,16 5.042,36.352 -3.804,70.18 -9.337,106 -3.204,20.746 -7.584,46.892 -22.389,63 -10.983,11.948 -21.241,9 -35.907,9 -14.368,0 -28.701,0.826 -43,0.996 -9.004,0.107 -18.733,1.445 -25.791,-5.325 -10.703,-10.265 -11.365,-34.39 -13.209,-48.671 l -6,2 3,-6 -1,-1 -4,1 2,-4 -4,-2 c 10.758,-6.06 5.872,-12.082 0,-20 l 5,0 -7,-7 5,1 c 1.778,-11.174 -3.009,-24.094 -5.339,-35 -3.794,-17.755 -5.373,-38.062 -11.929,-55 -3.262,-8.43 -13.447,-13.698 -14.732,-22 3.267,2.557 6.448,6.926 10.715,7.792 10.344,2.098 17.856,-15.874 27.285,-17.792 l -4,7 3,-1 c -4.284,13.728 -0.505,48.136 11,58 1.83,-14.403 13.252,-47.552 0,-57 l 3,-11 -12,4 0,-1 c 9.395,-4.395 21.382,-4.23 30,-9.089 29.29,-16.512 -8.211,-43.176 -19.606,-56.197 -3.301,-3.772 -4.298,-9.229 -6.394,-13.714 3.095,0.231 7.862,3.562 10.586,2.663 4.855,-1.603 6.08,-6.106 12.414,-6.573 10.306,-0.76 20.744,2.367 31,0.581 12.074,-2.101 23.947,-9.212 33,3.329 l 1,0 6,-8 -5,0 c 0.361,-7.57 -5.294,-13.578 -13,-14.631 -8.26,-1.129 -15.823,4.604 -24,4.6 -7.875,-0.003 -12.585,-6.636 -20,-7.755 -7.889,-1.19 -14.844,4.349 -22,6.786 6.045,-7.472 17.29,-12.544 27,-9.437 4.673,1.496 8.019,6.153 13,6.844 7.068,0.981 14.797,-4.818 22,-5.407 -5.357,-9.504 -16.186,-6.702 -25,-6 l 1,-3 -12,1 -2,-11 14,-6 -2,8 8,-4 c 0.201,17.03 15.531,2.556 22,-2 l 0,6 13,-3 12,10 -28,3 c 2.071,6.623 8.76,5.91 14,8.818 10.845,6.018 22.287,19.855 35,15.182 l -22,-14 c 8.955,-2.572 28.466,8.679 28.899,-9 0.051,-2.072 -0.431,-4.149 -1.356,-6 -2.59,-5.185 -7.349,-8.083 -8.543,-14 6.427,3.717 11.598,9.366 12.659,17 0.652,4.69 -2.24,8.225 1.341,12 l -1,7 -5,5 16.015,0.298 15.985,7.702 -1,4 c 12.432,-2.309 11.264,-7.379 -1,-10 l 0,-4 -15,-4 12,-17 -8,4 0,-3 -4,1 2,-10 c -3.228,-0.692 -3.02,-2.101 -2,-5 l -6,0 1,-4 -10,0 5,-8 -6,-1 1,-3 -1,-1 -14,-0.481 -15,8.481 c 6.671,-10.725 16.999,-15.137 17,-28 -4.652,0.358 -13.348,2.461 -17.566,-0.113 -5.767,-3.52 -2.434,-25.706998 -2.434,-31.886998 -8.701,6.72 -17.549,22.939 -17,33.999998 l 9,-9 c -2.702,8.307 -1.856,21.834 -6.742,28.826 -10.416,14.907 -22.246,8.081 -22.258,-7.826 l 1,0 1,5 4,-2 2,5 4,-23 1,0 2,4 c 3.04,-7.895 4.045,-15.846998 -3,-21.999998 l 0,7 -9,-6 0,5 -9,-6 4,18.999998 -12,-9.999998 -1,7.999998 -9,-4 4,8 -27,-10.999998 13,14.999998 -16,-5 3,4 0,1 -14,1 2,7 -14,0.236 -12,9.215 -10.715,4.392 -15.285,17.157 3,0 0,1 0,1 -7,4 c 0.397,4.632 -1.859,6.375 -6,8 l 1,4 -7,3 0,2 3,1 0,2 c -3.61,2.579 -15.288,8.272 -11,13 -6.063,4.494 -11.166,10.289 -19,11 l 0,2 11,-1 0,1 -10,8 c 7.394,0.061 29.355,8.52 32,0 l -9,-3 0,-1 c 5.877,1.011 10.392,4.372 14,-2 l 1,0 c 3.707,12.617 20.008,13.517 31,17 l 0,1 -31,-8 c 0.721,6.402 9.521,6.613 14,10 -5.827,1.598 -11.814,-4.179 -16.682,-2.502 -3.775,1.301 -1.79,6.656 0.83,7.938 4.061,1.987 8.895,0.675 11.852,4.564 -9.226,-0.397 -18.73,-4.131 -28,-3.44 -4.565,0.341 -9.36,3.024 -14,3.9 -2.94,0.554 -12.636004,0.922 -13.369004,4.62 -0.775,3.912 8.370004,2.92 10.369004,2.92 12.122,0.001 24.983,1.283 37,0 l 1,1 0,2 -1,1 c -11.561,-2.146 -18.333,0.041 -27,8 l 5,-2 -1,4 30,-4 0,2 c -12.567,-0.732 -33.699,1.863 -40,14 l 4,-1 0,1 c -9.819,6.061 -25.237004,14.023 -32.181004,23.3 -6.779,9.057 -10.526,27.68 -12.819,38.7 l -1,0 3,-19 -1,0 -10,16 c -2.498,-14.774 1.035,-40.26 13,-50 l -5,16 c 8.067,-7.132 18.773,-17.017 23,-27 l -11,2 0,-1 c 9.503,-3.296 16.024,-4.253 21.000004,-14 l -10.000004,7 c 2.699,-7.018 6.952,-14.558 15.000004,-15 l 0,-1 -10.000004,1 -1,-3 -8,8 8,-4 -16,22 0,1 -11,5 0,-1 12,-18 -7,3 5,-13 -23,6 0,-1 17.301,-7.563 6.699,-15.437 -5,1 1,-4 -15,1 5,-9 -9,3 5,-16 -5,1 12,-22 -10,2 11,-17 -12,2 12,-22 -3,0 0,-1 7,-10 -5,0 7,-12 -6,0 8,-11 -5,-1 0,-1 c 8.407,-4.414 19.444,-10.321 16,-20.999998 l 21.000004,-3 -5,-5 c 3.732,-7.998 8.908,-9.324 17,-9 l -1,3 7,2 -7,3 5,6 -7,0 19,11.999998 0,1 -34,-7.999998 c 10.46,14.683998 35.82,12.379998 51,19.999998 l 0,1 c -4.524,-0.013 -9.571,-1.434 -14,-0.641 -4.959,0.887 -8.667,5.02 -13,7.314 -9.424,4.989 -19.374,5.948 -25,16.327 l 10,-3 -24.000004,19 11.000004,-3 -9.000004,13 12.000004,-7 -34.000004,37 7,-3 -14,24 1,1 17,-6 -12,14 c 12.488,0 18.897,-8.944 26,-19 l -5,1 11.000004,-15 -5.000004,0 19.000004,-17 -28.000004,16 c 4.527,-10.562 16.950004,-17.117 26.000004,-23.611 3.202,-2.298 10.865,-5.128 7,-9.389 l 12,-9 -4,0 0,-1 6,-6 -20,7 0,-1 27,-14 -1,-2 16,-5 -2,-4 18,0 -1,-4 7,0 -3,-5 10,-1 0,-2 -7,-3 4,-5 -21,-8.999998 0,-1 19,4 0,-1 -16,-8 0,-1 12,4 -12,-11 -13,6 -1,-1 c 7.934,-12.252 20.873,-3.833 31,-2 l -7,-8 c 28.505,-0.019 57.217,-3.954 86,-4 7.973,-0.013 27.035,3.256 33.682,-1.179 4.91,-3.276 3.182,-18.329 4.636,-23.767 0.867,-3.241 4.144,-5.136 5.682,-8.054 -2.728,0.016 -4.525,-2.863 -8,-3 -49.181,-1.94 -104.881,-3.021 -151,15 l -1,-1 c 6.345,-9.899 25.583,-9.786 36,-12.373 40.292,-10.009 82.797,0.837 123,-6.627 l 0,-4" + id="path3358" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ee67f691d3b59288976f7afccf5d6be013a87d8e Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Wed, 14 Oct 2020 18:44:03 +0200 Subject: [PATCH 029/448] =?UTF-8?q?Aufr=C3=A4umen=20+=20Login=20Handler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/icons/favicon-16x16.png | Bin 555 -> 0 bytes public/icons/favicon-96x96.png | Bin 3295 -> 0 bytes quasar.conf.js | 8 +- src/{boot => assets}/.gitkeep | 0 src/assets/quasar-logo-full.svg | 191 ------------------------ src/boot/login.ts | 20 +++ src/components/CompositionComponent.vue | 59 -------- src/components/models.ts | 8 - src/index.template.html | 38 ++--- src/layouts/MainLayout.vue | 50 ++++--- src/pages/Index.vue | 49 ------ 11 files changed, 72 insertions(+), 351 deletions(-) delete mode 100644 public/icons/favicon-16x16.png delete mode 100644 public/icons/favicon-96x96.png rename src/{boot => assets}/.gitkeep (100%) delete mode 100644 src/assets/quasar-logo-full.svg create mode 100644 src/boot/login.ts delete mode 100644 src/components/CompositionComponent.vue delete mode 100644 src/components/models.ts delete mode 100644 src/pages/Index.vue diff --git a/public/icons/favicon-16x16.png b/public/icons/favicon-16x16.png deleted file mode 100644 index 436be167f98f402a129b26fdcdc21fc8bdcbd271..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 555 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 MU&k2H1b2x4KP_%wSO5S3 diff --git a/quasar.conf.js b/quasar.conf.js index 73977b8..91adc15 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -9,7 +9,7 @@ /* eslint-disable @typescript-eslint/no-var-requires */ const { configure } = require('quasar/wrappers'); -module.exports = configure(function(ctx) { +module.exports = configure(function (ctx) { return { // https://quasar.dev/quasar-cli/supporting-ts supportTS: { @@ -24,7 +24,7 @@ module.exports = configure(function(ctx) { // app boot file (/src/boot) // --> boot files are part of "main.js" // https://quasar.dev/quasar-cli/boot-files - boot: ['composition-api', 'axios', 'plugins'], + boot: ['composition-api', 'axios', 'login', 'plugins'], // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css css: ['app.scss'], @@ -64,7 +64,7 @@ module.exports = configure(function(ctx) { // extractCSS: false, // https://quasar.dev/quasar-cli/handling-webpack - extendWebpack(cfg) { + extendWebpack (cfg) { // linting is slow in TS projects, we execute it only for production builds if (ctx.prod) { cfg.module.rules.push({ @@ -191,7 +191,7 @@ module.exports = configure(function(ctx) { // More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration nodeIntegration: true, - extendWebpack(/* cfg */) { + extendWebpack (/* cfg */) { // do something with Electron main process Webpack cfg // chainWebpack also available besides this extendWebpack } diff --git a/src/boot/.gitkeep b/src/assets/.gitkeep similarity index 100% rename from src/boot/.gitkeep rename to src/assets/.gitkeep diff --git a/src/assets/quasar-logo-full.svg b/src/assets/quasar-logo-full.svg deleted file mode 100644 index 281d072..0000000 --- a/src/assets/quasar-logo-full.svg +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/boot/login.ts b/src/boot/login.ts new file mode 100644 index 0000000..bcc9d7a --- /dev/null +++ b/src/boot/login.ts @@ -0,0 +1,20 @@ +import { boot } from 'quasar/wrappers'; + +export default boot(({ Vue, router, store }) => { + router.beforeEach((to, from, next) => { + if (to.matched.some(record => record.meta.requiresAuth)) { + // this route requires auth, check if logged in + // if not, redirect to login page. + if (!store.getters.isLoggedIn()) { + next({ + path: '/login', + query: { redirect: to.fullPath } + }) + } else { + next() + } + } else { + next() // make sure to always call next()! + } + }) +}); diff --git a/src/components/CompositionComponent.vue b/src/components/CompositionComponent.vue deleted file mode 100644 index 22b4bd7..0000000 --- a/src/components/CompositionComponent.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - diff --git a/src/components/models.ts b/src/components/models.ts deleted file mode 100644 index 6945920..0000000 --- a/src/components/models.ts +++ /dev/null @@ -1,8 +0,0 @@ -export interface Todo { - id: number; - content: string; -} - -export interface Meta { - totalCount: number; -} diff --git a/src/index.template.html b/src/index.template.html index 8157cbf..7eb371e 100644 --- a/src/index.template.html +++ b/src/index.template.html @@ -1,22 +1,24 @@ - - <%= productName %> - - - - - + + <%= productName %> - - - - - - - - -
- - + + + + + + + + + + + + + +
+ + + \ No newline at end of file diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index e5d2370..fc5e5e6 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -1,6 +1,9 @@ diff --git a/src/plugins/user/plugin.ts b/src/plugins/user/plugin.ts index 3bef5f6..ebfb36f 100644 --- a/src/plugins/user/plugin.ts +++ b/src/plugins/user/plugin.ts @@ -1,4 +1,7 @@ import { Plugin, PluginMainLink } from 'boot/plugins'; +import { Module } from 'vuex'; +import userStore from './store/user'; +import sessionsStore from './store/session'; import routes from './routes'; const mainLink: PluginMainLink = { @@ -6,7 +9,14 @@ const mainLink: PluginMainLink = { title: 'User', link: 'user', icon: 'mdi-account', - children: [] + children: [ + { + name: 'user', + title: 'Einstellungen', + link: 'user-settings', + icon: 'mdi-cog' + } + ] }; const plugin: Plugin = { @@ -16,7 +26,11 @@ const plugin: Plugin = { requiredModules: [], shortcutsOut: [], shortcuts: [], - version: '0.0.1' + version: '0.0.1', + store: new Map>([ + ['user', userStore], + ['sessions', sessionsStore] + ]) }; export { mainLink }; diff --git a/src/plugins/user/routes/index.ts b/src/plugins/user/routes/index.ts index e176de9..50a73f9 100644 --- a/src/plugins/user/routes/index.ts +++ b/src/plugins/user/routes/index.ts @@ -8,7 +8,14 @@ const routes: RouteConfig[] = [ { path: 'user', name: 'user', - component: () => import('../pages/User.vue') + component: () => import('../pages/User.vue'), + children: [ + { + path: 'settings', + name: 'user-settings', + component: () => import('../pages/Settings.vue') + } + ] } ] } diff --git a/src/plugins/user/store/session.ts b/src/plugins/user/store/session.ts new file mode 100644 index 0000000..8a6112c --- /dev/null +++ b/src/plugins/user/store/session.ts @@ -0,0 +1,68 @@ +import { Module, MutationTree, ActionTree, GetterTree } from 'vuex'; +import { StateInterface } from 'src/store'; +import { axios } from 'boot/axios'; +import { LoginData } from 'src/plugins/user/models'; +import { AxiosResponse } from 'axios'; +import { LocalStorage } from 'quasar'; +import { Router } from 'src/router'; + +export interface SessionInterface { + sessions: Session[]; + loading: boolean; +} +export interface Session { + browser: string; + expires: string; + lifetime: number; + platform: string; + token: string; +} +const state: SessionInterface = { + sessions: [], + loading: false +}; + +const mutations: MutationTree = { + setSessions(state, sessions: Session[]) { + state.sessions = sessions; + }, + setLoading(state, value) { + state.loading = value; + } +}; + +const actions: ActionTree = { + getSessions({ commit, rootGetters }) { + console.log(rootGetters); + commit('setLoading', true); + axios + .get('http://localhost:5000/auth', { + headers: { Token: rootGetters['user/token'].token } + }) + .then(response => { + commit('setSessions', response.data); + }) + .catch(error => { + console.exception(error); + }) + .finally(() => { + commit('setLoading', false); + }); + } +}; + +const getters: GetterTree = { + sessions(state) { + return state.sessions; + } +}; + +const sessions: Module = { + namespaced: true, + state, + mutations, + actions, + getters +}; + +export default sessions; diff --git a/src/plugins/user/store/user.ts b/src/plugins/user/store/user.ts index 54a0839..5762565 100644 --- a/src/plugins/user/store/user.ts +++ b/src/plugins/user/store/user.ts @@ -1,7 +1,10 @@ -import { Module, MutationTree, ActionTree, Commit } from 'vuex'; +import { Module, MutationTree, ActionTree, GetterTree } from 'vuex'; import { StateInterface } from 'src/store'; import { axios } from 'boot/axios'; -import { LoginData } from 'src/plugins/user/models' +import { LoginData } from 'src/plugins/user/models'; +import { AxiosResponse } from 'axios'; +import { LocalStorage } from 'quasar'; +import { Router } from 'src/router'; export interface Token { browser: string; @@ -19,7 +22,11 @@ export interface User { roles: string[]; } -export interface UserStateInterface { +export interface UserStateInterface extends LoginResponse { + loginLoading: boolean; +} + +export interface LoginResponse { permissions: string[]; token: Token; user: User; @@ -36,17 +43,84 @@ const state: UserStateInterface = { mail: '', roles: [] }, - userid: '' + userid: '', + loginLoading: false }; -const mutation: MutationTree = { - setState(state: UserStateInterface, data: UserStateInterface) { - state = data; +const mutations: MutationTree = { + setPermissions(state, data: []) { + state.permissions = data; + }, + setToken(state, data: Token) { + state.token = data; + }, + setUser(state, data: User) { + state.user = data; + }, + setUserId(state, data: string) { + state.userid = data; + }, + setLoginLoading(state, data: boolean) { + state.loginLoading = data; + }, + showState(state) { + console.log(state); } }; const actions: ActionTree = { - async = login({ commit: Commit }, data: LoginData) { - axios + login({ commit }, data: LoginData) { + console.log('bla'); + commit('setLoginLoading', true); + void axios + .post('http://localhost:5000/auth', data) + .then((response: AxiosResponse) => { + commit('setPermissions', response.data.permissions); + console.log('saved permisisons'); + commit('setToken', response.data.token); + commit('setUser', response.data.user); + commit('setUserId', response.data.userid); + commit('showState'); + //LocalStorage.set('permissions', response.data.permissions); + //LocalStorage.set('token', response.data.token); + //LocalStorage.set('user', response.data.user); + //LocalStorage.set('userid', response.data.userid); + + void Router.push({ name: 'user' }); + }) + .catch(error => { + console.exception(error); + }) + .finally(() => { + commit('setLoginLoading', false); + }); } }; + +const getters: GetterTree = { + permissions({ permissions }) { + return permissions; + }, + token({ token }) { + return token; + }, + user({ user }) { + return user; + }, + userid({ userid }) { + return userid; + }, + loginLoading({ loginLoading }) { + return loginLoading; + } +}; + +const userStore: Module = { + namespaced: true, + actions, + getters, + mutations, + state +}; + +export default userStore; diff --git a/src/router/index.ts b/src/router/index.ts index b6d4373..b70714d 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -8,20 +8,19 @@ import routes from './routes'; * If not building with SSR mode, you can * directly export the Router instantiation */ +export const Router: VueRouter = new VueRouter({ + scrollBehavior: () => ({ x: 0, y: 0 }), + routes, -export default route>(function ({ Vue }) { + // Leave these as is and change from quasar.conf.js instead! + // quasar.conf.js -> build -> vueRouterMode + // quasar.conf.js -> build -> publicPath + mode: process.env.VUE_ROUTER_MODE, + base: process.env.VUE_ROUTER_BASE +}); + +export default route>(function({ Vue }) { Vue.use(VueRouter); - const Router = new VueRouter({ - scrollBehavior: () => ({ x: 0, y: 0 }), - routes, - - // Leave these as is and change from quasar.conf.js instead! - // quasar.conf.js -> build -> vueRouterMode - // quasar.conf.js -> build -> publicPath - mode: process.env.VUE_ROUTER_MODE, - base: process.env.VUE_ROUTER_BASE - }); - return Router; -}) +}); From 2411fc86cd22911f02a0d8336e3d8b5200ce03f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Fri, 16 Oct 2020 13:07:31 +0200 Subject: [PATCH 036/448] =?UTF-8?q?L=C3=B6schen=20und=20Anzeigen=20von=20S?= =?UTF-8?q?essions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quasar.conf.js | 8 +-- src/boot/axios.ts | 6 +- src/boot/login.ts | 22 ++++--- src/plugins/user/pages/Settings.vue | 94 +++++++++++++++++++++++++---- src/plugins/user/store/session.ts | 17 ++++++ src/plugins/user/store/user.ts | 8 +-- 6 files changed, 127 insertions(+), 28 deletions(-) diff --git a/quasar.conf.js b/quasar.conf.js index 91adc15..e6f0708 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -9,7 +9,7 @@ /* eslint-disable @typescript-eslint/no-var-requires */ const { configure } = require('quasar/wrappers'); -module.exports = configure(function (ctx) { +module.exports = configure(function(ctx) { return { // https://quasar.dev/quasar-cli/supporting-ts supportTS: { @@ -64,7 +64,7 @@ module.exports = configure(function (ctx) { // extractCSS: false, // https://quasar.dev/quasar-cli/handling-webpack - extendWebpack (cfg) { + extendWebpack(cfg) { // linting is slow in TS projects, we execute it only for production builds if (ctx.prod) { cfg.module.rules.push({ @@ -103,7 +103,7 @@ module.exports = configure(function (ctx) { // directives: [], // Quasar plugins - plugins: [] + plugins: ['LocalStorage'] }, // animations: 'all', // --- includes all animations @@ -191,7 +191,7 @@ module.exports = configure(function (ctx) { // More info: https://quasar.dev/quasar-cli/developing-electron-apps/node-integration nodeIntegration: true, - extendWebpack (/* cfg */) { + extendWebpack(/* cfg */) { // do something with Electron main process Webpack cfg // chainWebpack also available besides this extendWebpack } diff --git a/src/boot/axios.ts b/src/boot/axios.ts index 4bc0f14..2ade8ff 100644 --- a/src/boot/axios.ts +++ b/src/boot/axios.ts @@ -1,6 +1,6 @@ import axios, { AxiosInstance } from 'axios'; import { boot } from 'quasar/wrappers'; -import { StateInterface } from '../store'; +import { Token, UserStateInterface } from 'src/plugins/user/store/user'; import config from '../config'; declare module 'vue/types/vue' { @@ -15,8 +15,10 @@ export default boot(({ Vue, store }) => { axios.defaults.baseURL = config.baseURL; axios.interceptors.request.use(config => { - const token = (store.state).user.token; + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access + const token: Token = (store.state.user).token; if (token) { + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access config.headers['Authorization'] = 'Token ' + token.token; } return config; diff --git a/src/boot/login.ts b/src/boot/login.ts index ad88e4e..b2c8b0f 100644 --- a/src/boot/login.ts +++ b/src/boot/login.ts @@ -1,19 +1,27 @@ import { boot } from 'quasar/wrappers'; -import { StateInterface } from '../store'; +import { UserStateInterface } from 'src/plugins/user/store/user'; +import { RouteRecord } from 'vue-router'; -export default boot(({ Vue, router, store }) => { +export default boot(({ router, store }) => { router.beforeEach((to, from, next) => { - let user = (store.state).user; + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/ban-ts-comment + // @ts-ignore + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access + const user: UserStateInterface = (store.state).user; console.log('login_boot', user); if ( - to.matched.some(record => { + to.matched.some((record: RouteRecord) => { // permissions is set AND has NO matching permission return ( + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access record.meta.permissions !== undefined && !( - record.meta.permissions.filter((value: string) => - user.permissions.includes(value) - ).length > 0 + // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access + ( + record.meta.permissions.filter((value: string) => + user.permissions.includes(value) + ).length > 0 + ) ) ); }) diff --git a/src/plugins/user/pages/Settings.vue b/src/plugins/user/pages/Settings.vue index 4946dcb..0146030 100644 --- a/src/plugins/user/pages/Settings.vue +++ b/src/plugins/user/pages/Settings.vue @@ -4,18 +4,55 @@
Deine Sessions:
- +
@@ -24,19 +61,54 @@ diff --git a/src/plugins/user/store/session.ts b/src/plugins/user/store/session.ts index 8a6112c..8cd8e05 100644 --- a/src/plugins/user/store/session.ts +++ b/src/plugins/user/store/session.ts @@ -40,6 +40,7 @@ const actions: ActionTree = { headers: { Token: rootGetters['user/token'].token } }) .then(response => { + console.log(response.data); commit('setSessions', response.data); }) .catch(error => { @@ -48,6 +49,22 @@ const actions: ActionTree = { .finally(() => { commit('setLoading', false); }); + }, + deleteSession({ commit, dispatch, rootGetters }, token) { + commit('setLoading', true); + axios + .delete(`http://localhost:5000/auth/${token}`, { + headers: { Token: rootGetters['user/token'].token } + }) + .then(() => { + void dispatch('getSessions'); + }) + .catch(error => { + console.exception(); + }) + .finally(() => { + commit('setLoading', false); + }); } }; diff --git a/src/plugins/user/store/user.ts b/src/plugins/user/store/user.ts index 5762565..a721d6b 100644 --- a/src/plugins/user/store/user.ts +++ b/src/plugins/user/store/user.ts @@ -81,10 +81,10 @@ const actions: ActionTree = { commit('setUser', response.data.user); commit('setUserId', response.data.userid); commit('showState'); - //LocalStorage.set('permissions', response.data.permissions); - //LocalStorage.set('token', response.data.token); - //LocalStorage.set('user', response.data.user); - //LocalStorage.set('userid', response.data.userid); + LocalStorage.set('permissions', response.data.permissions); + LocalStorage.set('token', response.data.token); + LocalStorage.set('user', response.data.user); + LocalStorage.set('userid', response.data.userid); void Router.push({ name: 'user' }); }) From 704f6fd3fee1b90941314b166cbd48c8c510de0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Fri, 16 Oct 2020 13:54:01 +0200 Subject: [PATCH 037/448] =?UTF-8?q?Loading=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Circular Progress kann nun mit Logo verwendet werden. Beim Anmelden wird der Bildschirm beim Laden gesperrt. --- quasar.conf.js | 2 +- src/components/loading/CircularProgress.vue | 23 +++++++++++++++++++++ src/plugins/user/pages/Settings.vue | 14 ++++++++++--- src/plugins/user/store/session.ts | 5 ++++- src/plugins/user/store/user.ts | 4 +++- 5 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 src/components/loading/CircularProgress.vue diff --git a/quasar.conf.js b/quasar.conf.js index e6f0708..f503dd4 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -103,7 +103,7 @@ module.exports = configure(function(ctx) { // directives: [], // Quasar plugins - plugins: ['LocalStorage'] + plugins: ['LocalStorage', 'Loading'] }, // animations: 'all', // --- includes all animations diff --git a/src/components/loading/CircularProgress.vue b/src/components/loading/CircularProgress.vue new file mode 100644 index 0000000..b59b9d9 --- /dev/null +++ b/src/components/loading/CircularProgress.vue @@ -0,0 +1,23 @@ + + + diff --git a/src/plugins/user/pages/Settings.vue b/src/plugins/user/pages/Settings.vue index 0146030..e0f0bf9 100644 --- a/src/plugins/user/pages/Settings.vue +++ b/src/plugins/user/pages/Settings.vue @@ -7,6 +7,8 @@
+ +
tada:: {{ sessionsLoading }}
import { computed, defineComponent, onBeforeMount } from '@vue/composition-api'; -import { mainLink } from '../plugin'; -import { platform } from 'os'; +import CircularProgress from 'components/loading/CircularProgress.vue'; export default defineComponent({ // name: 'PageName' + components: { CircularProgress }, setup(_, { root }) { onBeforeMount(() => { root.$store.dispatch('sessions/getSessions'); @@ -101,13 +103,19 @@ export default defineComponent({ function isThisSession(token: string) { return root.$store.getters['user/token'].token == token; } + + const sessionsLoading = computed(() => { + return root.$store.getters['sessions/loading']; + }); + return { showRootGetters, sessions, getBrowserIcon, getPlatformIcon, isThisSession, - deleteSession + deleteSession, + sessionsLoading }; } }); diff --git a/src/plugins/user/store/session.ts b/src/plugins/user/store/session.ts index 8cd8e05..da47218 100644 --- a/src/plugins/user/store/session.ts +++ b/src/plugins/user/store/session.ts @@ -26,7 +26,7 @@ const mutations: MutationTree = { setSessions(state, sessions: Session[]) { state.sessions = sessions; }, - setLoading(state, value) { + setLoading(state, value: boolean) { state.loading = value; } }; @@ -71,6 +71,9 @@ const actions: ActionTree = { const getters: GetterTree = { sessions(state) { return state.sessions; + }, + loading(state) { + return state.loading; } }; diff --git a/src/plugins/user/store/user.ts b/src/plugins/user/store/user.ts index a721d6b..1f6cdc2 100644 --- a/src/plugins/user/store/user.ts +++ b/src/plugins/user/store/user.ts @@ -3,7 +3,7 @@ import { StateInterface } from 'src/store'; import { axios } from 'boot/axios'; import { LoginData } from 'src/plugins/user/models'; import { AxiosResponse } from 'axios'; -import { LocalStorage } from 'quasar'; +import { LocalStorage, Loading } from 'quasar'; import { Router } from 'src/router'; export interface Token { @@ -72,6 +72,7 @@ const actions: ActionTree = { login({ commit }, data: LoginData) { console.log('bla'); commit('setLoginLoading', true); + Loading.show({ message: 'Du wirst eingeloggt' }); void axios .post('http://localhost:5000/auth', data) .then((response: AxiosResponse) => { @@ -93,6 +94,7 @@ const actions: ActionTree = { }) .finally(() => { commit('setLoginLoading', false); + Loading.hide(); }); } }; From 0cdfe7f11c1e1b745056ad4c7e9ca5cbd2bbeee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Fri, 16 Oct 2020 22:37:37 +0200 Subject: [PATCH 038/448] =?UTF-8?q?L=C3=A4dt=20UserStore=20aus=20LocalStor?= =?UTF-8?q?age?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sollte die seite neu geladen werden, wird aus dem LocalStorage der UserStorage geladen. Somit bleibt man angemeldet. Axios angepasst, sodass nur noch die url eingegeben werden muss. --- src/boot/axios.ts | 7 ++--- src/boot/login.ts | 10 ++++--- src/plugins/user/pages/Settings.vue | 6 +++-- src/plugins/user/store/session.ts | 9 +++---- src/plugins/user/store/user.ts | 42 +++++++++++++++++++++-------- 5 files changed, 49 insertions(+), 25 deletions(-) diff --git a/src/boot/axios.ts b/src/boot/axios.ts index 2ade8ff..2413f20 100644 --- a/src/boot/axios.ts +++ b/src/boot/axios.ts @@ -15,11 +15,12 @@ export default boot(({ Vue, store }) => { axios.defaults.baseURL = config.baseURL; axios.interceptors.request.use(config => { - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - const token: Token = (store.state.user).token; + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment + const token: Token = store.getters['user/token']; if (token) { // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - config.headers['Authorization'] = 'Token ' + token.token; + config.headers['Token'] = token.token; + //config.headers['Authorization'] = 'Token ' + token.token; } return config; }); diff --git a/src/boot/login.ts b/src/boot/login.ts index b2c8b0f..07103eb 100644 --- a/src/boot/login.ts +++ b/src/boot/login.ts @@ -4,11 +4,15 @@ import { RouteRecord } from 'vue-router'; export default boot(({ router, store }) => { router.beforeEach((to, from, next) => { + // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access + store.dispatch('user/loadFromLocalStorage'); // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/ban-ts-comment // @ts-ignore // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access - const user: UserStateInterface = (store.state).user; - console.log('login_boot', user); + //const user: UserStateInterface = (store.state).user; + //const user: UserStateInterface = store.getters['user/user']; + const permissions: [] = store.getters['user/permissions']; + console.log('login_boot', permissions); if ( to.matched.some((record: RouteRecord) => { // permissions is set AND has NO matching permission @@ -19,7 +23,7 @@ export default boot(({ router, store }) => { // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access ( record.meta.permissions.filter((value: string) => - user.permissions.includes(value) + permissions.includes(value) ).length > 0 ) ) diff --git a/src/plugins/user/pages/Settings.vue b/src/plugins/user/pages/Settings.vue index e0f0bf9..ec49b8f 100644 --- a/src/plugins/user/pages/Settings.vue +++ b/src/plugins/user/pages/Settings.vue @@ -1,6 +1,9 @@ @@ -53,7 +74,7 @@ export default defineComponent({ name: 'Main', setup(_, { root: { $store } }) { const user = computed(() => { - return $store.getters['user/session'].user; + return $store.getters['user/user']; }); return { user }; } diff --git a/src/plugins/user/store/session.ts b/src/plugins/user/store/session.ts index 98a6489..2333548 100644 --- a/src/plugins/user/store/session.ts +++ b/src/plugins/user/store/session.ts @@ -2,9 +2,8 @@ import { Module, MutationTree, ActionTree, GetterTree } from 'vuex'; import { StateInterface } from 'src/store'; import { axios } from 'src/boot/axios'; - export interface SessionInterface { - sessions: Session[]; + sessions: FG.Session[]; loading: boolean; } @@ -14,16 +13,16 @@ const state: SessionInterface = { }; const mutations: MutationTree = { - setSessions (state, sessions: Session[]) { + setSessions(state, sessions: FG.Session[]) { state.sessions = sessions; }, - setLoading (state, value: boolean) { + setLoading(state, value: boolean) { state.loading = value; } }; const actions: ActionTree = { - getSessions ({ commit, rootGetters }) { + getSessions({ commit, rootGetters }) { console.log(rootGetters); commit('setLoading', true); axios @@ -39,7 +38,7 @@ const actions: ActionTree = { commit('setLoading', false); }); }, - deleteSession ({ commit, dispatch }, token: string) { + deleteSession({ commit, dispatch }, token: string) { commit('setLoading', true); console.log('axios', axios); axios @@ -57,10 +56,10 @@ const actions: ActionTree = { }; const getters: GetterTree = { - sessions (state) { + sessions(state) { return state.sessions; }, - loading (state) { + loading(state) { return state.loading; } }; From 925982d700e063da595a698ca0a2b429b0a9c24f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Tue, 27 Oct 2020 13:49:45 +0100 Subject: [PATCH 048/448] User kann eigene Einstellungen updaten --- src/plugins/user/components/settings/Main.vue | 81 ++++++++++++++++--- src/plugins/user/store/user.ts | 66 +++++++++------ 2 files changed, 112 insertions(+), 35 deletions(-) diff --git a/src/plugins/user/components/settings/Main.vue b/src/plugins/user/components/settings/Main.vue index bfd5521..8ebefc1 100644 --- a/src/plugins/user/components/settings/Main.vue +++ b/src/plugins/user/components/settings/Main.vue @@ -4,15 +4,13 @@ + + + + diff --git a/src/plugins/user/store/user.ts b/src/plugins/user/store/user.ts index c6f6b43..977d790 100644 --- a/src/plugins/user/store/user.ts +++ b/src/plugins/user/store/user.ts @@ -35,22 +35,22 @@ const state: UserStateInterface = { }; const mutations: MutationTree = { - setUser (state, data: FG.User) { + setUser(state, data: FG.User) { state.user = data; }, - setSession (state, data: FG.Session) { + setSession(state, data: FG.Session) { state.session = data; }, - setLoginLoading (state, data: boolean) { + setLoginLoading(state, data: boolean) { state.loginLoading = data; }, - showState (state) { + showState(state) { console.log(state); } }; const actions: ActionTree = { - login ({ commit }, data: LoginData) { + login({ commit }, data: LoginData) { commit('setLoginLoading', true); Loading.show({ message: 'Du wirst eingeloggt' }); void axios @@ -73,7 +73,7 @@ const actions: ActionTree = { Loading.hide(); }); }, - logout ({ commit }, token) { + logout({ commit }, token) { void axios.delete(`/auth/${token}`).then(() => { commit('setUser', { display_name: '', @@ -92,45 +92,61 @@ const actions: ActionTree = { }); }); }, - loadFromLocalStorage ({ commit }) { + updateUser({ commit, getters }, data) { + commit('setLoginLoading', true); + axios + .put(`/users/${getters.user.userid}`, data) + .catch(error => { + console.log(error); + }) + .finally(() => { + commit('setLoginLoading', false); + }); + }, + loadFromLocalStorage({ commit }) { console.log('load from store'); let data = LocalStorage.getItem('user'); - commit('setUser', data ? data : { - display_name: '', - firstname: '', - lastname: '', - mail: '', - roles: [], - userid: '' - }); + commit( + 'setUser', + data + ? data + : { + display_name: '', + firstname: '', + lastname: '', + mail: '', + roles: [], + userid: '' + } + ); data = LocalStorage.getItem('session'); commit( 'setSession', data ? data : { - browser: '', - expires: new Date(), - lifetime: -1, - platform: '', - token: '' - } + browser: '', + expires: new Date(), + lifetime: -1, + platform: '', + token: '' + } ); commit('showState'); } }; const getters: GetterTree = { - user ({ user }) { + user({ user }) { return user; }, - displayName ({ user }) { + displayName({ user }) { return user.display_name; }, - session ({ session }) { + session({ session }) { return session; }, - loginLoading ({ loginLoading }) { + loginLoading({ loginLoading }) { return loginLoading; } }; From 27d44b350fe8f735982d257420da712458706456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Wed, 28 Oct 2020 12:19:09 +0100 Subject: [PATCH 049/448] [User] Validation der Settingseingaben der User MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Es werden die Eingaben der User bei den Einstellungen kontrolliert. Es muss ein Passwort eingegeben werden, E-Mail muss eine E-Mail sein und die Felder dürfen nicht leer sein. Es wurde ein Reset Button hinzugefügt und gemachte Eingaben zurückzusetzen --- src/plugins/user/components/settings/Main.vue | 79 ++++++++++++++++--- 1 file changed, 70 insertions(+), 9 deletions(-) diff --git a/src/plugins/user/components/settings/Main.vue b/src/plugins/user/components/settings/Main.vue index 8ebefc1..f507a78 100644 --- a/src/plugins/user/components/settings/Main.vue +++ b/src/plugins/user/components/settings/Main.vue @@ -5,12 +5,16 @@ class="col-xs-12 col-sm-6 q-pa-sm" label="Vorname" v-model="firstname" + :rules="[notEmpty]" + ref="ref_firstname" filled /> + @@ -85,15 +96,15 @@ import { computed, defineComponent, ref } from '@vue/composition-api'; export default defineComponent({ name: 'Main', - setup(_, { root: { $store } }) { + setup(_, { root: { $store }, refs }) { const user = computed(() => { return $store.getters['user/user']; }); - const firstname = ref(user.value.firstname); - const lastname = ref(user.value.lastname); - const mail = ref(user.value.mail); - const display_name = ref(user.value.display_name); + const firstname = ref(user.value.firstname); + const lastname = ref(user.value.lastname); + const mail = ref(user.value.mail); + const display_name = ref(user.value.display_name); const password = ref(''); const new_password = ref(''); @@ -119,13 +130,60 @@ export default defineComponent({ new_password: new_password.value }); } - console.log(change_values); - $store.dispatch('user/updateUser', change_values); + if ( + Object.keys(refs).every(key => { + return refs[key].validate(); + }) + ) { + $store.dispatch('user/updateUser', change_values); + resetPassword(); + } } + + function reset() { + firstname.value = user.value.firstname; + lastname.value = user.value.lastname; + mail.value = user.value.mail; + display_name.value = user.value.display_name; + password.value = ''; + new_password.value = ''; + new_password2.value = ''; + setTimeout(() => { + Object.keys(refs).forEach(key => { + refs[key].resetValidation(); + }); + }, 500); + } + + function resetPassword() { + password.value = ''; + new_password.value = ''; + new_password2.value = ''; + console.log(refs); + console.log(refs.ref_password); + console.log(refs.ref_new_password); + setTimeout(() => { + refs.ref_password.resetValidation(); + refs.ref_new_password.resetValidation(); + }, 1000); + } + function samePassword(val) { return val == new_password.value || 'Passwörter sind nicht identisch!'; } + function notEmpty(val: string) { + return !!val || 'Feld darf nicht leer sein!'; + } + + function isEmail(val) { + return ( + !val || + /^\w+([.-]?\w+)*@\w+([.-]?\w+)*(\.\w\w+)+$/.test(val) || + 'E-Mail ist nicht valide.' + ); + } + return { user, firstname, @@ -136,7 +194,10 @@ export default defineComponent({ new_password, new_password2, samePassword, - save + isEmail, + notEmpty, + save, + reset }; } }); From 789cf89603e64b2c3adc7fc4b92868d8b107dd17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Wed, 28 Oct 2020 12:55:20 +0100 Subject: [PATCH 050/448] =?UTF-8?q?Ausloggen=20jetzt=20m=C3=B6glich,=20Neu?= =?UTF-8?q?er=20Loading=20Spinner=20in=20'Dark-Mode'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Beim ausloggen wird nun der localstorage geleert und ein delete an /auth/delete/ gesendet. --- .../loading/DarkCircularProgress.vue | 23 +++++++++ src/layouts/MainLayout.vue | 44 ++++++++--------- src/plugins/user/pages/User.vue | 10 +--- src/plugins/user/store/user.ts | 48 ++++++++++++------- 4 files changed, 77 insertions(+), 48 deletions(-) create mode 100644 src/components/loading/DarkCircularProgress.vue diff --git a/src/components/loading/DarkCircularProgress.vue b/src/components/loading/DarkCircularProgress.vue new file mode 100644 index 0000000..2be058e --- /dev/null +++ b/src/components/loading/DarkCircularProgress.vue @@ -0,0 +1,23 @@ + + + diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index e9b295b..1c4d88e 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -1,9 +1,6 @@ diff --git a/src/plugins/plugin-example/pages/NewPlugin.vue b/src/plugins/plugin-example/pages/NewPlugin.vue deleted file mode 100644 index b528993..0000000 --- a/src/plugins/plugin-example/pages/NewPlugin.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/plugins/plugin-example/pages/OldPlugin.vue b/src/plugins/plugin-example/pages/OldPlugin.vue deleted file mode 100644 index b025fee..0000000 --- a/src/plugins/plugin-example/pages/OldPlugin.vue +++ /dev/null @@ -1,16 +0,0 @@ - - - diff --git a/src/plugins/plugin-example/pages/Plugin.vue b/src/plugins/plugin-example/pages/Plugin.vue deleted file mode 100644 index c0fd5a6..0000000 --- a/src/plugins/plugin-example/pages/Plugin.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - diff --git a/src/plugins/plugin-example/plugin.ts b/src/plugins/plugin-example/plugin.ts deleted file mode 100644 index ff47cdd..0000000 --- a/src/plugins/plugin-example/plugin.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { Plugin, PluginMainLink, ShortCutLink } from 'boot/plugins'; -import routes from 'src/plugins/plugin-example/routes'; - -const mainLink: PluginMainLink = { - name: 'plugin1', - title: 'Plugin1', - link: 'plugin1', - icon: 'mdi-toy-brick', - children: [ - { - name: 'plugin1', - title: 'Neues Plugin1', - link: 'plugin1_1', - icon: 'mdi-information-outline' - }, - { - name: 'plugin1', - title: 'Altes Plugin1', - link: 'plugin1_2', - icon: 'mdi-information-variant' - } - ] -}; - -const plugin: Plugin = { - routes, - mainLink, - name: mainLink.name, - requiredModules: [], - shortcuts: [], - shortcutsOut: [], - version: '1.0.2' -}; - -export { mainLink }; - -export default plugin; diff --git a/src/plugins/plugin-example/routes/index.ts b/src/plugins/plugin-example/routes/index.ts deleted file mode 100644 index e9aa7f6..0000000 --- a/src/plugins/plugin-example/routes/index.ts +++ /dev/null @@ -1,37 +0,0 @@ -import { RouteConfig } from 'vue-router'; - -const routes: RouteConfig[] = [ - { - path: '/main', - components: { - default: () => import('layouts/MainLayout.vue') - }, - children: [ - { - path: 'plugin1', - name: 'plugin1', - meta: { permissions: ['user'] }, - components: { - default: () => import('../pages/Plugin.vue'), - 'plugin-nav': () => import('../components/navigation/PluginLinks.vue') - }, - children: [ - { - path: 'plugin1_1', - name: 'plugin1_1', - meta: { permissions: ['user'] }, - component: () => import('../pages/NewPlugin.vue') - }, - { - path: 'plugin1_2', - name: 'plugin1_2', - meta: { permissions: ['user'] }, - component: () => import('../pages/OldPlugin.vue') - } - ] - } - ] - } -]; - -export default routes; diff --git a/src/plugins/user-plugin/components/navigation/PluginLinks.vue b/src/plugins/user-plugin/components/navigation/PluginLinks.vue deleted file mode 100644 index 2fd0060..0000000 --- a/src/plugins/user-plugin/components/navigation/PluginLinks.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - diff --git a/src/plugins/user-plugin/pages/NewPlugin.vue b/src/plugins/user-plugin/pages/NewPlugin.vue deleted file mode 100644 index b528993..0000000 --- a/src/plugins/user-plugin/pages/NewPlugin.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/plugins/user-plugin/pages/OldPlugin.vue b/src/plugins/user-plugin/pages/OldPlugin.vue deleted file mode 100644 index b025fee..0000000 --- a/src/plugins/user-plugin/pages/OldPlugin.vue +++ /dev/null @@ -1,16 +0,0 @@ - - - diff --git a/src/plugins/user-plugin/pages/Plugin.vue b/src/plugins/user-plugin/pages/Plugin.vue deleted file mode 100644 index c0fd5a6..0000000 --- a/src/plugins/user-plugin/pages/Plugin.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - diff --git a/src/plugins/user-plugin/plugin.ts b/src/plugins/user-plugin/plugin.ts deleted file mode 100644 index 45e5641..0000000 --- a/src/plugins/user-plugin/plugin.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { Plugin, PluginMainLink, ShortCutLink } from 'boot/plugins'; -import routes from './routes'; - -const mainLink: PluginMainLink = { - name: 'user-plugin', - title: 'User', - link: 'user', - icon: 'mdi-account', - children: [ - { - name: 'user-plugin', - title: 'Erstes Plugin für User', - link: 'user-plugin1', - icon: 'mdi-account-plus' - }, - { - name: 'user-plugin', - title: 'Zweites Plugin für User', - link: 'user-plugin2', - icon: 'mdi-account-minus' - } - ] -}; - -const shortcuts: ShortCutLink[] = [ - { - link: 'user-plugin2', - icon: 'mdi-account-minus' - } -]; - -const plugin: Plugin = { - routes, - mainLink, - name: mainLink.name, - requiredModules: ['user'], - shortcuts, - shortcutsOut: [], - version: '0.1.0' -}; - -export { mainLink }; -export default plugin; diff --git a/src/plugins/user-plugin/routes/index.ts b/src/plugins/user-plugin/routes/index.ts deleted file mode 100644 index c0c2ee1..0000000 --- a/src/plugins/user-plugin/routes/index.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { RouteConfig } from 'vue-router'; - -const routes: RouteConfig[] = [ - { - path: '/main', - components: { - default: () => import('layouts/MainLayout.vue') - }, - children: [ - { - path: 'user', - name: 'user', - component: () => import('src/plugins/user/pages/User.vue'), - children: [ - { - path: 'user-plugin', - name: 'user-plugin1', - component: () => import('../pages/NewPlugin.vue') - }, - { - path: 'user-plugin2', - name: 'user-plugin2', - component: () => import('../pages/OldPlugin.vue') - } - ] - } - ] - } -]; - -export default routes; diff --git a/src/plugins/user/pages/MainPage.vue b/src/plugins/user/pages/MainPage.vue new file mode 100644 index 0000000..28a0a12 --- /dev/null +++ b/src/plugins/user/pages/MainPage.vue @@ -0,0 +1,39 @@ + + + diff --git a/src/plugins/user/pages/User.vue b/src/plugins/user/pages/User.vue index 1a4d8c3..d51d87e 100644 --- a/src/plugins/user/pages/User.vue +++ b/src/plugins/user/pages/User.vue @@ -1,10 +1,6 @@ diff --git a/src/plugins/user/plugin.ts b/src/plugins/user/plugin.ts index 77dc0ac..877d8c2 100644 --- a/src/plugins/user/plugin.ts +++ b/src/plugins/user/plugin.ts @@ -1,32 +1,14 @@ -import { Plugin, PluginMainLink } from 'boot/plugins'; import { Module } from 'vuex'; import userStore from './store/user'; import sessionsStore from './store/session'; import routes from './routes'; import { StateInterface } from 'src/store'; +import { FG_Plugin } from 'src/plugins'; -const mainLink: PluginMainLink = { - name: 'user', - title: 'loadFromStore("user/displayName")', - link: 'user', - icon: 'mdi-account', - children: [ - { - name: 'user', - title: 'Einstellungen', - link: 'user-settings', - icon: 'mdi-cog' - } - ] -}; - -const plugin: Plugin = { - routes, - mainLink, - name: mainLink.name, +const plugin: FG_Plugin.Plugin = { + name: 'User', + mainRoutes: routes, requiredModules: [], - shortcutsOut: [], - shortcuts: [], version: '0.0.1', store: new Map>([ ['user', userStore], @@ -34,6 +16,4 @@ const plugin: Plugin = { ]) }; -export { mainLink }; - export default plugin; diff --git a/src/plugins/user/routes/index.ts b/src/plugins/user/routes/index.ts index 12957ac..0638c86 100644 --- a/src/plugins/user/routes/index.ts +++ b/src/plugins/user/routes/index.ts @@ -1,26 +1,33 @@ -import { RouteConfig } from 'vue-router'; - -const routes: RouteConfig[] = [ +import { FG_Plugin } from 'src/plugins'; +const mainRoutes: FG_Plugin.PluginRouteConfig[] = [ { - path: '/main', - component: () => import('layouts/MainLayout.vue'), + title: 'loadFromStore("user/displayName")', + icon: 'mdi-account', + path: 'user', + name: 'user', + component: () => import('../pages/MainPage.vue'), + meta: { permission: 'user' }, children: [ { - path: 'user', - name: 'user', - component: () => import('../pages/User.vue'), + title: 'Hauptkanal', + icon: 'mdi-account-hard-hat', + path: 'user-main', + name: 'user-main', + shortcut: false, meta: { permission: 'user' }, - children: [ - { - path: 'settings', - name: 'user-settings', - meta: { permission: 'user' }, - component: () => import('../pages/Settings.vue') - } - ] + component: () => import('../pages/User.vue') + }, + { + title: 'Einstellungen', + icon: 'mdi-cog', + path: 'settings', + name: 'user-settings', + shortcut: true, + meta: { permission: 'user' }, + component: () => import('../pages/Settings.vue') } ] } ]; -export default routes; +export default mainRoutes; diff --git a/src/plugins/user/store/user.ts b/src/plugins/user/store/user.ts index 6f35d37..1c2e9d1 100644 --- a/src/plugins/user/store/user.ts +++ b/src/plugins/user/store/user.ts @@ -73,7 +73,7 @@ const actions: ActionTree = { LocalStorage.set('user', response.data.user); LocalStorage.set('session', response.data.session); - void Router.push({ name: 'user' }); + void Router.push({ name: 'user-main' }); }) .catch(error => { console.exception(error); diff --git a/src/router/index.ts b/src/router/index.ts index e1b75f9..46d6a57 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,7 +1,6 @@ import { route } from 'quasar/wrappers'; import VueRouter from 'vue-router'; import { Store } from 'vuex'; -import routes from './routes'; import { StateInterface } from 'src/store'; /* @@ -10,7 +9,6 @@ import { StateInterface } from 'src/store'; */ export const Router: VueRouter = new VueRouter({ scrollBehavior: () => ({ x: 0, y: 0 }), - routes, // Leave these as is and change from quasar.conf.js instead! // quasar.conf.js -> build -> vueRouterMode @@ -19,7 +17,7 @@ export const Router: VueRouter = new VueRouter({ base: process.env.VUE_ROUTER_BASE }); -export default route>(function ({ Vue }) { +export default route>(function({ Vue }) { Vue.use(VueRouter); return Router; From 555d2a871b9a5ce0a95324bc8a4f643fc086ce12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sat, 31 Oct 2020 15:38:20 +0100 Subject: [PATCH 064/448] Update Readme --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e98c90..c0409f1 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,26 @@ Dynamischen Managementsystem für Studentenclubs npm install ``` +## Plugins +### Build a Plugin +A Flaschengeist-Frontend-Plugin should be placed in `src/plugins`. +It needs a `plugin.ts` File which exports a plugin with the following interface: +``` +name: string; +mainRoutes?: PluginRouteConfig[]; +outRoutes?: PluginRouteConfig[]; +store?: Map>; +requiredModules: string[]; +version: string; +``` + +You have to import `FG_Plugin` from `plugins.d.ts`. + +### Configure Plugin + +You can activate and deactive Plugins in `src/boot/plugins.ts`. You have to set the name of the Plugin into `config.loadModules`. +The order of the plugins is importend! + ### Start the app in development mode (hot-code reloading, error reporting, etc.) ```bash quasar dev @@ -21,6 +41,7 @@ npm run lint ```bash quasar build ``` - + From 09c6a806c9b1fbf512ca98b037760b8f5c5bb438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sat, 31 Oct 2020 17:33:09 +0100 Subject: [PATCH 065/448] Fixed Permissions Man kann nun pro Route mehrere permissions setzen. --- src/boot/login.ts | 14 +++++++++----- src/boot/plugins.ts | 12 ++++++++---- src/layouts/MainLayout.vue | 18 ++++++++++++++++-- src/plugins.d.ts | 3 +++ src/plugins/user/pages/MainPage.vue | 11 ++++++++++- src/plugins/user/routes/index.ts | 6 +++--- src/plugins/user/store/user.ts | 7 +++++++ 7 files changed, 56 insertions(+), 15 deletions(-) diff --git a/src/boot/login.ts b/src/boot/login.ts index 8c5003f..9e24f1b 100644 --- a/src/boot/login.ts +++ b/src/boot/login.ts @@ -1,7 +1,7 @@ import { boot } from 'quasar/wrappers'; import { StateInterface } from 'src/store'; import { RouteRecord } from 'vue-router'; -import { Store } from 'vuex'; +import { Store } from 'vuex' export default boot>(({ router, store }) => { router.beforeEach((to, from, next) => { @@ -25,11 +25,15 @@ export default boot>(({ router, store }) => { } if ( to.matched.every((record: RouteRecord) => { - if (!('meta' in record) || !('permission' in record.meta)) + if (!('meta' in record) || !('permissions' in record.meta)) return true; - return permissions.includes( - (<{ permission: string }>record.meta).permission - ); + const test = record.meta.permissions.every((permission: string) => { + return permissions.includes( + permission + ); + }) + console.log('permissions', test) + return test }) ) { next(); diff --git a/src/boot/plugins.ts b/src/boot/plugins.ts index ff49cc6..f8b8d26 100644 --- a/src/boot/plugins.ts +++ b/src/boot/plugins.ts @@ -76,7 +76,8 @@ function combineMainLinks( title: sourcePluginChildLink.title, icon: sourcePluginChildLink.icon, link: sourcePluginChildLink.name, - name: sourcePluginChildLink.name + name: sourcePluginChildLink.name, + permissions: sourcePluginChildLink.meta?.permissions }); } ); @@ -85,7 +86,8 @@ function combineMainLinks( title: source.title, icon: source.icon, link: source.name, - name: source.name + name: source.name, + permissions: source.meta?.permissions }; source.children?.forEach(child => { if (mainLink.children === undefined) { @@ -95,7 +97,8 @@ function combineMainLinks( title: child.title, icon: child.icon, link: child.name, - name: child.name + name: child.name, + permissions: child.meta?.permissions }); }); target.push(mainLink); @@ -111,7 +114,8 @@ function loadShortCuts( if (route.shortcut) { target.push({ link: route.name, - icon: route.icon + icon: route.icon, + permissions: route.meta?.permissions }); } if (route.children) { diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index 8388224..58214b1 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -28,7 +28,8 @@ :key="'shortcut' + index" :link="shortcut.link" :icon="shortcut.icon" - /> + v-if="hasPermissions(shortcut.permissions)" + />
@@ -50,6 +51,7 @@ :title="link.title" :link="link.link" :icon="link.icon" + v-if="hasPermissions(link.permissions)" /> @@ -63,6 +65,7 @@ :title="link.title" :link="link.link" :icon="link.icon" + v-if="hasPermissions(link.permissions)" /> @@ -86,6 +89,7 @@ :title="link.title" :link="link.link" :icon="link.icon" + v-if="hasPermissions(link.permissions)" /> @@ -180,6 +184,15 @@ export default defineComponent({ }); } + function hasPermissions(permissions: FG.Permission[] | undefined) { + if (permissions) { + return permissions.every(permission => { + return ctx.root.$store.getters['user/permissions'].includes(permission) + }) + } + return true + } + return { leftDrawerOpen, leftDrawerMini, @@ -187,7 +200,8 @@ export default defineComponent({ links, pluginChildLinks, shortcuts, - logout + logout, + hasPermissions }; } }); diff --git a/src/plugins.d.ts b/src/plugins.d.ts index 357230a..8db022b 100644 --- a/src/plugins.d.ts +++ b/src/plugins.d.ts @@ -5,6 +5,7 @@ declare namespace FG_Plugin { interface ShortCutLink { link: string; icon: string; + permissions?: string[]; } interface PluginRouteConfig extends RouteConfig { @@ -12,6 +13,7 @@ declare namespace FG_Plugin { title: string; icon: string; children?: PluginRouteConfig[]; + meta?: {permissions?: string[]} } interface Plugin { @@ -32,6 +34,7 @@ declare namespace FG_Plugin { title: string; link: string; icon: string; + permissions?: string[] } interface LoadedPlugin { diff --git a/src/plugins/user/pages/MainPage.vue b/src/plugins/user/pages/MainPage.vue index 28a0a12..2a9d6ba 100644 --- a/src/plugins/user/pages/MainPage.vue +++ b/src/plugins/user/pages/MainPage.vue @@ -13,6 +13,7 @@ :title="route.title" :icon="route.icon" :link="route.name" + v-if="hasPermissions(route.permissions)" /> @@ -33,7 +34,15 @@ export default defineComponent({ const checkMain = computed(() => { return root.$route.matched.length == 2; }); - return { checkMain, mainRoutes }; + function hasPermissions(permissions: FG.Permission[] | undefined) { + if (permissions) { + return permissions.every(permission => { + return root.$store.getters['user/permissions'].includes(permission) + }) + } + return true + } + return { checkMain, mainRoutes, hasPermissions}; } }); diff --git a/src/plugins/user/routes/index.ts b/src/plugins/user/routes/index.ts index 0638c86..c93bf4b 100644 --- a/src/plugins/user/routes/index.ts +++ b/src/plugins/user/routes/index.ts @@ -6,7 +6,7 @@ const mainRoutes: FG_Plugin.PluginRouteConfig[] = [ path: 'user', name: 'user', component: () => import('../pages/MainPage.vue'), - meta: { permission: 'user' }, + meta: { permissions: ['user'] }, children: [ { title: 'Hauptkanal', @@ -14,7 +14,7 @@ const mainRoutes: FG_Plugin.PluginRouteConfig[] = [ path: 'user-main', name: 'user-main', shortcut: false, - meta: { permission: 'user' }, + meta: { permissions: ['user'] }, component: () => import('../pages/User.vue') }, { @@ -23,7 +23,7 @@ const mainRoutes: FG_Plugin.PluginRouteConfig[] = [ path: 'settings', name: 'user-settings', shortcut: true, - meta: { permission: 'user' }, + meta: { permissions: ['user'] }, component: () => import('../pages/Settings.vue') } ] diff --git a/src/plugins/user/store/user.ts b/src/plugins/user/store/user.ts index 1c2e9d1..c92a902 100644 --- a/src/plugins/user/store/user.ts +++ b/src/plugins/user/store/user.ts @@ -166,6 +166,13 @@ const getters: GetterTree = { }, loading({ updateUserLoading, getUserLoading }) { return updateUserLoading || getUserLoading; + }, + permissions({user}) { + let permissions: string[] = [] + user.roles.forEach(role => { + permissions = permissions.concat(role.permissions); + }); + return permissions } }; From a1f1be7fb65f7178eabee6d8e4706395d51f738a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sat, 31 Oct 2020 17:33:40 +0100 Subject: [PATCH 066/448] [Balance] Plugin wird geladen --- src/boot/plugins.ts | 2 +- src/plugins/balance/pages/Add.vue | 12 +++++++ src/plugins/balance/pages/MainPage.vue | 48 ++++++++++++++++++++++++++ src/plugins/balance/plugin.ts | 13 +++++++ src/plugins/balance/routes/index.ts | 43 +++++++++++++++++++++++ 5 files changed, 117 insertions(+), 1 deletion(-) create mode 100644 src/plugins/balance/pages/Add.vue create mode 100644 src/plugins/balance/pages/MainPage.vue create mode 100644 src/plugins/balance/plugin.ts create mode 100644 src/plugins/balance/routes/index.ts diff --git a/src/boot/plugins.ts b/src/boot/plugins.ts index f8b8d26..8725881 100644 --- a/src/boot/plugins.ts +++ b/src/boot/plugins.ts @@ -9,7 +9,7 @@ const config = { // Do not change required Modules !! requiredModules: ['User'], // here you can import plugins. - loadModules: [] + loadModules: ['Balance'] }; // do not change anything here !! diff --git a/src/plugins/balance/pages/Add.vue b/src/plugins/balance/pages/Add.vue new file mode 100644 index 0000000..76a3a3a --- /dev/null +++ b/src/plugins/balance/pages/Add.vue @@ -0,0 +1,12 @@ + + + diff --git a/src/plugins/balance/pages/MainPage.vue b/src/plugins/balance/pages/MainPage.vue new file mode 100644 index 0000000..5669371 --- /dev/null +++ b/src/plugins/balance/pages/MainPage.vue @@ -0,0 +1,48 @@ + + + diff --git a/src/plugins/balance/plugin.ts b/src/plugins/balance/plugin.ts new file mode 100644 index 0000000..cb5dd38 --- /dev/null +++ b/src/plugins/balance/plugin.ts @@ -0,0 +1,13 @@ +import {Module} from 'vuex'; +import {StateInterface} from "src/store"; +import mainRoutes from "./routes" +import { FG_Plugin } from 'src/plugins'; + +const plugin: FG_Plugin.Plugin = { + name: 'Balance', + mainRoutes, + requiredModules: ['User'], + version: '0.0.1', +} + +export default plugin; diff --git a/src/plugins/balance/routes/index.ts b/src/plugins/balance/routes/index.ts new file mode 100644 index 0000000..2014716 --- /dev/null +++ b/src/plugins/balance/routes/index.ts @@ -0,0 +1,43 @@ +import {FG_Plugin} from 'src/plugins'; + +const permissions = { +// Show own and others balance + SHOW: "balance_show", + SHOW_OTHER: "balance_show_others", +// Credit balance + ADD: "balance_add", +// Debit balance + SUB: "balance_sub", +// Send from to other + SEND: "balance_send", +// Send from other to another + SEND_OTHER: "balance_send_others", +// Can set limit for users + SET_LIMIT: "balance_set_limit", +//Allow sending / sub while exceeding the set limit + EXCEED_LIMIT: "balance_exceed_limit" +} + +const mainRoutes: FG_Plugin.PluginRouteConfig[] = [ + { + title: 'Gerücht', + icon: 'mdi-cash-100', + path: 'balance', + name: 'balance', + component: () => import('../pages/MainPage.vue'), + meta: {permissions: ['user']}, + children: [ + { + title: 'Anschreiben', + icon: 'mdi-cash-100', + path: 'balance-add', + name: 'balance-add', + shortcut: true, + meta: {permissions: [permissions.ADD, permissions.SHOW]}, + component: () => import('../pages/Add.vue') + } + ] + } +] + +export default mainRoutes From ef7148193183c203c19dbbb41cae225bf3e14f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sat, 31 Oct 2020 19:33:05 +0100 Subject: [PATCH 067/448] Fixed Typings --- src/boot/login.ts | 16 ++++--- src/components/navigation/EssentialLink.vue | 28 +++++++++--- src/components/navigation/ShortCutLink.vue | 22 ++++++++- src/layouts/MainLayout.vue | 45 ++++++++----------- src/plugins/balance/pages/MainPage.vue | 12 +---- .../user/components/settings/Sessions.vue | 2 +- src/plugins/user/pages/MainPage.vue | 12 +---- 7 files changed, 74 insertions(+), 63 deletions(-) diff --git a/src/boot/login.ts b/src/boot/login.ts index 9e24f1b..a9c431f 100644 --- a/src/boot/login.ts +++ b/src/boot/login.ts @@ -27,13 +27,15 @@ export default boot>(({ router, store }) => { to.matched.every((record: RouteRecord) => { if (!('meta' in record) || !('permissions' in record.meta)) return true; - const test = record.meta.permissions.every((permission: string) => { - return permissions.includes( - permission - ); - }) - console.log('permissions', test) - return test + if (record.meta) { + if ((<{permissions: FG.Permission[]}>record.meta).permissions) { + return (<{permissions: FG.Permission[]}>record.meta).permissions.every((permission: string) => { + return permissions.includes( + permission + ); + }) + } + } }) ) { next(); diff --git a/src/components/navigation/EssentialLink.vue b/src/components/navigation/EssentialLink.vue index fe44dd0..601a75f 100644 --- a/src/components/navigation/EssentialLink.vue +++ b/src/components/navigation/EssentialLink.vue @@ -1,20 +1,22 @@ diff --git a/src/components/navigation/ShortCutLink.vue b/src/components/navigation/ShortCutLink.vue index 6a0a446..17a4af4 100644 --- a/src/components/navigation/ShortCutLink.vue +++ b/src/components/navigation/ShortCutLink.vue @@ -1,9 +1,11 @@ diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index 58214b1..8142d39 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -14,7 +14,7 @@ - + Flaschengeist @@ -28,10 +28,10 @@ :key="'shortcut' + index" :link="shortcut.link" :icon="shortcut.icon" - v-if="hasPermissions(shortcut.permissions)" - /> + :permissions="shortcut.permissions" + />
- + @@ -51,10 +51,10 @@ :title="link.title" :link="link.link" :icon="link.icon" - v-if="hasPermissions(link.permissions)" + :permissions="link.permissions" /> - + @@ -65,7 +65,7 @@ :title="link.title" :link="link.link" :icon="link.icon" - v-if="hasPermissions(link.permissions)" + :permissions="link.permissions" /> @@ -81,7 +81,7 @@ /> - + - + @@ -102,11 +102,11 @@ diff --git a/src/plugins/user/components/settings/Sessions.vue b/src/plugins/user/components/settings/Sessions.vue index f8dc097..707847e 100644 --- a/src/plugins/user/components/settings/Sessions.vue +++ b/src/plugins/user/components/settings/Sessions.vue @@ -66,7 +66,7 @@ export default defineComponent({ ? 'mdi-linux' : platform == 'windows' ? 'mdi-microsoft-windows' - : platform == 'apple' + : platform == 'macos' ? 'mdi-apple' : 'mdi-help'; } diff --git a/src/plugins/user/pages/MainPage.vue b/src/plugins/user/pages/MainPage.vue index 2a9d6ba..1560720 100644 --- a/src/plugins/user/pages/MainPage.vue +++ b/src/plugins/user/pages/MainPage.vue @@ -13,7 +13,7 @@ :title="route.title" :icon="route.icon" :link="route.name" - v-if="hasPermissions(route.permissions)" + :permissions="route.meta.permissions" /> @@ -34,15 +34,7 @@ export default defineComponent({ const checkMain = computed(() => { return root.$route.matched.length == 2; }); - function hasPermissions(permissions: FG.Permission[] | undefined) { - if (permissions) { - return permissions.every(permission => { - return root.$store.getters['user/permissions'].includes(permission) - }) - } - return true - } - return { checkMain, mainRoutes, hasPermissions}; + return { checkMain, mainRoutes}; } }); From 3247a5bb01b266de719f9e14b39d5593c6e8cbfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sat, 31 Oct 2020 21:30:02 +0100 Subject: [PATCH 068/448] =?UTF-8?q?[Balance]=20Bereich=20zum=20Hinzuf?= =?UTF-8?q?=C3=BCgen=20von=20Schulden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Es können auch schon schulden hinzugefügt werden. --- src/boot/plugins.ts | 2 +- src/components/navigation/EssentialLink.vue | 38 +++++---- src/components/navigation/ShortCutLink.vue | 26 +++--- src/plugins/balance/pages/Add.vue | 89 ++++++++++++++++++++- src/plugins/balance/plugin.ts | 12 ++- src/plugins/balance/routes/index.ts | 42 +++++----- src/plugins/balance/store/balance.ts | 83 +++++++++++++++++++ 7 files changed, 236 insertions(+), 56 deletions(-) create mode 100644 src/plugins/balance/store/balance.ts diff --git a/src/boot/plugins.ts b/src/boot/plugins.ts index 8725881..7bcd890 100644 --- a/src/boot/plugins.ts +++ b/src/boot/plugins.ts @@ -1,6 +1,6 @@ import { boot } from 'quasar/wrappers'; import { RouteConfig } from 'vue-router'; -import { Module, Store } from 'vuex'; +import { Store } from 'vuex'; import { StateInterface } from 'src/store'; import { FG_Plugin } from 'src/plugins'; import routes from 'src/router/routes'; diff --git a/src/components/navigation/EssentialLink.vue b/src/components/navigation/EssentialLink.vue index 601a75f..5e13044 100644 --- a/src/components/navigation/EssentialLink.vue +++ b/src/components/navigation/EssentialLink.vue @@ -1,22 +1,28 @@ diff --git a/src/components/navigation/ShortCutLink.vue b/src/components/navigation/ShortCutLink.vue index 17a4af4..85e7807 100644 --- a/src/components/navigation/ShortCutLink.vue +++ b/src/components/navigation/ShortCutLink.vue @@ -1,11 +1,12 @@ diff --git a/src/plugins/balance/pages/Add.vue b/src/plugins/balance/pages/Add.vue index 76a3a3a..65862e4 100644 --- a/src/plugins/balance/pages/Add.vue +++ b/src/plugins/balance/pages/Add.vue @@ -1,12 +1,95 @@ diff --git a/src/plugins/balance/plugin.ts b/src/plugins/balance/plugin.ts index cb5dd38..7a7a9d1 100644 --- a/src/plugins/balance/plugin.ts +++ b/src/plugins/balance/plugin.ts @@ -1,13 +1,17 @@ -import {Module} from 'vuex'; -import {StateInterface} from "src/store"; -import mainRoutes from "./routes" +import { Module } from 'vuex'; +import { StateInterface } from 'src/store'; +import mainRoutes from './routes'; import { FG_Plugin } from 'src/plugins'; +import balance, { BalanceInterface } from './store/balance'; const plugin: FG_Plugin.Plugin = { name: 'Balance', mainRoutes, requiredModules: ['User'], version: '0.0.1', -} + store: new Map>([ + ['balance', balance] + ]) +}; export default plugin; diff --git a/src/plugins/balance/routes/index.ts b/src/plugins/balance/routes/index.ts index 2014716..2639c7c 100644 --- a/src/plugins/balance/routes/index.ts +++ b/src/plugins/balance/routes/index.ts @@ -1,22 +1,22 @@ -import {FG_Plugin} from 'src/plugins'; +import { FG_Plugin } from 'src/plugins'; const permissions = { -// Show own and others balance - SHOW: "balance_show", - SHOW_OTHER: "balance_show_others", -// Credit balance - ADD: "balance_add", -// Debit balance - SUB: "balance_sub", -// Send from to other - SEND: "balance_send", -// Send from other to another - SEND_OTHER: "balance_send_others", -// Can set limit for users - SET_LIMIT: "balance_set_limit", -//Allow sending / sub while exceeding the set limit - EXCEED_LIMIT: "balance_exceed_limit" -} + // Show own and others balance + SHOW: 'balance_show', + SHOW_OTHER: 'balance_show_others', + // Credit balance + ADD: 'balance_add', + // Debit balance + SUB: 'balance_sub', + // Send from to other + SEND: 'balance_send', + // Send from other to another + SEND_OTHER: 'balance_send_others', + // Can set limit for users + SET_LIMIT: 'balance_set_limit', + //Allow sending / sub while exceeding the set limit + EXCEED_LIMIT: 'balance_exceed_limit' +}; const mainRoutes: FG_Plugin.PluginRouteConfig[] = [ { @@ -25,7 +25,7 @@ const mainRoutes: FG_Plugin.PluginRouteConfig[] = [ path: 'balance', name: 'balance', component: () => import('../pages/MainPage.vue'), - meta: {permissions: ['user']}, + meta: { permissions: ['user'] }, children: [ { title: 'Anschreiben', @@ -33,11 +33,11 @@ const mainRoutes: FG_Plugin.PluginRouteConfig[] = [ path: 'balance-add', name: 'balance-add', shortcut: true, - meta: {permissions: [permissions.ADD, permissions.SHOW]}, + meta: { permissions: [permissions.SUB, permissions.SHOW] }, component: () => import('../pages/Add.vue') } ] } -] +]; -export default mainRoutes +export default mainRoutes; diff --git a/src/plugins/balance/store/balance.ts b/src/plugins/balance/store/balance.ts new file mode 100644 index 0000000..5b7b49d --- /dev/null +++ b/src/plugins/balance/store/balance.ts @@ -0,0 +1,83 @@ +import { Module, MutationTree, ActionTree, GetterTree } from 'vuex'; +import { StateInterface } from 'src/store'; +import { axios } from 'src/boot/axios'; +import { AxiosResponse } from 'axios'; + +interface BalanceResponse { + balance: number; + credit: number; + debit: number; +} + +export interface BalanceInterface extends BalanceResponse { + limit: number; +} + +const state: BalanceInterface = { + balance: 0, + credit: 0, + debit: 0, + limit: 0 +}; + +const mutations: MutationTree = { + setBalance(state, data: number) { + state.balance = data; + }, + setCredit(state, data: number) { + state.credit = data; + }, + setDebit(state, data: number) { + state.debit = data; + }, + setLimit(state, data: number) { + state.limit = data; + } +}; + +const actions: ActionTree = { + getBalance({ commit, rootState }) { + axios + .get(`/users/${rootState.user.user.userid}/balance`) + .then(({ data }: AxiosResponse) => { + commit('setBalance', data.balance); + commit('setCredit', data.credit); + commit('setDebit', data.debit); + }) + .catch(err => { + console.warn(err); + }); + }, + getLimit({ rootState }) { + axios + .get(`/users/${rootState.user.user.userid}/balance/limit`) + .then(({ data }) => { + console.log(data); + }) + .catch(err => { + console.warn(err); + }); + }, + changeBalance({ rootState, dispatch }, amount: number) { + axios + .put(`/users/${rootState.user.user.userid}/balance`, <{ amount: number }>{ + amount: amount + }) + .then(() => { + dispatch('getBalance').catch(err => console.warn(err)); + }) + .catch(err => console.warn(err)); + } +}; + +const getters: GetterTree = {}; + +const balance: Module = { + namespaced: true, + state, + mutations, + actions, + getters +}; + +export default balance; From 5d1409b735feab00297ae56fb3fbb2e35e98c83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Sat, 31 Oct 2020 22:37:28 +0100 Subject: [PATCH 069/448] =?UTF-8?q?[Settings]=20Neue=20Icons=20f=C3=BCr=20?= =?UTF-8?q?plattform?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/boot/loading.ts | 5 ++++- src/plugins/user/components/settings/Sessions.vue | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/boot/loading.ts b/src/boot/loading.ts index bf1cd4d..c56b27c 100644 --- a/src/boot/loading.ts +++ b/src/boot/loading.ts @@ -1,10 +1,13 @@ import { boot } from 'quasar/wrappers'; import { Loading } from 'quasar'; +import DarkCircularProgress from 'components/loading/DarkCircularProgress.vue'; // "async" is optional; // more info on params: https://quasar.dev/quasar-cli/cli-documentation/boot-files#Anatomy-of-a-boot-file export default boot((/* { app, router, Vue ... } */) => { Loading.setDefaults({ - spinner: () => import('src/components/loading/DarkCircularProgress.vue') + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + spinner: DarkCircularProgress }); }); diff --git a/src/plugins/user/components/settings/Sessions.vue b/src/plugins/user/components/settings/Sessions.vue index 707847e..06ebdef 100644 --- a/src/plugins/user/components/settings/Sessions.vue +++ b/src/plugins/user/components/settings/Sessions.vue @@ -68,6 +68,10 @@ export default defineComponent({ ? 'mdi-microsoft-windows' : platform == 'macos' ? 'mdi-apple' + : platform == 'iphone' + ? 'mdi-cellphone-iphone' + : platform == 'android' + ? 'mdi-cellphone-android' : 'mdi-help'; } From 7b710f0bf4279c25c68283e8e335bd289098e204 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Mon, 2 Nov 2020 04:42:19 +0100 Subject: [PATCH 070/448] Added current declaration file --- src/flaschengeist.d.ts | 75 ++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/src/flaschengeist.d.ts b/src/flaschengeist.d.ts index d3ff9d4..d43d7b7 100644 --- a/src/flaschengeist.d.ts +++ b/src/flaschengeist.d.ts @@ -1,32 +1,10 @@ declare namespace FG { - interface Event { - id: number; - begin: Date; - end?: Date; - description: string; - kind: EventKind; - slots: Array; - } - interface EventKind { - id: number; - name: string; - } - interface EventSlot { - id: number; - start: Date; - end?: any; - slots: Array; - } - interface Job { - userid: string; - value: number; - } - type JobKind = string; - interface JobSlot { - id: number; - needed_persons: number; - kind: JobKind; - jobs: Array; + interface Session { + expires: Date; + token: string; + lifetime: number; + browser: string; + platform: string; } interface User { userid: string; @@ -36,16 +14,43 @@ declare namespace FG { mail: string; roles: Array; } - interface Session { - expires: Date; - token: string; - lifetime: number; - browser: string; - platform: string; - } type Permission = string; interface Role { name: string; permissions: Array; } + interface Transaction { + id: number; + time: Date; + amount: number; + sender_id: string; + receiver_id: string; + author_id: string; + } + interface Event { + id: number; + begin: Date; + end: Date; + description: string; + type: EventType; + slots: Array; + } + interface EventSlot { + id: number; + start: Date; + end?: any; + jobs: Array; + } + type EventType = string; + interface Job { + userid: string; + value: number; + } + interface JobSlot { + id: number; + type: JobType; + users: Array; + required_jobs: number; + } + type JobType = string; } From 245944b6a945ead3dd370bdbdec7a89d0095802c Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Mon, 2 Nov 2020 17:39:05 +0100 Subject: [PATCH 071/448] Sync: d.ts with backend and permissions from balance plugin --- src/flaschengeist.d.ts | 11 ++++++----- src/plugins/balance/routes/index.ts | 12 +++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/flaschengeist.d.ts b/src/flaschengeist.d.ts index d43d7b7..aaf068d 100644 --- a/src/flaschengeist.d.ts +++ b/src/flaschengeist.d.ts @@ -29,9 +29,8 @@ declare namespace FG { } interface Event { id: number; - begin: Date; - end: Date; - description: string; + start: Date; + description?: any; type: EventType; slots: Array; } @@ -47,10 +46,12 @@ declare namespace FG { value: number; } interface JobSlot { - id: number; type: JobType; users: Array; required_jobs: number; } - type JobType = string; + interface JobType { + id: number; + name: string; + } } diff --git a/src/plugins/balance/routes/index.ts b/src/plugins/balance/routes/index.ts index 2639c7c..1b4a1f0 100644 --- a/src/plugins/balance/routes/index.ts +++ b/src/plugins/balance/routes/index.ts @@ -4,10 +4,12 @@ const permissions = { // Show own and others balance SHOW: 'balance_show', SHOW_OTHER: 'balance_show_others', - // Credit balance - ADD: 'balance_add', - // Debit balance - SUB: 'balance_sub', + // Credit balance (give) + CREDIT: 'balance_credit', + // Debit balance (take) + DEBIT: 'balance_debit', + // Debit own balance only + DEBIT_OWN: 'balance_debit_own', // Send from to other SEND: 'balance_send', // Send from other to another @@ -33,7 +35,7 @@ const mainRoutes: FG_Plugin.PluginRouteConfig[] = [ path: 'balance-add', name: 'balance-add', shortcut: true, - meta: { permissions: [permissions.SUB, permissions.SHOW] }, + meta: { permissions: [permissions.DEBIT_OWN, permissions.SHOW] }, component: () => import('../pages/Add.vue') } ] From 4061d84ace199f0aa2f057eb1d8b1ea0209d2602 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Wed, 4 Nov 2020 23:53:10 +0100 Subject: [PATCH 072/448] Use more logical seperation on user and session * Seperated user and session more logical * Fixed error with expired sessions * Cache user only in SessionStore * Use current backend responses * Used prettier --- quasar.conf.js | 2 +- src/App.vue | 2 +- src/boot/axios.ts | 6 +- src/boot/login.ts | 82 ++++----- src/config.ts | 2 +- src/flaschengeist.d.ts | 111 +++++------ src/index.template.html | 48 +++-- src/layouts/MainLayout.vue | 24 +-- src/pages/Error404.vue | 6 +- src/pages/Login.vue | 2 +- src/plugins.d.ts | 4 +- src/plugins/balance/store/balance.ts | 11 +- src/plugins/user/components/settings/Main.vue | 12 +- .../user/components/settings/Sessions.vue | 4 +- src/plugins/user/models.ts | 5 + src/plugins/user/pages/MainPage.vue | 2 +- src/plugins/user/pages/Settings.vue | 6 +- src/plugins/user/pages/User.vue | 4 +- src/plugins/user/plugin.ts | 2 +- src/plugins/user/store/session.ts | 95 +++++++--- src/plugins/user/store/user.ts | 174 ++++++------------ src/router/routes.ts | 2 +- src/store/index.ts | 2 +- src/store/store-flag.d.ts | 4 +- 24 files changed, 307 insertions(+), 305 deletions(-) diff --git a/quasar.conf.js b/quasar.conf.js index 0074565..e13865c 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -103,7 +103,7 @@ module.exports = configure(function(ctx) { // directives: [], // Quasar plugins - plugins: ['LocalStorage', 'Loading'] + plugins: ['LocalStorage', 'SessionStorage', 'Loading'] }, // animations: 'all', // --- includes all animations diff --git a/src/App.vue b/src/App.vue index 0b7a348..ae9bb31 100644 --- a/src/App.vue +++ b/src/App.vue @@ -7,6 +7,6 @@ import { defineComponent } from '@vue/composition-api'; export default defineComponent({ - name: 'App', + name: 'App' }); diff --git a/src/boot/axios.ts b/src/boot/axios.ts index 54dc836..b6255dc 100644 --- a/src/boot/axios.ts +++ b/src/boot/axios.ts @@ -16,9 +16,9 @@ export default boot>(({ Vue, store }) => { axios.defaults.baseURL = config.baseURL; axios.interceptors.request.use(config => { - const session = store.state.user.session; - if (session.token) { - config.headers = {'Authorization': 'Bearer ' + session.token}; + const session = store.state.session.currentSession; + if (session?.token) { + config.headers = { Authorization: 'Bearer ' + session.token }; } return config; }); diff --git a/src/boot/login.ts b/src/boot/login.ts index a9c431f..a4571eb 100644 --- a/src/boot/login.ts +++ b/src/boot/login.ts @@ -1,53 +1,49 @@ import { boot } from 'quasar/wrappers'; import { StateInterface } from 'src/store'; import { RouteRecord } from 'vue-router'; -import { Store } from 'vuex' +import { Store } from 'vuex'; export default boot>(({ router, store }) => { router.beforeEach((to, from, next) => { - store - .dispatch('user/loadFromLocalStorage') - .then(() => { - const user = store.state.user.user; - const session = store.state.user.session; + const user = store.state.user.currentUser; + const session = store.state.session.currentSession; - let permissions: string[] = []; - user.roles.forEach(role => { - permissions = permissions.concat(role.permissions); - }); - - if (to.name != 'login') { - if (session.expires >= new Date() || session.token === '') { - store.dispatch('user/doLogout').catch(error => { - console.warn(error); - }); - return next({ name: 'login', query: { redirect: to.fullPath } }); - } - if ( - to.matched.every((record: RouteRecord) => { - if (!('meta' in record) || !('permissions' in record.meta)) - return true; - if (record.meta) { - if ((<{permissions: FG.Permission[]}>record.meta).permissions) { - return (<{permissions: FG.Permission[]}>record.meta).permissions.every((permission: string) => { - return permissions.includes( - permission - ); - }) - } - } - }) - ) { - next(); - } else { - next({ name: 'login', query: { redirect: to.fullPath } }); - } - } else { - next(); - } - }) - .catch(error => { - console.exception(error); + let permissions: string[] = []; + if (user) { + user.roles.forEach(role => { + permissions = permissions.concat(role.permissions); }); + } + + if (to.name != 'login') { + if (!session || session.expires <= new Date()) { + store.dispatch('session/logout').catch(error => { + console.warn(error); + }); + return next({ name: 'login', query: { redirect: to.fullPath } }); + } + + if ( + to.matched.every((record: RouteRecord) => { + if (!('meta' in record) || !('permissions' in record.meta)) + return true; + if (record.meta) { + if ((<{ permissions: FG.Permission[] }>record.meta).permissions) { + return (<{ permissions: FG.Permission[] }>( + record.meta + )).permissions.every((permission: string) => { + return permissions.includes(permission); + }); + } + } + }) + ) { + next(); + } else { + next({ name: 'login', query: { redirect: to.fullPath } }); + } + } else { + next(); + } }); }); diff --git a/src/config.ts b/src/config.ts index 8df1729..90b3ca8 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,5 +1,5 @@ const config = { -baseURL: '/api' + baseURL: '/api' }; export default config; diff --git a/src/flaschengeist.d.ts b/src/flaschengeist.d.ts index aaf068d..4203fde 100644 --- a/src/flaschengeist.d.ts +++ b/src/flaschengeist.d.ts @@ -1,57 +1,58 @@ declare namespace FG { - interface Session { - expires: Date; - token: string; - lifetime: number; - browser: string; - platform: string; - } - interface User { - userid: string; - display_name: string; - firstname: string; - lastname: string; - mail: string; - roles: Array; - } - type Permission = string; - interface Role { - name: string; - permissions: Array; - } - interface Transaction { - id: number; - time: Date; - amount: number; - sender_id: string; - receiver_id: string; - author_id: string; - } - interface Event { - id: number; - start: Date; - description?: any; - type: EventType; - slots: Array; - } - interface EventSlot { - id: number; - start: Date; - end?: any; - jobs: Array; - } - type EventType = string; - interface Job { - userid: string; - value: number; - } - interface JobSlot { - type: JobType; - users: Array; - required_jobs: number; - } - interface JobType { - id: number; - name: string; - } + interface Session { + expires: Date; + token: string; + lifetime: number; + browser: string; + platform: string; + userid: string; + } + interface User { + userid: string; + display_name: string; + firstname: string; + lastname: string; + mail: string; + roles: Array; + } + type Permission = string; + interface Role { + name: string; + permissions: Array; + } + interface Transaction { + id: number; + time: Date; + amount: number; + sender_id: string; + receiver_id: string; + author_id: string; + } + interface Event { + id: number; + start: Date; + description?: any; + type: EventType; + slots: Array; + } + interface EventSlot { + id: number; + start: Date; + end?: any; + jobs: Array; + } + type EventType = string; + interface Job { + userid: string; + value: number; + } + interface JobSlot { + type: JobType; + users: Array; + required_jobs: number; + } + interface JobType { + id: number; + name: string; + } } diff --git a/src/index.template.html b/src/index.template.html index 7eb371e..576b093 100644 --- a/src/index.template.html +++ b/src/index.template.html @@ -1,24 +1,34 @@ + + <%= productName %> - - <%= productName %> + + + + + - - - - - + + + + - - - - - - - -
- - - \ No newline at end of file + + +
+ + diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index 8142d39..2399539 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -14,7 +14,7 @@ - + Flaschengeist @@ -31,7 +31,7 @@ :permissions="shortcut.permissions" /> - + @@ -54,7 +54,7 @@ :permissions="link.permissions" /> - + @@ -81,7 +81,7 @@ /> - + - + @@ -102,11 +102,11 @@ diff --git a/src/pages/Login.vue b/src/pages/Login.vue index 5e33c75..c67012c 100644 --- a/src/pages/Login.vue +++ b/src/pages/Login.vue @@ -48,7 +48,7 @@ export default defineComponent({ function doLogin() { console.log(userid.value, password.value); ctx.root.$store - .dispatch('user/login', { + .dispatch('session/login', { userid: userid.value, password: password.value }) diff --git a/src/plugins.d.ts b/src/plugins.d.ts index 8db022b..3f92f4a 100644 --- a/src/plugins.d.ts +++ b/src/plugins.d.ts @@ -13,7 +13,7 @@ declare namespace FG_Plugin { title: string; icon: string; children?: PluginRouteConfig[]; - meta?: {permissions?: string[]} + meta?: { permissions?: string[] }; } interface Plugin { @@ -34,7 +34,7 @@ declare namespace FG_Plugin { title: string; link: string; icon: string; - permissions?: string[] + permissions?: string[]; } interface LoadedPlugin { diff --git a/src/plugins/balance/store/balance.ts b/src/plugins/balance/store/balance.ts index 5b7b49d..79ec232 100644 --- a/src/plugins/balance/store/balance.ts +++ b/src/plugins/balance/store/balance.ts @@ -38,7 +38,8 @@ const mutations: MutationTree = { const actions: ActionTree = { getBalance({ commit, rootState }) { axios - .get(`/users/${rootState.user.user.userid}/balance`) + /* eslint-disable-next-line @typescript-eslint/restrict-template-expressions */ + .get(`/users/${rootState.user.currentUser?.userid}/balance`) .then(({ data }: AxiosResponse) => { commit('setBalance', data.balance); commit('setCredit', data.credit); @@ -50,7 +51,8 @@ const actions: ActionTree = { }, getLimit({ rootState }) { axios - .get(`/users/${rootState.user.user.userid}/balance/limit`) + /* eslint-disable-next-line @typescript-eslint/restrict-template-expressions */ + .get(`/users/${rootState.user.currentUser?.userid}/balance/limit`) .then(({ data }) => { console.log(data); }) @@ -60,7 +62,10 @@ const actions: ActionTree = { }, changeBalance({ rootState, dispatch }, amount: number) { axios - .put(`/users/${rootState.user.user.userid}/balance`, <{ amount: number }>{ + /* eslint-disable-next-line @typescript-eslint/restrict-template-expressions */ + .put(`/users/${rootState.user.currentUser?.userid}/balance`, < + { amount: number } + >{ amount: amount }) .then(() => { diff --git a/src/plugins/user/components/settings/Main.vue b/src/plugins/user/components/settings/Main.vue index 1c2e7e8..607aa00 100644 --- a/src/plugins/user/components/settings/Main.vue +++ b/src/plugins/user/components/settings/Main.vue @@ -100,14 +100,12 @@ export default defineComponent({ setup(_, { root }) { const store = >root.$store; - const user = computed(() => { - return store.state.user.user; - }); + const user = computed(() => store.state.user.currentUser); - const firstname = ref(user.value.firstname); - const lastname = ref(user.value.lastname); - const mail = ref(user.value.mail); - const display_name = ref(user.value.display_name); + const firstname = ref(user.value?.firstname); + const lastname = ref(user.value?.lastname); + const mail = ref(user.value?.mail); + const display_name = ref(user.value?.display_name); const password = ref(''); const new_password = ref(''); diff --git a/src/plugins/user/components/settings/Sessions.vue b/src/plugins/user/components/settings/Sessions.vue index 06ebdef..d06a53a 100644 --- a/src/plugins/user/components/settings/Sessions.vue +++ b/src/plugins/user/components/settings/Sessions.vue @@ -76,12 +76,12 @@ export default defineComponent({ } function deleteSession(token: string) { - store.dispatch('sessions/deleteSession', token).catch(error => { + store.dispatch('session/deleteSession', token).catch(error => { console.warn(error); }); } function isThisSession(token: string) { - return store.state.user.session.token == token; + return store.state.session.currentSession?.token === token; } return { diff --git a/src/plugins/user/models.ts b/src/plugins/user/models.ts index 64149db..c743f7d 100644 --- a/src/plugins/user/models.ts +++ b/src/plugins/user/models.ts @@ -2,3 +2,8 @@ export interface LoginData { userid: string; password: string; } + +export interface LoginResponse { + user: FG.User; + session: FG.Session; +} diff --git a/src/plugins/user/pages/MainPage.vue b/src/plugins/user/pages/MainPage.vue index 1560720..c868326 100644 --- a/src/plugins/user/pages/MainPage.vue +++ b/src/plugins/user/pages/MainPage.vue @@ -34,7 +34,7 @@ export default defineComponent({ const checkMain = computed(() => { return root.$route.matched.length == 2; }); - return { checkMain, mainRoutes}; + return { checkMain, mainRoutes }; } }); diff --git a/src/plugins/user/pages/Settings.vue b/src/plugins/user/pages/Settings.vue index acd40ba..6fc4106 100644 --- a/src/plugins/user/pages/Settings.vue +++ b/src/plugins/user/pages/Settings.vue @@ -43,11 +43,11 @@ export default defineComponent({ const store = >root.$store; onBeforeMount(() => { - store.dispatch('sessions/getSessions').catch(error => { + store.dispatch('session/getSessions').catch(error => { console.warn(error); }); }); - const sessions = computed(() => store.state.sessions.sessions); + const sessions = computed(() => store.state.session.sessions); function showRootGetters() { console.log(sessions.value); @@ -55,7 +55,7 @@ export default defineComponent({ const sessionsLoading = computed( () => - store.state.sessions.loading || + store.state.session.loading || store.state.user.getUserLoading || store.state.user.updateUserLoading ); diff --git a/src/plugins/user/pages/User.vue b/src/plugins/user/pages/User.vue index d51d87e..1dde46e 100644 --- a/src/plugins/user/pages/User.vue +++ b/src/plugins/user/pages/User.vue @@ -27,9 +27,9 @@ export default defineComponent({ setup(_, { root }) { const store = >root.$store; - const userObj = computed(() => store.state.user.user); + const userObj = computed(() => store.state.user.currentUser); - const sessionObj = computed(() => store.state.user.session); + const sessionObj = computed(() => store.state.session.currentSession); return { userObj, sessionObj }; } diff --git a/src/plugins/user/plugin.ts b/src/plugins/user/plugin.ts index 877d8c2..7bf40e3 100644 --- a/src/plugins/user/plugin.ts +++ b/src/plugins/user/plugin.ts @@ -12,7 +12,7 @@ const plugin: FG_Plugin.Plugin = { version: '0.0.1', store: new Map>([ ['user', userStore], - ['sessions', sessionsStore] + ['session', sessionsStore] ]) }; diff --git a/src/plugins/user/store/session.ts b/src/plugins/user/store/session.ts index 1727b3a..d192bef 100644 --- a/src/plugins/user/store/session.ts +++ b/src/plugins/user/store/session.ts @@ -1,20 +1,33 @@ import { Module, MutationTree, ActionTree, GetterTree } from 'vuex'; +import { LoginData, LoginResponse } from 'src/plugins/user/models'; import { StateInterface } from 'src/store'; import { axios } from 'src/boot/axios'; import { AxiosResponse } from 'axios'; import { Router } from 'src/router'; +import { LocalStorage, Loading } from 'quasar'; export interface SessionInterface { + currentSession?: FG.Session; sessions: FG.Session[]; loading: boolean; } const state: SessionInterface = { sessions: [], + currentSession: + LocalStorage.getItem('currentSession') || undefined, loading: false }; const mutations: MutationTree = { + setCurrentSession(state, session: FG.Session) { + LocalStorage.set('currentSession', session); + state.currentSession = session; + }, + clearCurrentSession(state) { + LocalStorage.remove('currentSession'); + state.currentSession = undefined; + }, setSessions(state, sessions: FG.Session[]) { state.sessions = sessions; }, @@ -24,40 +37,75 @@ const mutations: MutationTree = { }; const actions: ActionTree = { - getSessions({ commit, rootState, dispatch }) { - commit('setLoading', true); - axios - .get('/auth') - .then((response: AxiosResponse) => { - console.log(response.data); - response.data.forEach(session => { - session.expires = new Date(session.expires); - }); - commit('setSessions', response.data); - const currentSession = response.data.find((session: FG.Session) => { - return session.token === rootState.user.session.token; - }); - if (currentSession) { - void dispatch('user/setSession', currentSession, { root: true }); - } + login({ commit }, data: LoginData) { + Loading.show({ + message: 'Du wirst angemeldet' + }); + void axios + .post('/auth', data) + .then((response: AxiosResponse) => { + response.data.session.expires = new Date(response.data.session.expires); + commit('setCurrentSession', response.data.session); + commit('user/setCurrentUser', response.data.user, { root: true }); + void Router.push({ name: 'user-main' }); }) .catch(error => { console.exception(error); }) .finally(() => { - commit('setLoading', false); + Loading.hide(); }); }, - deleteSession({ commit, dispatch, rootState }, token: string) { + /** + * Logout from current session + */ + logout({ dispatch, rootState }) { + Loading.show({ message: 'Session wird abgemeldet' }); + dispatch('deleteSession', rootState.session.currentSession?.token).finally( + () => { + Loading.hide(); + } + ); + }, + /** + * Delete a given session + */ + deleteSession({ commit, rootState }, token: string | null) { + if (token === null) return; + commit('setLoading', true); axios .delete(`/auth/${token}`) .then(() => { - if (token === rootState.user.session.token) { - void dispatch('user/setSession', null, { root: true }); - Router.go(0); + if (token === rootState.session.currentSession?.token) { + commit('clearCurrentSession'); + commit('user/clearCurrentUser', null, { root: true }); + void Router.push({ name: 'login' }); } else { - void dispatch('getSessions'); + commit('getSessions'); + } + }) + .finally(() => { + commit('setLoading', false); + }); + }, + /** + * Get all sessions from current User + */ + getSessions({ commit, state, dispatch }) { + commit('setLoading', true); + axios + .get('/auth') + .then((response: AxiosResponse) => { + response.data.forEach(session => { + session.expires = new Date(session.expires); + }); + commit('setSessions', response.data); + const currentSession = response.data.find((session: FG.Session) => { + return session.token === state.currentSession?.token; + }); + if (currentSession) { + void dispatch('setCurrentSession', currentSession); } }) .catch(error => { @@ -70,6 +118,9 @@ const actions: ActionTree = { }; const getters: GetterTree = { + currentSession(state) { + return state.currentSession; + }, sessions(state) { return state.sessions; }, diff --git a/src/plugins/user/store/user.ts b/src/plugins/user/store/user.ts index c92a902..b4efbe5 100644 --- a/src/plugins/user/store/user.ts +++ b/src/plugins/user/store/user.ts @@ -1,131 +1,81 @@ import { Module, MutationTree, ActionTree, GetterTree } from 'vuex'; import { StateInterface } from 'src/store'; import { axios } from 'boot/axios'; -import { LoginData } from 'src/plugins/user/models'; import { AxiosResponse } from 'axios'; -import { LocalStorage, Loading } from 'quasar'; -import { Router } from 'src/router'; +import { SessionStorage } from 'quasar'; -export interface UserStateInterface extends LoginResponse { +export interface UserStateInterface { updateUserLoading: boolean; getUserLoading: boolean; + currentUser?: FG.User; + users: FG.User[]; } -export interface LoginResponse { - user: FG.User; - session: FG.Session; -} - -const empty_session: FG.Session = { - browser: '', - expires: new Date(), - lifetime: -1, - platform: '', - token: '' -}; - -const empty_user: FG.User = { - display_name: '', - firstname: '', - lastname: '', - mail: '', - roles: [], - userid: '' -}; - const state: UserStateInterface = { - user: empty_user, - session: empty_session, + users: [], + currentUser: SessionStorage.getItem('currentUser') || undefined, updateUserLoading: false, getUserLoading: false }; const mutations: MutationTree = { - setUser(state, data: FG.User) { - state.user = data; + setCurrentUser(state, data: FG.User) { + SessionStorage.set('currentUser', data); + state.currentUser = data; }, - setSession(state, data: FG.Session) { - state.session = data; + clearCurrentUser(state) { + SessionStorage.remove('currentUser'); + state.currentUser = undefined; + }, + setUsers(state, data: FG.User[]) { + state.users = data; }, setLoading( state, data: { key: 'updateUserLoading' | 'getUserLoading'; data: boolean } ) { state[data.key] = data.data; - }, - showState(state) { - console.log(state); } }; const actions: ActionTree = { - login({ commit }, data: LoginData) { - Loading.show({ - message: 'Du wirst eingeloggt' - }); - void axios - .post('/auth', data) - .then((response: AxiosResponse) => { - response.data.session.expires = new Date(response.data.session.expires); - commit('setUser', response.data.user); - commit('setSession', response.data.session); - commit('showState'); - LocalStorage.set('user', response.data.user); - LocalStorage.set('session', response.data.session); - - void Router.push({ name: 'user-main' }); - }) - .catch(error => { - console.exception(error); - }) - .finally(() => { - Loading.hide(); - }); + getCurrentUser({ commit, rootState }) { + if (rootState.session.currentSession) { + commit('setLoading', { key: 'getUserLoading', data: true }); + axios + .get(`/users/${rootState.session.currentSession.userid}`) + .then((response: AxiosResponse) => { + commit('setCurrentUser', response.data); + }) + .catch(err => { + console.warn(err); + }) + .finally(() => { + commit('setLoading', { key: 'getUserLoading', data: false }); + }); + } else { + console.debug('User not logged in, can not get current_user.'); + } }, - doLogout({ commit }, token: string) { - Loading.show({ message: 'Du wirst ausgeloggt' }); - void axios - .delete(`/auth/${token}`) - .then(() => { - commit('setUser', empty_user); - commit('setSession', empty_session); - }) - .finally(() => { - LocalStorage.remove('user'); - LocalStorage.remove('session'); - Loading.hide(); - }); - }, - - logout({ dispatch }, token: string) { - dispatch('doLogout', token).finally(() => { - void Router.push({ name: 'login' }); - }); - }, - - getUser({ commit, state }) { - commit('setLoading', { key: 'getUserLoading', data: true }); + getUsers({ commit }) { axios - .get(`/users/${state.user.userid}`) - .then((response: AxiosResponse) => { - commit('setUser', response.data); - LocalStorage.set('user', response.data); + .get(`/users`) + .then((response: AxiosResponse) => { + commit('setUsers', response.data); }) .catch(err => { console.warn(err); - }) - .finally(() => { - commit('setLoading', { key: 'getUserLoading', data: false }); }); }, updateUser({ commit, state, dispatch }, data) { commit('setLoading', { key: 'updateUserLoading', data: true }); + if (!state.currentUser) throw 'Not logged in'; axios - .put(`/users/${state.user.userid}`, data) + .put(`/users/${state.currentUser.userid}`, data) .then(() => { - void dispatch('getUser'); + void dispatch('getCurrentUser'); }) .catch(error => { console.log(error); @@ -133,46 +83,30 @@ const actions: ActionTree = { .finally(() => { commit('setLoading', { key: 'updateUserLoading', data: false }); }); - }, - - loadFromLocalStorage({ commit }) { - let data = LocalStorage.getItem('user'); - commit('setUser', data ? data : empty_user); - data = LocalStorage.getItem('session'); - commit('setSession', data ? data : empty_session); - commit('showState'); - }, - - setSession({ commit }, session: FG.Session) { - if (session) { - commit('setSession', session); - LocalStorage.set('session', session); - } else { - commit('setSession', empty_session); - LocalStorage.remove('session'); - } } }; const getters: GetterTree = { - user({ user }) { - return user; + currentUser({ currentUser }) { + return currentUser; }, - displayName({ user }) { - return user.display_name; - }, - session({ session }) { - return session; + users({ users }) { + return users; }, loading({ updateUserLoading, getUserLoading }) { return updateUserLoading || getUserLoading; }, - permissions({user}) { - let permissions: string[] = [] - user.roles.forEach(role => { - permissions = permissions.concat(role.permissions); - }); - return permissions + displayName({ currentUser }) { + return currentUser?.display_name; + }, + permissions({ currentUser }) { + let permissions: string[] = []; + if (currentUser) { + currentUser.roles.forEach(role => { + permissions = permissions.concat(role.permissions); + }); + } + return permissions; } }; diff --git a/src/router/routes.ts b/src/router/routes.ts index cda0866..666df2f 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -26,7 +26,7 @@ const routes: RouteConfig[] = [ { name: 'about', path: 'about', - meta: { 'permission': 'user' }, + meta: { permission: 'user' }, component: () => import('pages/about/About.vue') } ] diff --git a/src/store/index.ts b/src/store/index.ts index 51e99bc..1d59a5a 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -9,7 +9,7 @@ import { UserStateInterface } from 'src/plugins/user/store/user'; */ export interface StateInterface { user: UserStateInterface; - sessions: SessionInterface; + session: SessionInterface; } export default store(function({ Vue }) { diff --git a/src/store/store-flag.d.ts b/src/store/store-flag.d.ts index ec274bd..af80dbe 100644 --- a/src/store/store-flag.d.ts +++ b/src/store/store-flag.d.ts @@ -1,8 +1,8 @@ // THIS FEATURE-FLAG FILE IS AUTOGENERATED, // REMOVAL OR CHANGES WILL CAUSE RELATED TYPES TO STOP WORKING -import "quasar/dist/types/feature-flag"; +import 'quasar/dist/types/feature-flag'; -declare module "quasar/dist/types/feature-flag" { +declare module 'quasar/dist/types/feature-flag' { interface QuasarFeatureFlags { store: true; } From 27b34e36e2a357c672aeca7813cef370e9362ca2 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 5 Nov 2020 03:55:44 +0100 Subject: [PATCH 073/448] Added filter to format Date to string inside of templates --- quasar.conf.js | 2 +- src/boot/filter.ts | 25 +++++++++++++++++++ .../user/components/settings/Sessions.vue | 4 ++- src/plugins/user/pages/User.vue | 2 +- 4 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 src/boot/filter.ts diff --git a/quasar.conf.js b/quasar.conf.js index e13865c..33eb5d4 100644 --- a/quasar.conf.js +++ b/quasar.conf.js @@ -24,7 +24,7 @@ module.exports = configure(function(ctx) { // app boot file (/src/boot) // --> boot files are part of "main.js" // https://quasar.dev/quasar-cli/boot-files - boot: ['composition-api', 'axios', 'login', 'plugins', 'loading'], + boot: ['composition-api', 'axios', 'filter', 'login', 'plugins', 'loading'], // https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css css: ['app.scss'], diff --git a/src/boot/filter.ts b/src/boot/filter.ts new file mode 100644 index 0000000..6ae748e --- /dev/null +++ b/src/boot/filter.ts @@ -0,0 +1,25 @@ +import { boot } from 'quasar/wrappers'; + +export default boot(({ Vue }) => { + function formatDate(date: Date) { + let d = date.getDate().toString(); + if (d.length == 1) d = '0' + d; + let m = date.getMonth().toString(); + if (m.length == 1) m = '0' + m; + return `${d}.${m}.${date.getFullYear().toString()}`; + } + + Vue.filter('date', formatDate); + + Vue.filter('dateTime', function(date: Date, seconds = false) { + let H = date.getHours().toString(); + if (H.length == 1) H = `0${H}`; + let M = date.getMinutes().toString(); + if (M.length == 1) M = `0${M}`; + let S = '' + if (seconds) { + S = ':' + (date.getSeconds() > 9 ? date.getSeconds().toString() : `0${date.getSeconds().toString()}`); + } + return `${H}:${M}${S} ${formatDate(date)}`; + }); +}); diff --git a/src/plugins/user/components/settings/Sessions.vue b/src/plugins/user/components/settings/Sessions.vue index d06a53a..361bccf 100644 --- a/src/plugins/user/components/settings/Sessions.vue +++ b/src/plugins/user/components/settings/Sessions.vue @@ -21,7 +21,9 @@ Lebenszeit: {{ session.lifetime }} -
Läuft aus: {{ session.expires }}
+
+ Läuft aus: {{ session.expires | dateTime(true) }} +
diff --git a/src/plugins/user/pages/User.vue b/src/plugins/user/pages/User.vue index 1dde46e..fe57f56 100644 --- a/src/plugins/user/pages/User.vue +++ b/src/plugins/user/pages/User.vue @@ -10,7 +10,7 @@
  • {{ role }}

  • - Token expires: {{ sessionObj.expires }} + Token expires: {{ sessionObj.expires | dateTime }} From 1d598b578724b1ba324f5ff63c9762b1f2882523 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 6 Nov 2020 01:09:03 +0100 Subject: [PATCH 074/448] Update dependencies --- package-lock.json | 6790 +++++++++++++++++++++++---------------------- package.json | 14 +- 2 files changed, 3551 insertions(+), 3253 deletions(-) diff --git a/package-lock.json b/package-lock.json index dd37519..4ffac81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,52 +10,84 @@ "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", "dev": true, "requires": { - "@babel/highlight": "7.10.4" + "@babel/highlight": "^7.10.4" } }, "@babel/compat-data": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz", - "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==", - "dev": true, - "requires": { - "browserslist": "4.14.5", - "invariant": "2.2.4", - "semver": "5.7.1" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } - } + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz", + "integrity": "sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==", + "dev": true }, "@babel/core": { - "version": "7.11.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz", - "integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==", + "version": "7.12.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz", + "integrity": "sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==", "dev": true, "requires": { - "@babel/code-frame": "7.10.4", - "@babel/generator": "7.11.6", - "@babel/helper-module-transforms": "7.11.0", - "@babel/helpers": "7.10.4", - "@babel/parser": "7.11.5", - "@babel/template": "7.10.4", - "@babel/traverse": "7.11.5", - "@babel/types": "7.11.5", - "convert-source-map": "1.7.0", - "debug": "4.2.0", - "gensync": "1.0.0-beta.1", - "json5": "2.1.3", - "lodash": "4.17.20", - "resolve": "1.17.0", - "semver": "5.7.1", - "source-map": "0.5.7" + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.1", + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helpers": "^7.12.1", + "@babel/parser": "^7.12.3", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.12.1", + "@babel/types": "^7.12.1", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.19", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" }, "dependencies": { + "@babel/generator": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz", + "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==", + "dev": true, + "requires": { + "@babel/types": "^7.12.5", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/parser": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", + "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", + "dev": true + }, + "@babel/traverse": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", + "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.12.5", + "@babel/types": "^7.12.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, "debug": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", @@ -85,9 +117,9 @@ "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==", "dev": true, "requires": { - "@babel/types": "7.11.5", - "jsesc": "2.5.2", - "source-map": "0.5.7" + "@babel/types": "^7.11.5", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" } }, "@babel/helper-annotate-as-pure": { @@ -96,7 +128,7 @@ "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.10.4" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { @@ -105,21 +137,20 @@ "integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==", "dev": true, "requires": { - "@babel/helper-explode-assignable-expression": "7.11.4", - "@babel/types": "7.11.5" + "@babel/helper-explode-assignable-expression": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-compilation-targets": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz", - "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz", + "integrity": "sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==", "dev": true, "requires": { - "@babel/compat-data": "7.11.0", - "browserslist": "4.14.5", - "invariant": "2.2.4", - "levenary": "1.1.1", - "semver": "5.7.1" + "@babel/compat-data": "^7.12.5", + "@babel/helper-validator-option": "^7.12.1", + "browserslist": "^4.14.5", + "semver": "^5.5.0" }, "dependencies": { "semver": { @@ -131,28 +162,27 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz", - "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz", + "integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==", "dev": true, "requires": { - "@babel/helper-function-name": "7.10.4", - "@babel/helper-member-expression-to-functions": "7.11.0", - "@babel/helper-optimise-call-expression": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-replace-supers": "7.10.4", - "@babel/helper-split-export-declaration": "7.11.0" + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-member-expression-to-functions": "^7.12.1", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/helper-replace-supers": "^7.12.1", + "@babel/helper-split-export-declaration": "^7.10.4" } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz", - "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz", + "integrity": "sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "7.10.4", - "@babel/helper-regex": "7.10.5", - "regexpu-core": "4.7.1" + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-regex": "^7.10.4", + "regexpu-core": "^4.7.1" } }, "@babel/helper-define-map": { @@ -161,18 +191,31 @@ "integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==", "dev": true, "requires": { - "@babel/helper-function-name": "7.10.4", - "@babel/types": "7.11.5", - "lodash": "4.17.20" + "@babel/helper-function-name": "^7.10.4", + "@babel/types": "^7.10.5", + "lodash": "^4.17.19" } }, "@babel/helper-explode-assignable-expression": { - "version": "7.11.4", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz", - "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz", + "integrity": "sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.12.1" + }, + "dependencies": { + "@babel/types": { + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-function-name": { @@ -181,9 +224,9 @@ "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "7.10.4", - "@babel/template": "7.10.4", - "@babel/types": "7.11.5" + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helper-get-function-arity": { @@ -192,7 +235,7 @@ "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.10.4" } }, "@babel/helper-hoist-variables": { @@ -201,40 +244,130 @@ "integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.10.4" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz", - "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz", + "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.12.1" + }, + "dependencies": { + "@babel/types": { + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-module-imports": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz", - "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz", + "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.12.5" + }, + "dependencies": { + "@babel/types": { + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-module-transforms": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz", - "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz", + "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==", "dev": true, "requires": { - "@babel/helper-module-imports": "7.10.4", - "@babel/helper-replace-supers": "7.10.4", - "@babel/helper-simple-access": "7.10.4", - "@babel/helper-split-export-declaration": "7.11.0", - "@babel/template": "7.10.4", - "@babel/types": "7.11.5", - "lodash": "4.17.20" + "@babel/helper-module-imports": "^7.12.1", + "@babel/helper-replace-supers": "^7.12.1", + "@babel/helper-simple-access": "^7.12.1", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/helper-validator-identifier": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.12.1", + "@babel/types": "^7.12.1", + "lodash": "^4.17.19" + }, + "dependencies": { + "@babel/generator": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz", + "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==", + "dev": true, + "requires": { + "@babel/types": "^7.12.5", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/parser": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", + "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", + "dev": true + }, + "@babel/traverse": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", + "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.12.5", + "@babel/types": "^7.12.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "@babel/helper-optimise-call-expression": { @@ -243,7 +376,7 @@ "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.10.4" } }, "@babel/helper-plugin-utils": { @@ -258,50 +391,149 @@ "integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==", "dev": true, "requires": { - "lodash": "4.17.20" + "lodash": "^4.17.19" } }, "@babel/helper-remap-async-to-generator": { - "version": "7.11.4", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz", - "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz", + "integrity": "sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "7.10.4", - "@babel/helper-wrap-function": "7.10.4", - "@babel/template": "7.10.4", - "@babel/types": "7.11.5" + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-wrap-function": "^7.10.4", + "@babel/types": "^7.12.1" + }, + "dependencies": { + "@babel/types": { + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-replace-supers": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz", - "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz", + "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "7.11.0", - "@babel/helper-optimise-call-expression": "7.10.4", - "@babel/traverse": "7.11.5", - "@babel/types": "7.11.5" + "@babel/helper-member-expression-to-functions": "^7.12.1", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/traverse": "^7.12.5", + "@babel/types": "^7.12.5" + }, + "dependencies": { + "@babel/generator": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz", + "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==", + "dev": true, + "requires": { + "@babel/types": "^7.12.5", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/parser": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", + "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", + "dev": true + }, + "@babel/traverse": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", + "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.12.5", + "@babel/types": "^7.12.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "@babel/helper-simple-access": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz", - "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz", + "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==", "dev": true, "requires": { - "@babel/template": "7.10.4", - "@babel/types": "7.11.5" + "@babel/types": "^7.12.1" + }, + "dependencies": { + "@babel/types": { + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz", - "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz", + "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.12.1" + }, + "dependencies": { + "@babel/types": { + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/helper-split-export-declaration": { @@ -310,7 +542,7 @@ "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", "dev": true, "requires": { - "@babel/types": "7.11.5" + "@babel/types": "^7.11.0" } }, "@babel/helper-validator-identifier": { @@ -319,27 +551,95 @@ "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==", "dev": true }, + "@babel/helper-validator-option": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz", + "integrity": "sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==", + "dev": true + }, "@babel/helper-wrap-function": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz", - "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==", + "version": "7.12.3", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz", + "integrity": "sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==", "dev": true, "requires": { - "@babel/helper-function-name": "7.10.4", - "@babel/template": "7.10.4", - "@babel/traverse": "7.11.5", - "@babel/types": "7.11.5" + "@babel/helper-function-name": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/helpers": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz", - "integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz", + "integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==", "dev": true, "requires": { - "@babel/template": "7.10.4", - "@babel/traverse": "7.11.5", - "@babel/types": "7.11.5" + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.12.5", + "@babel/types": "^7.12.5" + }, + "dependencies": { + "@babel/generator": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz", + "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==", + "dev": true, + "requires": { + "@babel/types": "^7.12.5", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + } + }, + "@babel/parser": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", + "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==", + "dev": true + }, + "@babel/traverse": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", + "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.12.5", + "@babel/types": "^7.12.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + } + }, + "@babel/types": { + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "@babel/highlight": { @@ -348,9 +648,9 @@ "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "7.10.4", - "chalk": "2.4.2", - "js-tokens": "4.0.0" + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" }, "dependencies": { "chalk": { @@ -359,9 +659,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -373,168 +673,168 @@ "dev": true }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz", - "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz", + "integrity": "sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-remap-async-to-generator": "7.11.4", - "@babel/plugin-syntax-async-generators": "7.8.4" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-remap-async-to-generator": "^7.12.1", + "@babel/plugin-syntax-async-generators": "^7.8.0" } }, "@babel/plugin-proposal-class-properties": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz", - "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz", + "integrity": "sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "7.10.5", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-create-class-features-plugin": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-proposal-decorators": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.5.tgz", - "integrity": "sha512-Sc5TAQSZuLzgY0664mMDn24Vw2P8g/VhyLyGPaWiHahhgLqeZvcGeyBZOrJW0oSKIK2mvQ22a1ENXBIQLhrEiQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.1.tgz", + "integrity": "sha512-knNIuusychgYN8fGJHONL0RbFxLGawhXOJNLBk75TniTsZZeA+wdkDuv6wp4lGwzQEKjZi6/WYtnb3udNPmQmQ==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "7.10.5", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-decorators": "7.10.4" + "@babel/helper-create-class-features-plugin": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-decorators": "^7.12.1" } }, "@babel/plugin-proposal-dynamic-import": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz", - "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz", + "integrity": "sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-dynamic-import": "7.8.3" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-dynamic-import": "^7.8.0" } }, "@babel/plugin-proposal-export-namespace-from": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz", - "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz", + "integrity": "sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-export-namespace-from": "7.8.3" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3" } }, "@babel/plugin-proposal-function-sent": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.10.4.tgz", - "integrity": "sha512-aBtve/DhQsVPAGnSDcgt33gF36rO0TK+KtHp9Hwtj3KwH+o1Cii9vfVVYeB9c6Jo1SXOgTRwRD7ljpTS0qbN8w==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-function-sent/-/plugin-proposal-function-sent-7.12.1.tgz", + "integrity": "sha512-EXB01ACyNW0WCffP4ip40TH82X86+U0dakFZjyiMpoZ8NFmL5MMARzVBzy+Gg59B6vTgfvIhRHUhe6tNUw+vjw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-wrap-function": "7.10.4", - "@babel/plugin-syntax-function-sent": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-wrap-function": "^7.10.4", + "@babel/plugin-syntax-function-sent": "^7.12.1" } }, "@babel/plugin-proposal-json-strings": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz", - "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz", + "integrity": "sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-json-strings": "7.8.3" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-json-strings": "^7.8.0" } }, "@babel/plugin-proposal-logical-assignment-operators": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz", - "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz", + "integrity": "sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-logical-assignment-operators": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" } }, "@babel/plugin-proposal-nullish-coalescing-operator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz", - "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz", + "integrity": "sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "7.8.3" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0" } }, "@babel/plugin-proposal-numeric-separator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz", - "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz", + "integrity": "sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-numeric-separator": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz", - "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz", + "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-object-rest-spread": "7.8.3", - "@babel/plugin-transform-parameters": "7.10.5" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-transform-parameters": "^7.12.1" } }, "@babel/plugin-proposal-optional-catch-binding": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz", - "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz", + "integrity": "sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-optional-catch-binding": "7.8.3" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0" } }, "@babel/plugin-proposal-optional-chaining": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz", - "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz", + "integrity": "sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "7.11.0", - "@babel/plugin-syntax-optional-chaining": "7.8.3" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1", + "@babel/plugin-syntax-optional-chaining": "^7.8.0" } }, "@babel/plugin-proposal-private-methods": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz", - "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz", + "integrity": "sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "7.10.5", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-create-class-features-plugin": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-proposal-throw-expressions": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.10.4.tgz", - "integrity": "sha512-m7K9duXeH/rko36i9G9seLOg2AVdeVTn65k8nnTxgozex0hkDSUr6cktJxTO7jElGEpmMz410pTs0Jn8+empxw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-throw-expressions/-/plugin-proposal-throw-expressions-7.12.1.tgz", + "integrity": "sha512-kiWkKtm05K86C+T/nUazv+/Vxu93Aulrvof/ZrxVyGoUBVsVEWDrw9iChbe8tV+aPVQcjg4FQxKW3wUF7cRcpg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-syntax-throw-expressions": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/plugin-syntax-throw-expressions": "^7.12.1" } }, "@babel/plugin-proposal-unicode-property-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz", - "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz", + "integrity": "sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-async-generators": { @@ -543,25 +843,25 @@ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-class-properties": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz", - "integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz", + "integrity": "sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-decorators": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz", - "integrity": "sha512-2NaoC6fAk2VMdhY1eerkfHV+lVYC1u8b+jmRJISqANCJlTxYy19HGdIkkQtix2UtkcPuPu+IlDgrVseZnU03bw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz", + "integrity": "sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-dynamic-import": { @@ -570,7 +870,7 @@ "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-export-namespace-from": { @@ -579,16 +879,16 @@ "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.3" } }, "@babel/plugin-syntax-function-sent": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.10.4.tgz", - "integrity": "sha512-dwElaRoDQhlVevbgKOlEUTe08QNJo4ZjWw3rqnMbEvH8NRJM+iPN2tTQtzyfNloXD8f3Jdiyf5Pn400B1U3SVA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-function-sent/-/plugin-syntax-function-sent-7.12.1.tgz", + "integrity": "sha512-mtBQvNHcIzLnmQZhgzigzrgFzIe95WvBXJuTN0m4CvhDK0gRNQ2MC2AVSzB6w7VnVh/z5+0iHFcbfqKMlFwTkQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-import-meta": { @@ -597,7 +897,7 @@ "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-json-strings": { @@ -606,7 +906,7 @@ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-logical-assignment-operators": { @@ -615,7 +915,7 @@ "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-nullish-coalescing-operator": { @@ -624,7 +924,7 @@ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-numeric-separator": { @@ -633,7 +933,7 @@ "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-object-rest-spread": { @@ -642,7 +942,7 @@ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-optional-catch-binding": { @@ -651,7 +951,7 @@ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-optional-chaining": { @@ -660,285 +960,285 @@ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.8.0" } }, "@babel/plugin-syntax-throw-expressions": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.10.4.tgz", - "integrity": "sha512-Yac/4W71+JdAiOV3aLbnUUe2R0NZzNvdy5EqdauFnBQTxIXT58M89lOplIFVELTSus6PxFMjmbi2vXaJDiV/PQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-throw-expressions/-/plugin-syntax-throw-expressions-7.12.1.tgz", + "integrity": "sha512-+8FLGK1PYYB7D8tU9U5zX23fnzkpxw4a7lAyyZbgk6b6bN0k2dft/xwcxIE+86i54wLJ83BaAboh2Ow6wf6jHw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-syntax-top-level-await": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz", - "integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz", + "integrity": "sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-arrow-functions": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz", - "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz", + "integrity": "sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-async-to-generator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz", - "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz", + "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==", "dev": true, "requires": { - "@babel/helper-module-imports": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-remap-async-to-generator": "7.11.4" + "@babel/helper-module-imports": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-remap-async-to-generator": "^7.12.1" } }, "@babel/plugin-transform-block-scoped-functions": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz", - "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz", + "integrity": "sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-block-scoping": { - "version": "7.11.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz", - "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz", + "integrity": "sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-classes": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz", - "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz", + "integrity": "sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "7.10.4", - "@babel/helper-define-map": "7.10.5", - "@babel/helper-function-name": "7.10.4", - "@babel/helper-optimise-call-expression": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-replace-supers": "7.10.4", - "@babel/helper-split-export-declaration": "7.11.0", - "globals": "11.12.0" + "@babel/helper-annotate-as-pure": "^7.10.4", + "@babel/helper-define-map": "^7.10.4", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-replace-supers": "^7.12.1", + "@babel/helper-split-export-declaration": "^7.10.4", + "globals": "^11.1.0" } }, "@babel/plugin-transform-computed-properties": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz", - "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz", + "integrity": "sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-destructuring": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz", - "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz", + "integrity": "sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-dotall-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz", - "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz", + "integrity": "sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-duplicate-keys": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz", - "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz", + "integrity": "sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-exponentiation-operator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz", - "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz", + "integrity": "sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==", "dev": true, "requires": { - "@babel/helper-builder-binary-assignment-operator-visitor": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-for-of": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz", - "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz", + "integrity": "sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-function-name": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz", - "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz", + "integrity": "sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==", "dev": true, "requires": { - "@babel/helper-function-name": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-literals": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz", - "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz", + "integrity": "sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-member-expression-literals": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz", - "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz", + "integrity": "sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-modules-amd": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz", - "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz", + "integrity": "sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==", "dev": true, "requires": { - "@babel/helper-module-transforms": "7.11.0", - "@babel/helper-plugin-utils": "7.10.4", - "babel-plugin-dynamic-import-node": "2.3.3" + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4", + "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz", - "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz", + "integrity": "sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==", "dev": true, "requires": { - "@babel/helper-module-transforms": "7.11.0", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-simple-access": "7.10.4", - "babel-plugin-dynamic-import-node": "2.3.3" + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-simple-access": "^7.12.1", + "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz", - "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz", + "integrity": "sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "7.10.4", - "@babel/helper-module-transforms": "7.11.0", - "@babel/helper-plugin-utils": "7.10.4", - "babel-plugin-dynamic-import-node": "2.3.3" + "@babel/helper-hoist-variables": "^7.10.4", + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-validator-identifier": "^7.10.4", + "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-umd": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz", - "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz", + "integrity": "sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==", "dev": true, "requires": { - "@babel/helper-module-transforms": "7.11.0", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz", - "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz", + "integrity": "sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.12.1" } }, "@babel/plugin-transform-new-target": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz", - "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz", + "integrity": "sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-object-super": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz", - "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz", + "integrity": "sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-replace-supers": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-replace-supers": "^7.12.1" } }, "@babel/plugin-transform-parameters": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz", - "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz", + "integrity": "sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-property-literals": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz", - "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz", + "integrity": "sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-regenerator": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz", - "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz", + "integrity": "sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==", "dev": true, "requires": { - "regenerator-transform": "0.14.5" + "regenerator-transform": "^0.14.2" } }, "@babel/plugin-transform-reserved-words": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz", - "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz", + "integrity": "sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-runtime": { - "version": "7.11.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.11.5.tgz", - "integrity": "sha512-9aIoee+EhjySZ6vY5hnLjigHzunBlscx9ANKutkeWTJTx6m5Rbq6Ic01tLvO54lSusR+BxV7u4UDdCmXv5aagg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.1.tgz", + "integrity": "sha512-Ac/H6G9FEIkS2tXsZjL4RAdS3L3WHxci0usAnz7laPWUmFiGtj7tIASChqKZMHTSQTQY6xDbOq+V1/vIq3QrWg==", "dev": true, "requires": { - "@babel/helper-module-imports": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4", - "resolve": "1.17.0", - "semver": "5.7.1" + "@babel/helper-module-imports": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4", + "resolve": "^1.8.1", + "semver": "^5.5.1" }, "dependencies": { "semver": { @@ -950,148 +1250,156 @@ } }, "@babel/plugin-transform-shorthand-properties": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz", - "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz", + "integrity": "sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-spread": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz", - "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz", + "integrity": "sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-skip-transparent-expression-wrappers": "7.11.0" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1" } }, "@babel/plugin-transform-sticky-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz", - "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz", + "integrity": "sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/helper-regex": "7.10.5" + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-regex": "^7.10.4" } }, "@babel/plugin-transform-template-literals": { - "version": "7.10.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz", - "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz", + "integrity": "sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-typeof-symbol": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz", - "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz", + "integrity": "sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-unicode-escapes": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz", - "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz", + "integrity": "sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/plugin-transform-unicode-regex": { - "version": "7.10.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz", - "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz", + "integrity": "sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4" + "@babel/helper-create-regexp-features-plugin": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4" } }, "@babel/preset-env": { - "version": "7.11.5", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz", - "integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==", + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz", + "integrity": "sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==", "dev": true, "requires": { - "@babel/compat-data": "7.11.0", - "@babel/helper-compilation-targets": "7.10.4", - "@babel/helper-module-imports": "7.10.4", - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-proposal-async-generator-functions": "7.10.5", - "@babel/plugin-proposal-class-properties": "7.10.4", - "@babel/plugin-proposal-dynamic-import": "7.10.4", - "@babel/plugin-proposal-export-namespace-from": "7.10.4", - "@babel/plugin-proposal-json-strings": "7.10.4", - "@babel/plugin-proposal-logical-assignment-operators": "7.11.0", - "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.4", - "@babel/plugin-proposal-numeric-separator": "7.10.4", - "@babel/plugin-proposal-object-rest-spread": "7.11.0", - "@babel/plugin-proposal-optional-catch-binding": "7.10.4", - "@babel/plugin-proposal-optional-chaining": "7.11.0", - "@babel/plugin-proposal-private-methods": "7.10.4", - "@babel/plugin-proposal-unicode-property-regex": "7.10.4", - "@babel/plugin-syntax-async-generators": "7.8.4", - "@babel/plugin-syntax-class-properties": "7.10.4", - "@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", - "@babel/plugin-syntax-logical-assignment-operators": "7.10.4", - "@babel/plugin-syntax-nullish-coalescing-operator": "7.8.3", - "@babel/plugin-syntax-numeric-separator": "7.10.4", - "@babel/plugin-syntax-object-rest-spread": "7.8.3", - "@babel/plugin-syntax-optional-catch-binding": "7.8.3", - "@babel/plugin-syntax-optional-chaining": "7.8.3", - "@babel/plugin-syntax-top-level-await": "7.10.4", - "@babel/plugin-transform-arrow-functions": "7.10.4", - "@babel/plugin-transform-async-to-generator": "7.10.4", - "@babel/plugin-transform-block-scoped-functions": "7.10.4", - "@babel/plugin-transform-block-scoping": "7.11.1", - "@babel/plugin-transform-classes": "7.10.4", - "@babel/plugin-transform-computed-properties": "7.10.4", - "@babel/plugin-transform-destructuring": "7.10.4", - "@babel/plugin-transform-dotall-regex": "7.10.4", - "@babel/plugin-transform-duplicate-keys": "7.10.4", - "@babel/plugin-transform-exponentiation-operator": "7.10.4", - "@babel/plugin-transform-for-of": "7.10.4", - "@babel/plugin-transform-function-name": "7.10.4", - "@babel/plugin-transform-literals": "7.10.4", - "@babel/plugin-transform-member-expression-literals": "7.10.4", - "@babel/plugin-transform-modules-amd": "7.10.5", - "@babel/plugin-transform-modules-commonjs": "7.10.4", - "@babel/plugin-transform-modules-systemjs": "7.10.5", - "@babel/plugin-transform-modules-umd": "7.10.4", - "@babel/plugin-transform-named-capturing-groups-regex": "7.10.4", - "@babel/plugin-transform-new-target": "7.10.4", - "@babel/plugin-transform-object-super": "7.10.4", - "@babel/plugin-transform-parameters": "7.10.5", - "@babel/plugin-transform-property-literals": "7.10.4", - "@babel/plugin-transform-regenerator": "7.10.4", - "@babel/plugin-transform-reserved-words": "7.10.4", - "@babel/plugin-transform-shorthand-properties": "7.10.4", - "@babel/plugin-transform-spread": "7.11.0", - "@babel/plugin-transform-sticky-regex": "7.10.4", - "@babel/plugin-transform-template-literals": "7.10.5", - "@babel/plugin-transform-typeof-symbol": "7.10.4", - "@babel/plugin-transform-unicode-escapes": "7.10.4", - "@babel/plugin-transform-unicode-regex": "7.10.4", - "@babel/preset-modules": "0.1.4", - "@babel/types": "7.11.5", - "browserslist": "4.14.5", - "core-js-compat": "3.6.5", - "invariant": "2.2.4", - "levenary": "1.1.1", - "semver": "5.7.1" + "@babel/compat-data": "^7.12.1", + "@babel/helper-compilation-targets": "^7.12.1", + "@babel/helper-module-imports": "^7.12.1", + "@babel/helper-plugin-utils": "^7.10.4", + "@babel/helper-validator-option": "^7.12.1", + "@babel/plugin-proposal-async-generator-functions": "^7.12.1", + "@babel/plugin-proposal-class-properties": "^7.12.1", + "@babel/plugin-proposal-dynamic-import": "^7.12.1", + "@babel/plugin-proposal-export-namespace-from": "^7.12.1", + "@babel/plugin-proposal-json-strings": "^7.12.1", + "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1", + "@babel/plugin-proposal-numeric-separator": "^7.12.1", + "@babel/plugin-proposal-object-rest-spread": "^7.12.1", + "@babel/plugin-proposal-optional-catch-binding": "^7.12.1", + "@babel/plugin-proposal-optional-chaining": "^7.12.1", + "@babel/plugin-proposal-private-methods": "^7.12.1", + "@babel/plugin-proposal-unicode-property-regex": "^7.12.1", + "@babel/plugin-syntax-async-generators": "^7.8.0", + "@babel/plugin-syntax-class-properties": "^7.12.1", + "@babel/plugin-syntax-dynamic-import": "^7.8.0", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.0", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.0", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.0", + "@babel/plugin-syntax-optional-chaining": "^7.8.0", + "@babel/plugin-syntax-top-level-await": "^7.12.1", + "@babel/plugin-transform-arrow-functions": "^7.12.1", + "@babel/plugin-transform-async-to-generator": "^7.12.1", + "@babel/plugin-transform-block-scoped-functions": "^7.12.1", + "@babel/plugin-transform-block-scoping": "^7.12.1", + "@babel/plugin-transform-classes": "^7.12.1", + "@babel/plugin-transform-computed-properties": "^7.12.1", + "@babel/plugin-transform-destructuring": "^7.12.1", + "@babel/plugin-transform-dotall-regex": "^7.12.1", + "@babel/plugin-transform-duplicate-keys": "^7.12.1", + "@babel/plugin-transform-exponentiation-operator": "^7.12.1", + "@babel/plugin-transform-for-of": "^7.12.1", + "@babel/plugin-transform-function-name": "^7.12.1", + "@babel/plugin-transform-literals": "^7.12.1", + "@babel/plugin-transform-member-expression-literals": "^7.12.1", + "@babel/plugin-transform-modules-amd": "^7.12.1", + "@babel/plugin-transform-modules-commonjs": "^7.12.1", + "@babel/plugin-transform-modules-systemjs": "^7.12.1", + "@babel/plugin-transform-modules-umd": "^7.12.1", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1", + "@babel/plugin-transform-new-target": "^7.12.1", + "@babel/plugin-transform-object-super": "^7.12.1", + "@babel/plugin-transform-parameters": "^7.12.1", + "@babel/plugin-transform-property-literals": "^7.12.1", + "@babel/plugin-transform-regenerator": "^7.12.1", + "@babel/plugin-transform-reserved-words": "^7.12.1", + "@babel/plugin-transform-shorthand-properties": "^7.12.1", + "@babel/plugin-transform-spread": "^7.12.1", + "@babel/plugin-transform-sticky-regex": "^7.12.1", + "@babel/plugin-transform-template-literals": "^7.12.1", + "@babel/plugin-transform-typeof-symbol": "^7.12.1", + "@babel/plugin-transform-unicode-escapes": "^7.12.1", + "@babel/plugin-transform-unicode-regex": "^7.12.1", + "@babel/preset-modules": "^0.1.3", + "@babel/types": "^7.12.1", + "core-js-compat": "^3.6.2", + "semver": "^5.5.0" }, "dependencies": { + "@babel/types": { + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -1106,20 +1414,20 @@ "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "7.10.4", - "@babel/plugin-proposal-unicode-property-regex": "7.10.4", - "@babel/plugin-transform-dotall-regex": "7.10.4", - "@babel/types": "7.11.5", - "esutils": "2.0.3" + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/plugin-proposal-unicode-property-regex": "^7.4.4", + "@babel/plugin-transform-dotall-regex": "^7.4.4", + "@babel/types": "^7.4.4", + "esutils": "^2.0.2" } }, "@babel/runtime": { - "version": "7.11.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz", - "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==", + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz", + "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==", "dev": true, "requires": { - "regenerator-runtime": "0.13.7" + "regenerator-runtime": "^0.13.4" } }, "@babel/template": { @@ -1128,9 +1436,9 @@ "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", "dev": true, "requires": { - "@babel/code-frame": "7.10.4", - "@babel/parser": "7.11.5", - "@babel/types": "7.11.5" + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.10.4", + "@babel/types": "^7.10.4" } }, "@babel/traverse": { @@ -1139,15 +1447,15 @@ "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==", "dev": true, "requires": { - "@babel/code-frame": "7.10.4", - "@babel/generator": "7.11.6", - "@babel/helper-function-name": "7.10.4", - "@babel/helper-split-export-declaration": "7.11.0", - "@babel/parser": "7.11.5", - "@babel/types": "7.11.5", - "debug": "4.2.0", - "globals": "11.12.0", - "lodash": "4.17.20" + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.11.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.11.5", + "@babel/types": "^7.11.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" }, "dependencies": { "debug": { @@ -1173,9 +1481,9 @@ "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==", "dev": true, "requires": { - "@babel/helper-validator-identifier": "7.10.4", - "lodash": "4.17.20", - "to-fast-properties": "2.0.0" + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" } }, "@electron/get": { @@ -1184,15 +1492,15 @@ "integrity": "sha512-vAuHUbfvBQpYTJ5wB7uVIDq5c/Ry0fiTBMs7lnEYAo/qXXppIVcWdfBr57u6eRnKdVso7KSiH6p/LbQAG6Izrg==", "dev": true, "requires": { - "debug": "4.2.0", - "env-paths": "2.2.0", - "fs-extra": "8.1.0", - "global-agent": "2.1.12", - "global-tunnel-ng": "2.7.1", - "got": "9.6.0", - "progress": "2.0.3", - "sanitize-filename": "1.6.3", - "sumchecker": "3.0.1" + "debug": "^4.1.1", + "env-paths": "^2.2.0", + "fs-extra": "^8.1.0", + "global-agent": "^2.0.2", + "global-tunnel-ng": "^2.7.1", + "got": "^9.6.0", + "progress": "^2.0.3", + "sanitize-filename": "^1.6.2", + "sumchecker": "^3.0.1" }, "dependencies": { "debug": { @@ -1210,9 +1518,9 @@ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "ms": { @@ -1230,7 +1538,7 @@ "dev": true, "requires": { "@nodelib/fs.stat": "2.0.3", - "run-parallel": "1.1.9" + "run-parallel": "^1.1.9" } }, "@nodelib/fs.stat": { @@ -1246,7 +1554,7 @@ "dev": true, "requires": { "@nodelib/fs.scandir": "2.1.3", - "fastq": "1.8.0" + "fastq": "^1.6.0" } }, "@npmcli/move-file": { @@ -1255,7 +1563,7 @@ "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==", "dev": true, "requires": { - "mkdirp": "1.0.4" + "mkdirp": "^1.0.4" }, "dependencies": { "mkdirp": { @@ -1273,9 +1581,9 @@ "dev": true }, "@quasar/app": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@quasar/app/-/app-2.1.0.tgz", - "integrity": "sha512-f9ij7MU9DgckY+2IoDFQwZNpqGqD2dv+FZAy4kb/aqBKomsnVzSboGiw6eGwYWSMA5ODYFrJwMWSA9546hjU7Q==", + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@quasar/app/-/app-2.1.6.tgz", + "integrity": "sha512-d7BykD1e2OMMSGlw/b+ddC/s3L5p4nb5mMIwcIKBzRC2l6TqMA1e3FAWLcshfpo4Ciim3hWUmCjJ67sJQT0nYg==", "dev": true, "requires": { "@quasar/babel-preset-app": "2.0.1", @@ -1288,27 +1596,27 @@ "@types/webpack": "4.41.17", "@types/webpack-bundle-analyzer": "3.8.0", "@types/webpack-dev-server": "3.11.0", - "archiver": "5.0.0", + "archiver": "5.0.2", "autoprefixer": "9.8.6", - "browserslist": "4.14.5", + "browserslist": "^4.12.0", "chalk": "4.1.0", "chokidar": "3.4.2", "ci-info": "2.0.0", "compression-webpack-plugin": "5.0.1", - "copy-webpack-plugin": "6.0.3", + "copy-webpack-plugin": "6.1.1", "cross-spawn": "7.0.3", "css-loader": "3.6.0", "cssnano": "4.1.10", - "dot-prop": "5.2.0", + "dot-prop": "5.3.0", "elementtree": "0.1.7", "express": "4.17.1", "fast-glob": "3.2.4", - "file-loader": "6.0.0", + "file-loader": "6.1.0", "fork-ts-checker-webpack-plugin": "4.1.6", "friendly-errors-webpack-plugin": "1.7.0", "fs-extra": "9.0.1", "html-minifier": "4.0.0", - "html-webpack-plugin": "4.3.0", + "html-webpack-plugin": "4.5.0", "inquirer": "7.3.3", "isbinaryfile": "4.0.6", "launch-editor-middleware": "2.2.1", @@ -1318,12 +1626,12 @@ "log-update": "4.0.0", "lru-cache": "6.0.0", "memory-fs": "0.5.0", - "mini-css-extract-plugin": "0.10.0", + "mini-css-extract-plugin": "0.11.2", "minimist": "1.2.5", "node-loader": "1.0.1", "node-sass": "4.14.1", "open": "7.1.0", - "optimize-css-assets-webpack-plugin": "5.0.3", + "optimize-css-assets-webpack-plugin": "5.0.4", "ouch": "2.0.0", "postcss-loader": "3.0.0", "postcss-rtl": "1.7.3", @@ -1334,8 +1642,8 @@ "strip-ansi": "6.0.0", "stylus": "0.54.8", "stylus-loader": "3.0.2", - "table": "5.4.6", - "terser-webpack-plugin": "4.1.0", + "table": "6.0.3", + "terser-webpack-plugin": "4.2.2", "ts-loader": "7.0.5", "typescript": "3.9.5", "url-loader": "4.1.0", @@ -1346,12 +1654,12 @@ "vue-style-loader": "4.1.2", "vue-template-compiler": "2.6.12", "vuex": "3.5.1", - "webpack": "4.44.1", - "webpack-bundle-analyzer": "3.8.0", + "webpack": "4.44.2", + "webpack-bundle-analyzer": "3.9.0", "webpack-chain": "6.5.1", "webpack-dev-server": "3.11.0", "webpack-merge": "4.2.2", - "webpack-node-externals": "2.5.1", + "webpack-node-externals": "2.5.2", "write-file-webpack-plugin": "4.5.1", "yargs": "15.4.1", "zlib": "1.0.5" @@ -1363,20 +1671,49 @@ "integrity": "sha512-6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw==", "dev": true, "requires": { - "@types/anymatch": "1.3.1", - "@types/node": "10.17.35", - "@types/tapable": "1.0.6", - "@types/uglify-js": "3.11.0", - "@types/webpack-sources": "2.0.0", - "source-map": "0.6.1" + "@types/anymatch": "*", + "@types/node": "*", + "@types/tapable": "*", + "@types/uglify-js": "*", + "@types/webpack-sources": "*", + "source-map": "^0.6.0" } }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, + "string-width": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", + "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" + } + }, + "table": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/table/-/table-6.0.3.tgz", + "integrity": "sha512-8321ZMcf1B9HvVX/btKv8mMZahCjn2aYrDlpqHaBFCfnox64edeH9kEid0vTLTRR8gWR2A20aDgeuTTea4sVtw==", + "dev": true, + "requires": { + "ajv": "^6.12.4", + "lodash": "^4.17.20", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.0" + } + }, "typescript": { "version": "3.9.5", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz", @@ -1391,32 +1728,32 @@ "integrity": "sha512-Eiu8B2rFl3nEvA+PYaybcXknkXcgVy//OqM7+f5fu3UEVw050/JyHBsrnBOMc+muon16Og1RKxOVmQuAWDS1hA==", "dev": true, "requires": { - "@babel/core": "7.11.6", - "@babel/helper-compilation-targets": "7.10.4", - "@babel/helper-module-imports": "7.10.4", - "@babel/plugin-proposal-class-properties": "7.10.4", - "@babel/plugin-proposal-decorators": "7.10.5", - "@babel/plugin-proposal-export-namespace-from": "7.10.4", - "@babel/plugin-proposal-function-sent": "7.10.4", - "@babel/plugin-proposal-json-strings": "7.10.4", - "@babel/plugin-proposal-numeric-separator": "7.10.4", - "@babel/plugin-proposal-throw-expressions": "7.10.4", - "@babel/plugin-syntax-dynamic-import": "7.8.3", - "@babel/plugin-syntax-import-meta": "7.10.4", - "@babel/plugin-transform-runtime": "7.11.5", - "@babel/preset-env": "7.11.5", - "@babel/runtime": "7.11.2", - "babel-loader": "8.1.0", - "babel-plugin-dynamic-import-node": "2.3.3", - "babel-plugin-module-resolver": "4.0.0", - "core-js": "3.6.5", - "core-js-compat": "3.6.5" + "@babel/core": "^7.9.0", + "@babel/helper-compilation-targets": "^7.9.6", + "@babel/helper-module-imports": "^7.8.3", + "@babel/plugin-proposal-class-properties": "^7.5.5", + "@babel/plugin-proposal-decorators": "^7.4.4", + "@babel/plugin-proposal-export-namespace-from": "^7.2.0", + "@babel/plugin-proposal-function-sent": "^7.2.0", + "@babel/plugin-proposal-json-strings": "^7.2.0", + "@babel/plugin-proposal-numeric-separator": "^7.2.0", + "@babel/plugin-proposal-throw-expressions": "^7.2.0", + "@babel/plugin-syntax-dynamic-import": "^7.2.0", + "@babel/plugin-syntax-import-meta": "^7.2.0", + "@babel/plugin-transform-runtime": "^7.9.0", + "@babel/preset-env": "^7.9.0", + "@babel/runtime": "^7.9.0", + "babel-loader": "^8.0.6", + "babel-plugin-dynamic-import-node": "^2.3.0", + "babel-plugin-module-resolver": "^4.0.0", + "core-js": "^3.6.5", + "core-js-compat": "^3.6.5" } }, "@quasar/extras": { - "version": "1.9.7", - "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.9.7.tgz", - "integrity": "sha512-LvcY8ILYrW6SV49xH+XeXKPnxFjDRQIX1Uaa10XDarW9y99pL+lUNFUI7wFzO6SwoMP18BlpEnC3BEqnSZ7OAA==" + "version": "1.9.10", + "resolved": "https://registry.npmjs.org/@quasar/extras/-/extras-1.9.10.tgz", + "integrity": "sha512-pVM2lLiX2vHhibL4VUCjAfYhhYtQLDLYccq/ee6PdpyJ394lJQSkFnnGntcmpQk4QPcgIQ8GZSVpsUd1qgabaw==" }, "@quasar/fastclick": { "version": "1.1.4", @@ -1436,7 +1773,7 @@ "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", "dev": true, "requires": { - "defer-to-connect": "1.1.3" + "defer-to-connect": "^1.0.1" } }, "@types/anymatch": { @@ -1451,8 +1788,8 @@ "integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==", "dev": true, "requires": { - "@types/connect": "3.4.33", - "@types/node": "10.17.35" + "@types/connect": "*", + "@types/node": "*" } }, "@types/color-name": { @@ -1467,7 +1804,7 @@ "integrity": "sha512-2+FrkXY4zllzTNfJth7jOqEHC+enpLeGslEhpnTAkg21GkRrWV4SsAtqchtT4YS9/nODBU2/ZfsBY2X4J/dX7A==", "dev": true, "requires": { - "@types/node": "10.17.35" + "@types/node": "*" } }, "@types/connect-history-api-fallback": { @@ -1476,8 +1813,8 @@ "integrity": "sha512-7SxFCd+FLlxCfwVwbyPxbR4khL9aNikJhrorw8nUIOqeuooc9gifBuDQOJw5kzN7i6i3vLn9G8Wde/4QDihpYw==", "dev": true, "requires": { - "@types/express-serve-static-core": "4.17.13", - "@types/node": "10.17.35" + "@types/express-serve-static-core": "*", + "@types/node": "*" } }, "@types/cordova": { @@ -1492,10 +1829,10 @@ "integrity": "sha512-n47/AbT4DEYPyXtES2myPyKCxVE3hICAB3MnpoVg+Ba8CLBGOpUUsNJ5fyLhfKt5N06sT9nTk4eAc+rtYVpvTQ==", "dev": true, "requires": { - "@electron/get": "1.12.2", - "@types/node": "10.17.35", - "electron-notarize": "0.1.1", - "electron-osx-sign": "0.4.17" + "@electron/get": "^1.3.1", + "@types/node": "*", + "electron-notarize": "^0.1.1", + "electron-osx-sign": "^0.4.11" } }, "@types/eslint-visitor-keys": { @@ -1510,10 +1847,10 @@ "integrity": "sha512-n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w==", "dev": true, "requires": { - "@types/body-parser": "1.19.0", - "@types/express-serve-static-core": "4.17.13", - "@types/qs": "6.9.5", - "@types/serve-static": "1.13.5" + "@types/body-parser": "*", + "@types/express-serve-static-core": "*", + "@types/qs": "*", + "@types/serve-static": "*" } }, "@types/express-serve-static-core": { @@ -1522,9 +1859,9 @@ "integrity": "sha512-RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA==", "dev": true, "requires": { - "@types/node": "10.17.35", - "@types/qs": "6.9.5", - "@types/range-parser": "1.2.3" + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*" } }, "@types/glob": { @@ -1533,8 +1870,8 @@ "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==", "dev": true, "requires": { - "@types/minimatch": "3.0.3", - "@types/node": "10.17.35" + "@types/minimatch": "*", + "@types/node": "*" } }, "@types/html-minifier-terser": { @@ -1549,7 +1886,7 @@ "integrity": "sha512-IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q==", "dev": true, "requires": { - "@types/node": "10.17.35" + "@types/node": "*" } }, "@types/http-proxy-middleware": { @@ -1558,9 +1895,9 @@ "integrity": "sha512-lnBTx6HCOUeIJMLbI/LaL5EmdKLhczJY5oeXZpX/cXE4rRqb3RmV7VcMpiEfYkmTjipv3h7IAyIINe4plEv7cA==", "dev": true, "requires": { - "@types/connect": "3.4.33", - "@types/http-proxy": "1.17.4", - "@types/node": "10.17.35" + "@types/connect": "*", + "@types/http-proxy": "*", + "@types/node": "*" } }, "@types/json-schema": { @@ -1588,9 +1925,9 @@ "dev": true }, "@types/node": { - "version": "10.17.35", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.35.tgz", - "integrity": "sha512-gXx7jAWpMddu0f7a+L+txMplp3FnHl53OhQIF9puXKq3hDGY/GjH+MF04oWnV/adPSCrbtHumDCFwzq2VhltWA==", + "version": "10.17.44", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.44.tgz", + "integrity": "sha512-vHPAyBX1ffLcy4fQHmDyIUMUb42gHZjPHU66nhvbMzAWJqHnySGZ6STwN3rwrnSd1FHB0DI/RWgGELgKSYRDmw==", "dev": true }, "@types/q": { @@ -1612,13 +1949,13 @@ "dev": true }, "@types/serve-static": { - "version": "1.13.5", - "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz", - "integrity": "sha512-6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ==", + "version": "1.13.6", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.6.tgz", + "integrity": "sha512-nuRJmv7jW7VmCVTn+IgYDkkbbDGyIINOeu/G0d74X3lm6E5KfMeQPJhxIt1ayQeQB3cSxvYs1RA/wipYoFB4EA==", "dev": true, "requires": { - "@types/express-serve-static-core": "4.17.13", - "@types/mime": "2.0.3" + "@types/mime": "*", + "@types/node": "*" } }, "@types/source-list-map": { @@ -1639,17 +1976,17 @@ "integrity": "sha512-K5C7izOT8rR4qiE2vfXcQNEJN4lT9cq/2qJgpMUWR2HsjDW/KVrHx2CaHuaXvaqDNsRmdELPLaxeJHiI4GjVrA==", "dev": true, "requires": { - "@types/webpack": "4.41.22", - "terser": "4.8.0" + "@types/webpack": "*", + "terser": "^4.6.13" } }, "@types/uglify-js": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.0.tgz", - "integrity": "sha512-I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q==", + "version": "3.11.1", + "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz", + "integrity": "sha512-7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q==", "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "^0.6.1" }, "dependencies": { "source-map": { @@ -1661,17 +1998,17 @@ } }, "@types/webpack": { - "version": "4.41.22", - "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.22.tgz", - "integrity": "sha512-JQDJK6pj8OMV9gWOnN1dcLCyU9Hzs6lux0wBO4lr1+gyEhIBR9U3FMrz12t2GPkg110XAxEAw2WHF6g7nZIbRQ==", + "version": "4.41.24", + "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.24.tgz", + "integrity": "sha512-1A0MXPwZiMOD3DPMuOKUKcpkdPo8Lq33UGggZ7xio6wJ/jV1dAu5cXDrOfGDnldUroPIRLsr/DT43/GqOA4RFQ==", "dev": true, "requires": { - "@types/anymatch": "1.3.1", - "@types/node": "10.17.35", - "@types/tapable": "1.0.6", - "@types/uglify-js": "3.11.0", - "@types/webpack-sources": "2.0.0", - "source-map": "0.6.1" + "@types/anymatch": "*", + "@types/node": "*", + "@types/tapable": "*", + "@types/uglify-js": "*", + "@types/webpack-sources": "*", + "source-map": "^0.6.0" }, "dependencies": { "source-map": { @@ -1688,7 +2025,7 @@ "integrity": "sha512-Ah6FbkXLAVUNI/ExXHsTS90iRS/Efplh333NySjhGx09oeH9qXf57NMUfl4RADTL5a89hQaq/nbT4eb0LwsQJw==", "dev": true, "requires": { - "@types/webpack": "4.41.22" + "@types/webpack": "*" } }, "@types/webpack-dev-server": { @@ -1697,11 +2034,11 @@ "integrity": "sha512-3+86AgSzl18n5P1iUP9/lz3G3GMztCp+wxdDvVuNhx1sr1jE79GpYfKHL8k+Vht3N74K2n98CuAEw4YPJCYtDA==", "dev": true, "requires": { - "@types/connect-history-api-fallback": "1.3.3", - "@types/express": "4.17.6", - "@types/http-proxy-middleware": "0.19.3", - "@types/serve-static": "1.13.5", - "@types/webpack": "4.41.22" + "@types/connect-history-api-fallback": "*", + "@types/express": "*", + "@types/http-proxy-middleware": "*", + "@types/serve-static": "*", + "@types/webpack": "*" } }, "@types/webpack-env": { @@ -1716,9 +2053,9 @@ "integrity": "sha512-a5kPx98CNFRKQ+wqawroFunvFqv7GHm/3KOI52NY9xWADgc8smu4R6prt4EU/M4QfVjvgBkMqU4fBhw3QfMVkg==", "dev": true, "requires": { - "@types/node": "10.17.35", - "@types/source-list-map": "0.1.2", - "source-map": "0.7.3" + "@types/node": "*", + "@types/source-list-map": "*", + "source-map": "^0.7.3" }, "dependencies": { "source-map": { @@ -1736,11 +2073,11 @@ "dev": true, "requires": { "@typescript-eslint/experimental-utils": "3.10.1", - "debug": "4.2.0", - "functional-red-black-tree": "1.0.1", - "regexpp": "3.1.0", - "semver": "7.3.2", - "tsutils": "3.17.1" + "debug": "^4.1.1", + "functional-red-black-tree": "^1.0.1", + "regexpp": "^3.0.0", + "semver": "^7.3.2", + "tsutils": "^3.17.1" }, "dependencies": { "debug": { @@ -1766,11 +2103,11 @@ "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==", "dev": true, "requires": { - "@types/json-schema": "7.0.6", + "@types/json-schema": "^7.0.3", "@typescript-eslint/types": "3.10.1", "@typescript-eslint/typescript-estree": "3.10.1", - "eslint-scope": "5.1.1", - "eslint-utils": "2.1.0" + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0" }, "dependencies": { "eslint-scope": { @@ -1779,8 +2116,8 @@ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "esrecurse": "4.3.0", - "estraverse": "4.3.0" + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" } } } @@ -1791,11 +2128,11 @@ "integrity": "sha512-Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==", "dev": true, "requires": { - "@types/eslint-visitor-keys": "1.0.0", + "@types/eslint-visitor-keys": "^1.0.0", "@typescript-eslint/experimental-utils": "3.10.1", "@typescript-eslint/types": "3.10.1", "@typescript-eslint/typescript-estree": "3.10.1", - "eslint-visitor-keys": "1.3.0" + "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/types": { @@ -1812,12 +2149,12 @@ "requires": { "@typescript-eslint/types": "3.10.1", "@typescript-eslint/visitor-keys": "3.10.1", - "debug": "4.2.0", - "glob": "7.1.6", - "is-glob": "4.0.1", - "lodash": "4.17.20", - "semver": "7.3.2", - "tsutils": "3.17.1" + "debug": "^4.1.1", + "glob": "^7.1.6", + "is-glob": "^4.0.1", + "lodash": "^4.17.15", + "semver": "^7.3.2", + "tsutils": "^3.17.1" }, "dependencies": { "debug": { @@ -1843,7 +2180,7 @@ "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==", "dev": true, "requires": { - "eslint-visitor-keys": "1.3.0" + "eslint-visitor-keys": "^1.1.0" } }, "@vue/component-compiler-utils": { @@ -1852,15 +2189,15 @@ "integrity": "sha512-lejBLa7xAMsfiZfNp7Kv51zOzifnb29FwdnMLa96z26kXErPFioSf9BMcePVIQ6/Gc6/mC0UrPpxAWIHyae0vw==", "dev": true, "requires": { - "consolidate": "0.15.1", - "hash-sum": "1.0.2", - "lru-cache": "4.1.5", - "merge-source-map": "1.1.0", - "postcss": "7.0.35", - "postcss-selector-parser": "6.0.4", - "prettier": "1.19.1", - "source-map": "0.6.1", - "vue-template-es2015-compiler": "1.9.1" + "consolidate": "^0.15.1", + "hash-sum": "^1.0.2", + "lru-cache": "^4.1.2", + "merge-source-map": "^1.1.0", + "postcss": "^7.0.14", + "postcss-selector-parser": "^6.0.2", + "prettier": "^1.18.2", + "source-map": "~0.6.1", + "vue-template-es2015-compiler": "^1.9.0" }, "dependencies": { "lru-cache": { @@ -1869,8 +2206,8 @@ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "source-map": { @@ -1892,7 +2229,7 @@ "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-0.6.7.tgz", "integrity": "sha512-WAWEQK4urEsMNe3OyOp7VnMmegRZT2yRB3fDGLRXPMdfuo4+nM+uMEhUgDiUg9LFSXfLWhjwuFOJ2hnS2X7AUw==", "requires": { - "tslib": "2.0.1" + "tslib": "^2.0.0" } }, "@webassemblyjs/ast": { @@ -1972,7 +2309,7 @@ "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==", "dev": true, "requires": { - "@xtuc/ieee754": "1.2.0" + "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { @@ -2094,14 +2431,14 @@ "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", "dev": true, "requires": { - "mime-types": "2.1.27", + "mime-types": "~2.1.24", "negotiator": "0.6.2" } }, "acorn": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", - "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", + "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", "dev": true }, "acorn-jsx": { @@ -2122,8 +2459,8 @@ "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, "requires": { - "clean-stack": "2.2.0", - "indent-string": "4.0.0" + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" } }, "ajv": { @@ -2132,10 +2469,10 @@ "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", "dev": true, "requires": { - "fast-deep-equal": "3.1.3", - "fast-json-stable-stringify": "2.1.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.4.0" + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" } }, "ajv-errors": { @@ -2174,7 +2511,7 @@ "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", "dev": true, "requires": { - "type-fest": "0.11.0" + "type-fest": "^0.11.0" }, "dependencies": { "type-fest": { @@ -2203,7 +2540,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "anymatch": { @@ -2212,8 +2549,8 @@ "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", "dev": true, "requires": { - "normalize-path": "3.0.0", - "picomatch": "2.2.2" + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" } }, "aproba": { @@ -2223,18 +2560,18 @@ "dev": true }, "archiver": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.0.0.tgz", - "integrity": "sha512-AEWhJz6Yi6hWtN1Sqy/H4sZo/lLMJ/NftXxGaDy/TnOMmmjsRaZc/Ts+U4BsPoBQkuunTN6t8hk7iU9A+HBxLw==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.0.2.tgz", + "integrity": "sha512-Tq3yV/T4wxBsD2Wign8W9VQKhaUxzzRmjEiSoOK0SLqPgDP/N1TKdYyBeIEu56T4I9iO4fKTTR0mN9NWkBA0sg==", "dev": true, "requires": { - "archiver-utils": "2.1.0", - "async": "3.2.0", - "buffer-crc32": "0.2.13", - "readable-stream": "3.6.0", - "readdir-glob": "1.1.0", - "tar-stream": "2.1.4", - "zip-stream": "4.0.2" + "archiver-utils": "^2.1.0", + "async": "^3.2.0", + "buffer-crc32": "^0.2.1", + "readable-stream": "^3.6.0", + "readdir-glob": "^1.0.0", + "tar-stream": "^2.1.4", + "zip-stream": "^4.0.0" } }, "archiver-utils": { @@ -2243,16 +2580,16 @@ "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", "dev": true, "requires": { - "glob": "7.1.6", - "graceful-fs": "4.2.4", - "lazystream": "1.0.0", - "lodash.defaults": "4.2.0", - "lodash.difference": "4.5.0", - "lodash.flatten": "4.4.0", - "lodash.isplainobject": "4.0.6", - "lodash.union": "4.6.0", - "normalize-path": "3.0.0", - "readable-stream": "2.3.7" + "glob": "^7.1.4", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", + "readable-stream": "^2.0.0" }, "dependencies": { "readable-stream": { @@ -2261,13 +2598,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -2278,8 +2615,8 @@ "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.7" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" }, "dependencies": { "readable-stream": { @@ -2288,13 +2625,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -2305,7 +2642,7 @@ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" }, "dependencies": { "sprintf-js": { @@ -2370,7 +2707,7 @@ "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "~2.1.0" } }, "asn1.js": { @@ -2379,10 +2716,10 @@ "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", "dev": true, "requires": { - "bn.js": "4.11.9", - "inherits": "2.0.4", - "minimalistic-assert": "1.0.1", - "safer-buffer": "2.1.2" + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" }, "dependencies": { "bn.js": { @@ -2399,7 +2736,7 @@ "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", "dev": true, "requires": { - "object-assign": "4.1.1", + "object-assign": "^4.1.1", "util": "0.10.3" }, "dependencies": { @@ -2486,13 +2823,13 @@ "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==", "dev": true, "requires": { - "browserslist": "4.14.5", - "caniuse-lite": "1.0.30001142", - "colorette": "1.2.1", - "normalize-range": "0.1.2", - "num2fraction": "1.2.2", - "postcss": "7.0.35", - "postcss-value-parser": "4.1.0" + "browserslist": "^4.12.0", + "caniuse-lite": "^1.0.30001109", + "colorette": "^1.2.1", + "normalize-range": "^0.1.2", + "num2fraction": "^1.2.2", + "postcss": "^7.0.32", + "postcss-value-parser": "^4.1.0" } }, "aws-sign2": { @@ -2502,9 +2839,9 @@ "dev": true }, "aws4": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz", - "integrity": "sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", "dev": true }, "axios": { @@ -2513,7 +2850,7 @@ "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==", "requires": { "follow-redirects": "1.5.10", - "is-buffer": "2.0.4" + "is-buffer": "^2.0.2" } }, "babel-eslint": { @@ -2522,12 +2859,12 @@ "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==", "dev": true, "requires": { - "@babel/code-frame": "7.10.4", - "@babel/parser": "7.11.5", - "@babel/traverse": "7.11.5", - "@babel/types": "7.11.5", - "eslint-visitor-keys": "1.3.0", - "resolve": "1.17.0" + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.7.0", + "@babel/traverse": "^7.7.0", + "@babel/types": "^7.7.0", + "eslint-visitor-keys": "^1.0.0", + "resolve": "^1.12.0" } }, "babel-loader": { @@ -2536,11 +2873,11 @@ "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==", "dev": true, "requires": { - "find-cache-dir": "2.1.0", - "loader-utils": "1.4.0", - "mkdirp": "0.5.5", - "pify": "4.0.1", - "schema-utils": "2.7.1" + "find-cache-dir": "^2.1.0", + "loader-utils": "^1.4.0", + "mkdirp": "^0.5.3", + "pify": "^4.0.1", + "schema-utils": "^2.6.5" } }, "babel-plugin-dynamic-import-node": { @@ -2549,7 +2886,7 @@ "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==", "dev": true, "requires": { - "object.assign": "4.1.1" + "object.assign": "^4.1.0" } }, "babel-plugin-module-resolver": { @@ -2558,11 +2895,11 @@ "integrity": "sha512-3pdEq3PXALilSJ6dnC4wMWr0AZixHRM4utpdpBR9g5QG7B7JwWyukQv7a9hVxkbGFl+nQbrHDqqQOIBtTXTP/Q==", "dev": true, "requires": { - "find-babel-config": "1.2.0", - "glob": "7.1.6", - "pkg-up": "3.1.0", - "reselect": "4.0.0", - "resolve": "1.17.0" + "find-babel-config": "^1.2.0", + "glob": "^7.1.6", + "pkg-up": "^3.1.0", + "reselect": "^4.0.0", + "resolve": "^1.13.1" } }, "balanced-match": { @@ -2577,13 +2914,13 @@ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.3.0", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.2", - "pascalcase": "0.1.1" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { "define-property": { @@ -2592,7 +2929,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -2601,7 +2938,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -2610,7 +2947,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -2619,9 +2956,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.3" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -2644,7 +2981,7 @@ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "bfj": { @@ -2653,10 +2990,10 @@ "integrity": "sha512-BmBJa4Lip6BPRINSZ0BPEIfB1wUY/9rwbwvIHQA1KjX9om29B6id0wnWXq7m3bn5JrUVjeOTnVuhPT1FiHwPGw==", "dev": true, "requires": { - "bluebird": "3.7.2", - "check-types": "8.0.3", - "hoopy": "0.1.4", - "tryer": "1.0.1" + "bluebird": "^3.5.5", + "check-types": "^8.0.3", + "hoopy": "^0.1.4", + "tryer": "^1.0.1" } }, "big.js": { @@ -2677,9 +3014,9 @@ "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==", "dev": true, "requires": { - "buffer": "5.6.0", - "inherits": "2.0.4", - "readable-stream": "3.6.0" + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" } }, "block-stream": { @@ -2688,7 +3025,7 @@ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "dev": true, "requires": { - "inherits": "2.0.4" + "inherits": "~2.0.0" } }, "bluebird": { @@ -2710,15 +3047,15 @@ "dev": true, "requires": { "bytes": "3.1.0", - "content-type": "1.0.4", + "content-type": "~1.0.4", "debug": "2.6.9", - "depd": "1.1.2", + "depd": "~1.1.2", "http-errors": "1.7.2", "iconv-lite": "0.4.24", - "on-finished": "2.3.0", + "on-finished": "~2.3.0", "qs": "6.7.0", "raw-body": "2.4.0", - "type-is": "1.6.18" + "type-is": "~1.6.17" }, "dependencies": { "debug": { @@ -2738,12 +3075,12 @@ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", "dev": true, "requires": { - "array-flatten": "2.1.2", - "deep-equal": "1.1.1", - "dns-equal": "1.0.0", - "dns-txt": "2.0.2", - "multicast-dns": "6.2.3", - "multicast-dns-service-types": "1.1.0" + "array-flatten": "^2.1.0", + "deep-equal": "^1.0.1", + "dns-equal": "^1.0.0", + "dns-txt": "^2.0.2", + "multicast-dns": "^6.0.1", + "multicast-dns-service-types": "^1.1.0" }, "dependencies": { "array-flatten": { @@ -2761,10 +3098,11 @@ "dev": true }, "boolean": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz", - "integrity": "sha512-HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA==", - "dev": true + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz", + "integrity": "sha512-RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g==", + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", @@ -2772,7 +3110,7 @@ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -2782,7 +3120,7 @@ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, "requires": { - "fill-range": "7.0.1" + "fill-range": "^7.0.1" } }, "brorand": { @@ -2797,12 +3135,12 @@ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { - "buffer-xor": "1.0.3", - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "browserify-cipher": { @@ -2811,9 +3149,9 @@ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", "dev": true, "requires": { - "browserify-aes": "1.2.0", - "browserify-des": "1.0.2", - "evp_bytestokey": "1.0.3" + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" } }, "browserify-des": { @@ -2822,10 +3160,10 @@ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", "dev": true, "requires": { - "cipher-base": "1.0.4", - "des.js": "1.0.1", - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "browserify-rsa": { @@ -2834,8 +3172,8 @@ "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { - "bn.js": "4.11.9", - "randombytes": "2.1.0" + "bn.js": "^4.1.0", + "randombytes": "^2.0.1" }, "dependencies": { "bn.js": { @@ -2852,15 +3190,15 @@ "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", "dev": true, "requires": { - "bn.js": "5.1.3", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "elliptic": "6.5.3", - "inherits": "2.0.4", - "parse-asn1": "5.1.6", - "readable-stream": "3.6.0", - "safe-buffer": "5.2.1" + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "elliptic": "^6.5.3", + "inherits": "^2.0.4", + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" }, "dependencies": { "safe-buffer": { @@ -2877,29 +3215,29 @@ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, "requires": { - "pako": "1.0.11" + "pako": "~1.0.5" } }, "browserslist": { - "version": "4.14.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz", - "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==", + "version": "4.14.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.6.tgz", + "integrity": "sha512-zeFYcUo85ENhc/zxHbiIp0LGzzTrE2Pv2JhxvS7kpUb9Q9D38kUX6Bie7pGutJ/5iF5rOxE7CepAuWD56xJ33A==", "dev": true, "requires": { - "caniuse-lite": "1.0.30001142", - "electron-to-chromium": "1.3.576", - "escalade": "3.1.0", - "node-releases": "1.1.61" + "caniuse-lite": "^1.0.30001154", + "electron-to-chromium": "^1.3.585", + "escalade": "^3.1.1", + "node-releases": "^1.1.65" } }, "buffer": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", - "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "dev": true, "requires": { - "base64-js": "1.3.1", - "ieee754": "1.1.13" + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" } }, "buffer-alloc": { @@ -2908,8 +3246,8 @@ "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "dev": true, "requires": { - "buffer-alloc-unsafe": "1.1.0", - "buffer-fill": "1.0.0" + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" } }, "buffer-alloc-unsafe": { @@ -2966,23 +3304,23 @@ "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==", "dev": true, "requires": { - "@npmcli/move-file": "1.0.1", - "chownr": "2.0.0", - "fs-minipass": "2.1.0", - "glob": "7.1.6", - "infer-owner": "1.0.4", - "lru-cache": "6.0.0", - "minipass": "3.1.3", - "minipass-collect": "1.0.2", - "minipass-flush": "1.0.5", - "minipass-pipeline": "1.2.4", - "mkdirp": "1.0.4", - "p-map": "4.0.0", - "promise-inflight": "1.0.1", - "rimraf": "3.0.2", - "ssri": "8.0.0", - "tar": "6.0.5", - "unique-filename": "1.1.1" + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "glob": "^7.1.4", + "infer-owner": "^1.0.4", + "lru-cache": "^6.0.0", + "minipass": "^3.1.1", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.2", + "mkdirp": "^1.0.3", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^8.0.0", + "tar": "^6.0.2", + "unique-filename": "^1.1.1" }, "dependencies": { "mkdirp": { @@ -2999,15 +3337,15 @@ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.3.0", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.1", - "to-object-path": "0.3.0", - "union-value": "1.0.1", - "unset-value": "1.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, "cacheable-request": { @@ -3016,13 +3354,13 @@ "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", "dev": true, "requires": { - "clone-response": "1.0.2", - "get-stream": "5.2.0", - "http-cache-semantics": "4.1.0", - "keyv": "3.1.0", - "lowercase-keys": "2.0.0", - "normalize-url": "4.5.0", - "responselike": "1.0.2" + "clone-response": "^1.0.2", + "get-stream": "^5.1.0", + "http-cache-semantics": "^4.0.0", + "keyv": "^3.0.0", + "lowercase-keys": "^2.0.0", + "normalize-url": "^4.1.0", + "responselike": "^1.0.2" }, "dependencies": { "get-stream": { @@ -3031,7 +3369,7 @@ "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, "requires": { - "pump": "3.0.0" + "pump": "^3.0.0" } }, "lowercase-keys": { @@ -3042,13 +3380,23 @@ } } }, + "call-bind": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz", + "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.0" + } + }, "caller-callsite": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", "dev": true, "requires": { - "callsites": "2.0.0" + "callsites": "^2.0.0" } }, "caller-path": { @@ -3057,7 +3405,7 @@ "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", "dev": true, "requires": { - "caller-callsite": "2.0.0" + "caller-callsite": "^2.0.0" } }, "callsites": { @@ -3072,8 +3420,8 @@ "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", "dev": true, "requires": { - "no-case": "2.3.2", - "upper-case": "1.1.3" + "no-case": "^2.2.0", + "upper-case": "^1.1.1" } }, "camelcase": { @@ -3088,8 +3436,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" }, "dependencies": { "camelcase": { @@ -3106,16 +3454,16 @@ "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", "dev": true, "requires": { - "browserslist": "4.14.5", - "caniuse-lite": "1.0.30001142", - "lodash.memoize": "4.1.2", - "lodash.uniq": "4.5.0" + "browserslist": "^4.0.0", + "caniuse-lite": "^1.0.0", + "lodash.memoize": "^4.1.2", + "lodash.uniq": "^4.5.0" } }, "caniuse-lite": { - "version": "1.0.30001142", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001142.tgz", - "integrity": "sha512-pDPpn9ankEpBFZXyCv2I4lh1v/ju+bqb78QfKf+w9XgDAFWBwSYPswXqprRdrgQWK0wQnpIbfwRjNHO1HWqvoQ==", + "version": "1.0.30001156", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001156.tgz", + "integrity": "sha512-z7qztybA2eFZTB6Z3yvaQBIoJpQtsewRD74adw2UbRWwsRq3jIPvgrQGawBMbfafekQaD21FWuXNcywtTDGGCw==", "dev": true }, "caseless": { @@ -3130,8 +3478,8 @@ "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", "dev": true, "requires": { - "ansi-styles": "4.2.1", - "supports-color": "7.2.0" + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" }, "dependencies": { "ansi-styles": { @@ -3140,8 +3488,8 @@ "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", "dev": true, "requires": { - "@types/color-name": "1.1.1", - "color-convert": "2.0.1" + "@types/color-name": "^1.1.1", + "color-convert": "^2.0.1" } }, "color-convert": { @@ -3150,7 +3498,7 @@ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "color-name": "1.1.4" + "color-name": "~1.1.4" } }, "color-name": { @@ -3171,7 +3519,7 @@ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { - "has-flag": "4.0.0" + "has-flag": "^4.0.0" } } } @@ -3194,14 +3542,14 @@ "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", "dev": true, "requires": { - "anymatch": "3.1.1", - "braces": "3.0.2", - "fsevents": "2.1.3", - "glob-parent": "5.1.1", - "is-binary-path": "2.1.0", - "is-glob": "4.0.1", - "normalize-path": "3.0.0", - "readdirp": "3.4.0" + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.4.0" } }, "chownr": { @@ -3216,13 +3564,13 @@ "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", "dev": true, "requires": { - "tslib": "1.13.0" + "tslib": "^1.9.0" }, "dependencies": { "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true } } @@ -3239,8 +3587,8 @@ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "dev": true, "requires": { - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "class-utils": { @@ -3249,10 +3597,10 @@ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { "define-property": { @@ -3261,7 +3609,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -3272,7 +3620,7 @@ "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==", "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "~0.6.0" }, "dependencies": { "source-map": { @@ -3295,7 +3643,7 @@ "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, "requires": { - "restore-cursor": "3.1.0" + "restore-cursor": "^3.1.0" } }, "cli-width": { @@ -3310,9 +3658,9 @@ "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "dev": true, "requires": { - "string-width": "3.1.0", - "strip-ansi": "5.2.0", - "wrap-ansi": "5.1.0" + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" }, "dependencies": { "ansi-regex": { @@ -3333,9 +3681,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "7.0.3", - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "5.2.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } }, "strip-ansi": { @@ -3344,7 +3692,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.1.0" + "ansi-regex": "^4.1.0" } }, "wrap-ansi": { @@ -3353,9 +3701,9 @@ "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "string-width": "3.1.0", - "strip-ansi": "5.2.0" + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" } } } @@ -3366,9 +3714,9 @@ "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, "requires": { - "is-plain-object": "2.0.4", - "kind-of": "6.0.3", - "shallow-clone": "3.0.1" + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" } }, "clone-response": { @@ -3377,7 +3725,7 @@ "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", "dev": true, "requires": { - "mimic-response": "1.0.1" + "mimic-response": "^1.0.0" } }, "coa": { @@ -3386,9 +3734,9 @@ "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==", "dev": true, "requires": { - "@types/q": "1.5.4", - "chalk": "2.4.2", - "q": "1.5.1" + "@types/q": "^1.5.1", + "chalk": "^2.4.1", + "q": "^1.1.2" }, "dependencies": { "chalk": { @@ -3397,9 +3745,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -3416,18 +3764,18 @@ "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, "color": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/color/-/color-3.1.2.tgz", - "integrity": "sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz", + "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==", "dev": true, "requires": { - "color-convert": "1.9.3", - "color-string": "1.5.3" + "color-convert": "^1.9.1", + "color-string": "^1.5.4" } }, "color-convert": { @@ -3446,13 +3794,13 @@ "dev": true }, "color-string": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.3.tgz", - "integrity": "sha512-dC2C5qeWoYkxki5UAXapdjqO672AM4vZuPGRQfO8b5HKuKGBbKWpITyDYN7TOFKvRW7kOgAn3746clDBMDJyQw==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz", + "integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==", "dev": true, "requires": { - "color-name": "1.1.3", - "simple-swizzle": "0.2.2" + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" } }, "colorette": { @@ -3473,7 +3821,7 @@ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { @@ -3506,10 +3854,10 @@ "integrity": "sha512-xZm9o6iikekkI0GnXCmAl3LQGZj5TBDj0zLowsqi7tJtEa3FMGSEcHcqrSJIrOAk1UG/NBbDn/F1q+MG/p/EsA==", "dev": true, "requires": { - "buffer-crc32": "0.2.13", - "crc32-stream": "4.0.0", - "normalize-path": "3.0.0", - "readable-stream": "3.6.0" + "buffer-crc32": "^0.2.13", + "crc32-stream": "^4.0.0", + "normalize-path": "^3.0.0", + "readable-stream": "^3.6.0" } }, "compressible": { @@ -3518,7 +3866,7 @@ "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, "requires": { - "mime-db": "1.44.0" + "mime-db": ">= 1.43.0 < 2" } }, "compression": { @@ -3527,13 +3875,13 @@ "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.5", "bytes": "3.0.0", - "compressible": "2.0.18", + "compressible": "~2.0.16", "debug": "2.6.9", - "on-headers": "1.0.2", + "on-headers": "~1.0.2", "safe-buffer": "5.1.2", - "vary": "1.1.2" + "vary": "~1.1.2" }, "dependencies": { "bytes": { @@ -3559,11 +3907,11 @@ "integrity": "sha512-Wcb99O4UkdDZiM+blEw6h+cUfJYCn2kgK0l3fjLOm72Stso9DVMieQpBD4PVpyI7DLL6+zNh0iJV3p4HDwTinQ==", "dev": true, "requires": { - "cacache": "15.0.5", - "find-cache-dir": "3.3.1", - "schema-utils": "2.7.1", - "serialize-javascript": "4.0.0", - "webpack-sources": "1.4.3" + "cacache": "^15.0.5", + "find-cache-dir": "^3.3.1", + "schema-utils": "^2.7.0", + "serialize-javascript": "^4.0.0", + "webpack-sources": "^1.4.3" }, "dependencies": { "find-cache-dir": { @@ -3572,9 +3920,9 @@ "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "3.1.0", - "pkg-dir": "4.2.0" + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" } }, "find-up": { @@ -3583,8 +3931,8 @@ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "5.0.0", - "path-exists": "4.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "locate-path": { @@ -3593,7 +3941,7 @@ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "4.1.0" + "p-locate": "^4.1.0" } }, "make-dir": { @@ -3602,7 +3950,7 @@ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { - "semver": "6.3.0" + "semver": "^6.0.0" } }, "p-locate": { @@ -3611,7 +3959,7 @@ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "2.3.0" + "p-limit": "^2.2.0" } }, "path-exists": { @@ -3626,7 +3974,7 @@ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "4.1.0" + "find-up": "^4.0.0" } }, "semver": { @@ -3649,10 +3997,10 @@ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "dev": true, "requires": { - "buffer-from": "1.1.1", - "inherits": "2.0.4", - "readable-stream": "2.3.7", - "typedarray": "0.0.6" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" }, "dependencies": { "readable-stream": { @@ -3661,13 +4009,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -3679,8 +4027,8 @@ "dev": true, "optional": true, "requires": { - "ini": "1.3.5", - "proto-list": "1.2.4" + "ini": "^1.3.4", + "proto-list": "~1.2.1" } }, "connect-history-api-fallback": { @@ -3707,7 +4055,7 @@ "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==", "dev": true, "requires": { - "bluebird": "3.7.2" + "bluebird": "^3.1.1" } }, "constants-browserify": { @@ -3737,7 +4085,7 @@ "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.1" } }, "cookie": { @@ -3758,12 +4106,12 @@ "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", "dev": true, "requires": { - "aproba": "1.2.0", - "fs-write-stream-atomic": "1.0.10", - "iferr": "0.1.5", - "mkdirp": "0.5.5", - "rimraf": "2.7.1", - "run-queue": "1.0.3" + "aproba": "^1.1.1", + "fs-write-stream-atomic": "^1.0.8", + "iferr": "^0.1.5", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.0" }, "dependencies": { "rimraf": { @@ -3772,7 +4120,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } } } @@ -3784,22 +4132,22 @@ "dev": true }, "copy-webpack-plugin": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz", - "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.1.1.tgz", + "integrity": "sha512-4TlkHFYkrZ3WppLA5XkPmBLI5lnEpFsXvpeqxCf5PzkratZiVklNXsvoQkLhUU43q7ZL3AOXtaHAd9jLNJoU0w==", "dev": true, "requires": { - "cacache": "15.0.5", - "fast-glob": "3.2.4", - "find-cache-dir": "3.3.1", - "glob-parent": "5.1.1", - "globby": "11.0.1", - "loader-utils": "2.0.0", - "normalize-path": "3.0.0", - "p-limit": "3.0.2", - "schema-utils": "2.7.1", - "serialize-javascript": "4.0.0", - "webpack-sources": "1.4.3" + "cacache": "^15.0.5", + "fast-glob": "^3.2.4", + "find-cache-dir": "^3.3.1", + "glob-parent": "^5.1.1", + "globby": "^11.0.1", + "loader-utils": "^2.0.0", + "normalize-path": "^3.0.0", + "p-limit": "^3.0.2", + "schema-utils": "^2.7.1", + "serialize-javascript": "^5.0.1", + "webpack-sources": "^1.4.3" }, "dependencies": { "find-cache-dir": { @@ -3808,9 +4156,9 @@ "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "3.1.0", - "pkg-dir": "4.2.0" + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" } }, "find-up": { @@ -3819,8 +4167,8 @@ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "5.0.0", - "path-exists": "4.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "loader-utils": { @@ -3829,9 +4177,9 @@ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { - "big.js": "5.2.2", - "emojis-list": "3.0.0", - "json5": "2.1.3" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" } }, "locate-path": { @@ -3840,7 +4188,7 @@ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "4.1.0" + "p-locate": "^4.1.0" } }, "make-dir": { @@ -3849,7 +4197,7 @@ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { - "semver": "6.3.0" + "semver": "^6.0.0" } }, "p-limit": { @@ -3858,7 +4206,7 @@ "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -3867,7 +4215,7 @@ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "2.3.0" + "p-limit": "^2.2.0" }, "dependencies": { "p-limit": { @@ -3876,7 +4224,7 @@ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } } } @@ -3893,7 +4241,7 @@ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "4.1.0" + "find-up": "^4.0.0" } }, "semver": { @@ -3901,6 +4249,15 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true + }, + "serialize-javascript": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", + "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } } } }, @@ -3915,7 +4272,7 @@ "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==", "dev": true, "requires": { - "browserslist": "4.14.5", + "browserslist": "^4.8.5", "semver": "7.0.0" }, "dependencies": { @@ -3939,10 +4296,10 @@ "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", "dev": true, "requires": { - "import-fresh": "2.0.0", - "is-directory": "0.3.1", - "js-yaml": "3.14.0", - "parse-json": "4.0.0" + "import-fresh": "^2.0.0", + "is-directory": "^0.3.1", + "js-yaml": "^3.13.1", + "parse-json": "^4.0.0" } }, "crc": { @@ -3951,7 +4308,7 @@ "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", "dev": true, "requires": { - "buffer": "5.6.0" + "buffer": "^5.1.0" } }, "crc32-stream": { @@ -3960,8 +4317,8 @@ "integrity": "sha512-tyMw2IeUX6t9jhgXI6um0eKfWq4EIDpfv5m7GX4Jzp7eVelQ360xd8EPXJhp2mHwLQIkqlnMLjzqSZI3a+0wRw==", "dev": true, "requires": { - "crc": "3.8.0", - "readable-stream": "3.6.0" + "crc": "^3.4.4", + "readable-stream": "^3.4.0" } }, "create-ecdh": { @@ -3970,8 +4327,8 @@ "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", "dev": true, "requires": { - "bn.js": "4.11.9", - "elliptic": "6.5.3" + "bn.js": "^4.1.0", + "elliptic": "^6.5.3" }, "dependencies": { "bn.js": { @@ -3988,11 +4345,11 @@ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { - "cipher-base": "1.0.4", - "inherits": "2.0.4", - "md5.js": "1.3.5", - "ripemd160": "2.0.2", - "sha.js": "2.4.11" + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" } }, "create-hmac": { @@ -4001,12 +4358,12 @@ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "inherits": "2.0.4", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "cross-spawn": { @@ -4015,9 +4372,9 @@ "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "requires": { - "path-key": "3.1.1", - "shebang-command": "2.0.0", - "which": "2.0.2" + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, "crypto-browserify": { @@ -4026,17 +4383,17 @@ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", "dev": true, "requires": { - "browserify-cipher": "1.0.1", - "browserify-sign": "4.2.1", - "create-ecdh": "4.0.4", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "diffie-hellman": "5.0.3", - "inherits": "2.0.4", - "pbkdf2": "3.1.1", - "public-encrypt": "4.0.3", - "randombytes": "2.1.0", - "randomfill": "1.0.4" + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" } }, "css": { @@ -4045,10 +4402,10 @@ "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==", "dev": true, "requires": { - "inherits": "2.0.4", - "source-map": "0.6.1", - "source-map-resolve": "0.5.3", - "urix": "0.1.0" + "inherits": "^2.0.3", + "source-map": "^0.6.1", + "source-map-resolve": "^0.5.2", + "urix": "^0.1.0" }, "dependencies": { "source-map": { @@ -4071,8 +4428,8 @@ "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==", "dev": true, "requires": { - "postcss": "7.0.35", - "timsort": "0.3.0" + "postcss": "^7.0.1", + "timsort": "^0.3.0" } }, "css-loader": { @@ -4081,19 +4438,19 @@ "integrity": "sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==", "dev": true, "requires": { - "camelcase": "5.3.1", - "cssesc": "3.0.0", - "icss-utils": "4.1.1", - "loader-utils": "1.4.0", - "normalize-path": "3.0.0", - "postcss": "7.0.35", - "postcss-modules-extract-imports": "2.0.0", - "postcss-modules-local-by-default": "3.0.3", - "postcss-modules-scope": "2.2.0", - "postcss-modules-values": "3.0.0", - "postcss-value-parser": "4.1.0", - "schema-utils": "2.7.1", - "semver": "6.3.0" + "camelcase": "^5.3.1", + "cssesc": "^3.0.0", + "icss-utils": "^4.1.1", + "loader-utils": "^1.2.3", + "normalize-path": "^3.0.0", + "postcss": "^7.0.32", + "postcss-modules-extract-imports": "^2.0.0", + "postcss-modules-local-by-default": "^3.0.2", + "postcss-modules-scope": "^2.2.0", + "postcss-modules-values": "^3.0.0", + "postcss-value-parser": "^4.1.0", + "schema-utils": "^2.7.0", + "semver": "^6.3.0" }, "dependencies": { "semver": { @@ -4110,7 +4467,7 @@ "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=", "dev": true, "requires": { - "css": "2.2.4" + "css": "^2.0.0" } }, "css-select": { @@ -4119,10 +4476,10 @@ "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", "dev": true, "requires": { - "boolbase": "1.0.0", - "css-what": "3.4.1", - "domutils": "1.7.0", - "nth-check": "1.0.2" + "boolbase": "^1.0.0", + "css-what": "^3.2.1", + "domutils": "^1.7.0", + "nth-check": "^1.0.2" } }, "css-select-base-adapter": { @@ -4138,7 +4495,7 @@ "dev": true, "requires": { "mdn-data": "2.0.4", - "source-map": "0.6.1" + "source-map": "^0.6.1" }, "dependencies": { "source-map": { @@ -4150,9 +4507,9 @@ } }, "css-what": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.1.tgz", - "integrity": "sha512-wHOppVDKl4vTAOWzJt5Ek37Sgd9qq1Bmj/T1OjvicWbU5W7ru7Pqbn0Jdqii3Drx/h+dixHKXNhZYx7blthL7g==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", + "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==", "dev": true }, "cssesc": { @@ -4167,10 +4524,10 @@ "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==", "dev": true, "requires": { - "cosmiconfig": "5.2.1", - "cssnano-preset-default": "4.0.7", - "is-resolvable": "1.1.0", - "postcss": "7.0.35" + "cosmiconfig": "^5.0.0", + "cssnano-preset-default": "^4.0.7", + "is-resolvable": "^1.0.0", + "postcss": "^7.0.0" } }, "cssnano-preset-default": { @@ -4179,36 +4536,36 @@ "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==", "dev": true, "requires": { - "css-declaration-sorter": "4.0.1", - "cssnano-util-raw-cache": "4.0.1", - "postcss": "7.0.35", - "postcss-calc": "7.0.4", - "postcss-colormin": "4.0.3", - "postcss-convert-values": "4.0.1", - "postcss-discard-comments": "4.0.2", - "postcss-discard-duplicates": "4.0.2", - "postcss-discard-empty": "4.0.1", - "postcss-discard-overridden": "4.0.1", - "postcss-merge-longhand": "4.0.11", - "postcss-merge-rules": "4.0.3", - "postcss-minify-font-values": "4.0.2", - "postcss-minify-gradients": "4.0.2", - "postcss-minify-params": "4.0.2", - "postcss-minify-selectors": "4.0.2", - "postcss-normalize-charset": "4.0.1", - "postcss-normalize-display-values": "4.0.2", - "postcss-normalize-positions": "4.0.2", - "postcss-normalize-repeat-style": "4.0.2", - "postcss-normalize-string": "4.0.2", - "postcss-normalize-timing-functions": "4.0.2", - "postcss-normalize-unicode": "4.0.1", - "postcss-normalize-url": "4.0.1", - "postcss-normalize-whitespace": "4.0.2", - "postcss-ordered-values": "4.1.2", - "postcss-reduce-initial": "4.0.3", - "postcss-reduce-transforms": "4.0.2", - "postcss-svgo": "4.0.2", - "postcss-unique-selectors": "4.0.1" + "css-declaration-sorter": "^4.0.1", + "cssnano-util-raw-cache": "^4.0.1", + "postcss": "^7.0.0", + "postcss-calc": "^7.0.1", + "postcss-colormin": "^4.0.3", + "postcss-convert-values": "^4.0.1", + "postcss-discard-comments": "^4.0.2", + "postcss-discard-duplicates": "^4.0.2", + "postcss-discard-empty": "^4.0.1", + "postcss-discard-overridden": "^4.0.1", + "postcss-merge-longhand": "^4.0.11", + "postcss-merge-rules": "^4.0.3", + "postcss-minify-font-values": "^4.0.2", + "postcss-minify-gradients": "^4.0.2", + "postcss-minify-params": "^4.0.2", + "postcss-minify-selectors": "^4.0.2", + "postcss-normalize-charset": "^4.0.1", + "postcss-normalize-display-values": "^4.0.2", + "postcss-normalize-positions": "^4.0.2", + "postcss-normalize-repeat-style": "^4.0.2", + "postcss-normalize-string": "^4.0.2", + "postcss-normalize-timing-functions": "^4.0.2", + "postcss-normalize-unicode": "^4.0.1", + "postcss-normalize-url": "^4.0.1", + "postcss-normalize-whitespace": "^4.0.2", + "postcss-ordered-values": "^4.1.2", + "postcss-reduce-initial": "^4.0.3", + "postcss-reduce-transforms": "^4.0.2", + "postcss-svgo": "^4.0.2", + "postcss-unique-selectors": "^4.0.1" } }, "cssnano-util-get-arguments": { @@ -4229,7 +4586,7 @@ "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.0" } }, "cssnano-util-same-parent": { @@ -4239,28 +4596,28 @@ "dev": true }, "csso": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz", - "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-4.1.0.tgz", + "integrity": "sha512-h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg==", "dev": true, "requires": { - "css-tree": "1.0.0-alpha.39" + "css-tree": "^1.0.0" }, "dependencies": { "css-tree": { - "version": "1.0.0-alpha.39", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz", - "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0.tgz", + "integrity": "sha512-CdVYz/Yuqw0VdKhXPBIgi8DO3NicJVYZNWeX9XcIuSp9ZoFT5IcleVRW07O5rMjdcx1mb+MEJPknTTEW7DdsYw==", "dev": true, "requires": { - "mdn-data": "2.0.6", - "source-map": "0.6.1" + "mdn-data": "2.0.12", + "source-map": "^0.6.1" } }, "mdn-data": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz", - "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.12.tgz", + "integrity": "sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==", "dev": true }, "source-map": { @@ -4277,7 +4634,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "cyclist": { @@ -4292,7 +4649,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "de-indent": { @@ -4327,7 +4684,7 @@ "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, "requires": { - "mimic-response": "1.0.1" + "mimic-response": "^1.0.0" } }, "deep-equal": { @@ -4336,12 +4693,12 @@ "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", "dev": true, "requires": { - "is-arguments": "1.0.4", - "is-date-object": "1.0.2", - "is-regex": "1.1.1", - "object-is": "1.1.3", - "object-keys": "1.1.1", - "regexp.prototype.flags": "1.3.0" + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" } }, "deep-is": { @@ -4362,8 +4719,8 @@ "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", "dev": true, "requires": { - "execa": "1.0.0", - "ip-regex": "2.1.0" + "execa": "^1.0.0", + "ip-regex": "^2.1.0" } }, "defer-to-connect": { @@ -4378,7 +4735,7 @@ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "dev": true, "requires": { - "object-keys": "1.1.1" + "object-keys": "^1.0.12" } }, "define-property": { @@ -4387,8 +4744,8 @@ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { "is-accessor-descriptor": { @@ -4397,7 +4754,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -4406,7 +4763,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -4415,9 +4772,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.3" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -4428,13 +4785,13 @@ "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", "dev": true, "requires": { - "@types/glob": "7.1.3", - "globby": "6.1.0", - "is-path-cwd": "2.2.0", - "is-path-in-cwd": "2.1.0", - "p-map": "2.1.0", - "pify": "4.0.1", - "rimraf": "2.7.1" + "@types/glob": "^7.1.1", + "globby": "^6.1.0", + "is-path-cwd": "^2.0.0", + "is-path-in-cwd": "^2.0.0", + "p-map": "^2.0.0", + "pify": "^4.0.1", + "rimraf": "^2.6.3" }, "dependencies": { "array-union": { @@ -4443,7 +4800,7 @@ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { - "array-uniq": "1.0.3" + "array-uniq": "^1.0.1" } }, "globby": { @@ -4452,11 +4809,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.6", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" }, "dependencies": { "pify": { @@ -4479,7 +4836,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } } } @@ -4508,8 +4865,8 @@ "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", "dev": true, "requires": { - "inherits": "2.0.4", - "minimalistic-assert": "1.0.1" + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" } }, "destroy": { @@ -4530,9 +4887,9 @@ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { - "bn.js": "4.11.9", - "miller-rabin": "4.0.1", - "randombytes": "2.1.0" + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" }, "dependencies": { "bn.js": { @@ -4549,7 +4906,7 @@ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, "requires": { - "path-type": "4.0.0" + "path-type": "^4.0.0" } }, "dns-equal": { @@ -4564,8 +4921,8 @@ "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", "dev": true, "requires": { - "ip": "1.1.5", - "safe-buffer": "5.1.2" + "ip": "^1.1.0", + "safe-buffer": "^5.0.1" } }, "dns-txt": { @@ -4574,7 +4931,7 @@ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", "dev": true, "requires": { - "buffer-indexof": "1.1.1" + "buffer-indexof": "^1.0.0" } }, "doctrine": { @@ -4583,7 +4940,7 @@ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, "requires": { - "esutils": "2.0.3" + "esutils": "^2.0.2" } }, "dom-converter": { @@ -4592,7 +4949,7 @@ "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", "dev": true, "requires": { - "utila": "0.4.0" + "utila": "~0.4" } }, "dom-serializer": { @@ -4601,8 +4958,8 @@ "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", "dev": true, "requires": { - "domelementtype": "2.0.2", - "entities": "2.0.3" + "domelementtype": "^2.0.1", + "entities": "^2.0.0" }, "dependencies": { "domelementtype": { @@ -4631,7 +4988,7 @@ "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", "dev": true, "requires": { - "domelementtype": "1.3.1" + "domelementtype": "1" } }, "domutils": { @@ -4640,8 +4997,8 @@ "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", "dev": true, "requires": { - "dom-serializer": "0.2.2", - "domelementtype": "1.3.1" + "dom-serializer": "0", + "domelementtype": "1" } }, "dot-case": { @@ -4650,8 +5007,8 @@ "integrity": "sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==", "dev": true, "requires": { - "no-case": "3.0.3", - "tslib": "1.13.0" + "no-case": "^3.0.3", + "tslib": "^1.10.0" }, "dependencies": { "lower-case": { @@ -4660,7 +5017,7 @@ "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==", "dev": true, "requires": { - "tslib": "1.13.0" + "tslib": "^1.10.0" } }, "no-case": { @@ -4669,25 +5026,25 @@ "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==", "dev": true, "requires": { - "lower-case": "2.0.1", - "tslib": "1.13.0" + "lower-case": "^2.0.1", + "tslib": "^1.10.0" } }, "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true } } }, "dot-prop": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", - "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", + "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", "dev": true, "requires": { - "is-obj": "2.0.0" + "is-obj": "^2.0.0" } }, "duplexer": { @@ -4708,10 +5065,10 @@ "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "inherits": "2.0.4", - "readable-stream": "2.3.7", - "stream-shift": "1.0.1" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" }, "dependencies": { "readable-stream": { @@ -4720,13 +5077,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -4737,8 +5094,8 @@ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "dev": true, "requires": { - "jsbn": "0.1.1", - "safer-buffer": "2.1.2" + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" } }, "ee-first": { @@ -4759,8 +5116,8 @@ "integrity": "sha512-TpKfJcz4LXl5jiGvZTs5fbEx+wUFXV5u8voeG5WCHWfY/cdgdD8lDZIZRqLVOtR3VO+drgJ9aiSHIO9TYn/fKg==", "dev": true, "requires": { - "debug": "4.2.0", - "fs-extra": "8.1.0" + "debug": "^4.1.1", + "fs-extra": "^8.0.1" }, "dependencies": { "debug": { @@ -4778,9 +5135,9 @@ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } }, "ms": { @@ -4797,12 +5154,12 @@ "integrity": "sha512-wUJPmZJQCs1zgdlQgeIpRcvrf7M5/COQaOV68Va1J/SgmWx5KL2otgg+fAae7luw6qz9R8Gvu/Qpe9tAOu/3xQ==", "dev": true, "requires": { - "bluebird": "3.7.2", - "compare-version": "0.1.2", - "debug": "2.6.9", - "isbinaryfile": "3.0.3", - "minimist": "1.2.5", - "plist": "3.0.1" + "bluebird": "^3.5.0", + "compare-version": "^0.1.2", + "debug": "^2.6.8", + "isbinaryfile": "^3.0.2", + "minimist": "^1.2.0", + "plist": "^3.0.1" }, "dependencies": { "debug": { @@ -4820,15 +5177,15 @@ "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", "dev": true, "requires": { - "buffer-alloc": "1.2.0" + "buffer-alloc": "^1.2.0" } } } }, "electron-to-chromium": { - "version": "1.3.576", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz", - "integrity": "sha512-uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew==", + "version": "1.3.589", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.589.tgz", + "integrity": "sha512-rQItBTFnol20HaaLm26UgSUduX7iGerwW7pEYX17MB1tI6LzFajiLV7iZ7LVcUcsN/7HrZUoCLrBauChy/IqEg==", "dev": true }, "elementtree": { @@ -4854,13 +5211,13 @@ "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", "dev": true, "requires": { - "bn.js": "4.11.9", - "brorand": "1.1.0", - "hash.js": "1.1.7", - "hmac-drbg": "1.0.1", - "inherits": "2.0.4", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" }, "dependencies": { "bn.js": { @@ -4895,7 +5252,7 @@ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "dev": true, "requires": { - "once": "1.4.0" + "once": "^1.4.0" } }, "enhanced-resolve": { @@ -4904,15 +5261,15 @@ "integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "memory-fs": "0.5.0", - "tapable": "1.1.3" + "graceful-fs": "^4.1.2", + "memory-fs": "^0.5.0", + "tapable": "^1.0.0" } }, "entities": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz", - "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", + "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", "dev": true }, "env-paths": { @@ -4927,7 +5284,7 @@ "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", "dev": true, "requires": { - "prr": "1.0.1" + "prr": "~1.0.1" } }, "error-ex": { @@ -4936,7 +5293,7 @@ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "error-stack-parser": { @@ -4945,27 +5302,26 @@ "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==", "dev": true, "requires": { - "stackframe": "1.2.0" + "stackframe": "^1.1.1" } }, "es-abstract": { - "version": "1.18.0-next.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", - "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-negative-zero": "2.0.0", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } }, "es-to-primitive": { @@ -4974,9 +5330,9 @@ "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "requires": { - "is-callable": "1.2.2", - "is-date-object": "1.0.2", - "is-symbol": "1.0.3" + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" } }, "es6-error": { @@ -4987,9 +5343,9 @@ "optional": true }, "escalade": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz", - "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true }, "escape-html": { @@ -5010,43 +5366,43 @@ "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==", "dev": true, "requires": { - "@babel/code-frame": "7.10.4", - "ajv": "6.12.5", - "chalk": "2.4.2", - "cross-spawn": "6.0.5", - "debug": "4.2.0", - "doctrine": "3.0.0", - "eslint-scope": "5.1.1", - "eslint-utils": "1.4.3", - "eslint-visitor-keys": "1.3.0", - "espree": "6.2.1", - "esquery": "1.3.1", - "esutils": "2.0.3", - "file-entry-cache": "5.0.1", - "functional-red-black-tree": "1.0.1", - "glob-parent": "5.1.1", - "globals": "12.4.0", - "ignore": "4.0.6", - "import-fresh": "3.2.1", - "imurmurhash": "0.1.4", - "inquirer": "7.3.3", - "is-glob": "4.0.1", - "js-yaml": "3.14.0", - "json-stable-stringify-without-jsonify": "1.0.1", - "levn": "0.3.0", - "lodash": "4.17.20", - "minimatch": "3.0.4", - "mkdirp": "0.5.5", - "natural-compare": "1.4.0", - "optionator": "0.8.3", - "progress": "2.0.3", - "regexpp": "2.0.1", - "semver": "6.3.0", - "strip-ansi": "5.2.0", - "strip-json-comments": "3.1.1", - "table": "5.4.6", - "text-table": "0.2.0", - "v8-compile-cache": "2.1.1" + "@babel/code-frame": "^7.0.0", + "ajv": "^6.10.0", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^5.0.0", + "eslint-utils": "^1.4.3", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.1.2", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.0.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^7.0.0", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.14", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.3", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^6.1.2", + "strip-ansi": "^5.2.0", + "strip-json-comments": "^3.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" }, "dependencies": { "ansi-regex": { @@ -5061,9 +5417,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "cross-spawn": { @@ -5072,11 +5428,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.7.1", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" }, "dependencies": { "semver": { @@ -5102,8 +5458,8 @@ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "esrecurse": "4.3.0", - "estraverse": "4.3.0" + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" } }, "eslint-utils": { @@ -5112,7 +5468,7 @@ "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", "dev": true, "requires": { - "eslint-visitor-keys": "1.3.0" + "eslint-visitor-keys": "^1.1.0" } }, "globals": { @@ -5121,7 +5477,7 @@ "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", "dev": true, "requires": { - "type-fest": "0.8.1" + "type-fest": "^0.8.1" } }, "ignore": { @@ -5136,8 +5492,8 @@ "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==", "dev": true, "requires": { - "parent-module": "1.0.1", - "resolve-from": "4.0.0" + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" } }, "ms": { @@ -5176,7 +5532,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -5191,7 +5547,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.1.0" + "ansi-regex": "^4.1.0" } }, "strip-json-comments": { @@ -5212,18 +5568,18 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } } } }, "eslint-config-prettier": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz", - "integrity": "sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz", + "integrity": "sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==", "dev": true, "requires": { - "get-stdin": "6.0.0" + "get-stdin": "^6.0.0" }, "dependencies": { "get-stdin": { @@ -5240,11 +5596,11 @@ "integrity": "sha512-I496aBd+Hi23Y0Cx+sKvw+VwlJre4ScIRlkrvTO6Scq68X/UXbN6F3lAhN8b0Zv8atAyprkyrA42K5QBJtCyaw==", "dev": true, "requires": { - "fs-extra": "8.1.0", - "loader-fs-cache": "1.0.3", - "loader-utils": "1.4.0", - "object-hash": "2.0.3", - "schema-utils": "2.7.1" + "fs-extra": "^8.1.0", + "loader-fs-cache": "^1.0.3", + "loader-utils": "^1.2.3", + "object-hash": "^2.0.3", + "schema-utils": "^2.6.5" }, "dependencies": { "fs-extra": { @@ -5253,9 +5609,9 @@ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "jsonfile": "4.0.0", - "universalify": "0.1.2" + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" } } } @@ -5266,9 +5622,9 @@ "integrity": "sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==", "dev": true, "requires": { - "natural-compare": "1.4.0", - "semver": "5.7.1", - "vue-eslint-parser": "7.1.0" + "natural-compare": "^1.4.0", + "semver": "^5.6.0", + "vue-eslint-parser": "^7.0.0" }, "dependencies": { "semver": { @@ -5285,8 +5641,8 @@ "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", "dev": true, "requires": { - "esrecurse": "4.3.0", - "estraverse": "4.3.0" + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" } }, "eslint-utils": { @@ -5295,7 +5651,7 @@ "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, "requires": { - "eslint-visitor-keys": "1.3.0" + "eslint-visitor-keys": "^1.1.0" } }, "eslint-visitor-keys": { @@ -5310,9 +5666,9 @@ "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", "dev": true, "requires": { - "acorn": "7.4.0", - "acorn-jsx": "5.3.1", - "eslint-visitor-keys": "1.3.0" + "acorn": "^7.1.1", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.1.0" }, "dependencies": { "acorn": { @@ -5335,7 +5691,7 @@ "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", "dev": true, "requires": { - "estraverse": "5.2.0" + "estraverse": "^5.1.0" }, "dependencies": { "estraverse": { @@ -5352,7 +5708,7 @@ "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, "requires": { - "estraverse": "5.2.0" + "estraverse": "^5.2.0" }, "dependencies": { "estraverse": { @@ -5399,7 +5755,7 @@ "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", "dev": true, "requires": { - "original": "1.0.2" + "original": "^1.0.0" } }, "evp_bytestokey": { @@ -5408,8 +5764,8 @@ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", "dev": true, "requires": { - "md5.js": "1.3.5", - "safe-buffer": "5.1.2" + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" } }, "execa": { @@ -5418,13 +5774,13 @@ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, "requires": { - "cross-spawn": "6.0.5", - "get-stream": "4.1.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.3", - "strip-eof": "1.0.0" + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" }, "dependencies": { "cross-spawn": { @@ -5433,11 +5789,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.5", - "path-key": "2.0.1", - "semver": "5.7.1", - "shebang-command": "1.2.0", - "which": "1.3.1" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "path-key": { @@ -5458,7 +5814,7 @@ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -5473,7 +5829,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } } } @@ -5484,13 +5840,13 @@ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "debug": { @@ -5508,7 +5864,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -5517,7 +5873,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -5528,36 +5884,36 @@ "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.7", "array-flatten": "1.1.1", "body-parser": "1.19.0", "content-disposition": "0.5.3", - "content-type": "1.0.4", + "content-type": "~1.0.4", "cookie": "0.4.0", "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "1.1.2", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", - "finalhandler": "1.1.2", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", "fresh": "0.5.2", "merge-descriptors": "1.0.1", - "methods": "1.1.2", - "on-finished": "2.3.0", - "parseurl": "1.3.3", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", "path-to-regexp": "0.1.7", - "proxy-addr": "2.0.6", + "proxy-addr": "~2.0.5", "qs": "6.7.0", - "range-parser": "1.2.1", + "range-parser": "~1.2.1", "safe-buffer": "5.1.2", "send": "0.17.1", "serve-static": "1.14.1", "setprototypeof": "1.1.1", - "statuses": "1.5.0", - "type-is": "1.6.18", + "statuses": "~1.5.0", + "type-is": "~1.6.18", "utils-merge": "1.0.1", - "vary": "1.1.2" + "vary": "~1.1.2" }, "dependencies": { "debug": { @@ -5583,8 +5939,8 @@ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", "dev": true, "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -5593,7 +5949,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -5604,9 +5960,9 @@ "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, "requires": { - "chardet": "0.7.0", - "iconv-lite": "0.4.24", - "tmp": "0.0.33" + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" } }, "extglob": { @@ -5615,14 +5971,14 @@ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", "dev": true, "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" }, "dependencies": { "define-property": { @@ -5631,7 +5987,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "extend-shallow": { @@ -5640,7 +5996,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "is-accessor-descriptor": { @@ -5649,7 +6005,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -5658,7 +6014,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -5667,9 +6023,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.3" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -5692,12 +6048,12 @@ "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", "dev": true, "requires": { - "@nodelib/fs.stat": "2.0.3", - "@nodelib/fs.walk": "1.2.4", - "glob-parent": "5.1.1", - "merge2": "1.4.1", - "micromatch": "4.0.2", - "picomatch": "2.2.2" + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" } }, "fast-json-stable-stringify": { @@ -5713,12 +6069,12 @@ "dev": true }, "fastq": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz", - "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz", + "integrity": "sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==", "dev": true, "requires": { - "reusify": "1.0.4" + "reusify": "^1.0.4" } }, "faye-websocket": { @@ -5727,7 +6083,7 @@ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { - "websocket-driver": "0.6.5" + "websocket-driver": ">=0.5.1" } }, "figgy-pudding": { @@ -5742,7 +6098,7 @@ "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.5" } }, "file-entry-cache": { @@ -5751,17 +6107,17 @@ "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", "dev": true, "requires": { - "flat-cache": "2.0.1" + "flat-cache": "^2.0.1" } }, "file-loader": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.0.0.tgz", - "integrity": "sha512-/aMOAYEFXDdjG0wytpTL5YQLfZnnTmLNjn+AIrJ/6HVnTfDqLsVKUUwkDf4I4kgex36BvjuXEn/TX9B/1ESyqQ==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.1.0.tgz", + "integrity": "sha512-26qPdHyTsArQ6gU4P1HJbAbnFTyT2r0pG7czh1GFAd9TZbj0n94wWbupgixZH/ET/meqi2/5+F7DhW4OAXD+Lg==", "dev": true, "requires": { - "loader-utils": "2.0.0", - "schema-utils": "2.7.1" + "loader-utils": "^2.0.0", + "schema-utils": "^2.7.1" }, "dependencies": { "loader-utils": { @@ -5770,9 +6126,9 @@ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { - "big.js": "5.2.2", - "emojis-list": "3.0.0", - "json5": "2.1.3" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" } } } @@ -5789,7 +6145,7 @@ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, "requires": { - "to-regex-range": "5.0.1" + "to-regex-range": "^5.0.1" } }, "finalhandler": { @@ -5799,12 +6155,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.3", - "statuses": "1.5.0", - "unpipe": "1.0.0" + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" }, "dependencies": { "debug": { @@ -5824,8 +6180,8 @@ "integrity": "sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==", "dev": true, "requires": { - "json5": "0.5.1", - "path-exists": "3.0.0" + "json5": "^0.5.1", + "path-exists": "^3.0.0" }, "dependencies": { "json5": { @@ -5842,9 +6198,9 @@ "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "2.1.0", - "pkg-dir": "3.0.0" + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" } }, "find-up": { @@ -5853,7 +6209,7 @@ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "locate-path": "3.0.0" + "locate-path": "^3.0.0" } }, "findup": { @@ -5862,8 +6218,8 @@ "integrity": "sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs=", "dev": true, "requires": { - "colors": "0.6.2", - "commander": "2.1.0" + "colors": "~0.6.0-1", + "commander": "~2.1.0" }, "dependencies": { "commander": { @@ -5880,7 +6236,7 @@ "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", "dev": true, "requires": { - "flatted": "2.0.2", + "flatted": "^2.0.0", "rimraf": "2.6.3", "write": "1.0.3" }, @@ -5891,7 +6247,7 @@ "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } } } @@ -5908,8 +6264,8 @@ "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", "dev": true, "requires": { - "inherits": "2.0.4", - "readable-stream": "2.3.7" + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" }, "dependencies": { "readable-stream": { @@ -5918,13 +6274,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -5934,7 +6290,7 @@ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", "requires": { - "debug": "3.1.0" + "debug": "=3.1.0" } }, "for-in": { @@ -5955,13 +6311,13 @@ "integrity": "sha512-DUxuQaKoqfNne8iikd14SAkh5uw4+8vNifp6gmA73yYNS6ywLIWSLD/n/mBzHQRpW3J7rbATEakmiA8JvkTyZw==", "dev": true, "requires": { - "@babel/code-frame": "7.10.4", - "chalk": "2.4.2", - "micromatch": "3.1.10", - "minimatch": "3.0.4", - "semver": "5.7.1", - "tapable": "1.1.3", - "worker-rpc": "0.1.1" + "@babel/code-frame": "^7.5.5", + "chalk": "^2.4.1", + "micromatch": "^3.1.10", + "minimatch": "^3.0.4", + "semver": "^5.6.0", + "tapable": "^1.0.0", + "worker-rpc": "^0.1.0" }, "dependencies": { "braces": { @@ -5970,16 +6326,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -5988,7 +6344,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -5999,9 +6355,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "fill-range": { @@ -6010,10 +6366,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -6022,7 +6378,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -6039,7 +6395,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6048,7 +6404,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6059,19 +6415,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.3", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "semver": { @@ -6086,8 +6442,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } } } @@ -6098,9 +6454,9 @@ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", "dev": true, "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.8", - "mime-types": "2.1.27" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" } }, "forwarded": { @@ -6115,7 +6471,7 @@ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { - "map-cache": "0.2.2" + "map-cache": "^0.2.2" } }, "fresh": { @@ -6130,9 +6486,9 @@ "integrity": "sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw==", "dev": true, "requires": { - "chalk": "1.1.3", - "error-stack-parser": "2.0.6", - "string-width": "2.1.1" + "chalk": "^1.1.3", + "error-stack-parser": "^2.0.0", + "string-width": "^2.0.0" }, "dependencies": { "ansi-styles": { @@ -6147,11 +6503,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "strip-ansi": { @@ -6160,7 +6516,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "supports-color": { @@ -6177,8 +6533,8 @@ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "2.0.4", - "readable-stream": "2.3.7" + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" }, "dependencies": { "readable-stream": { @@ -6187,13 +6543,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -6210,20 +6566,28 @@ "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", "dev": true, "requires": { - "at-least-node": "1.0.0", - "graceful-fs": "4.2.4", - "jsonfile": "6.0.1", - "universalify": "1.0.0" + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" }, "dependencies": { "jsonfile": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", - "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "universalify": "1.0.0" + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + }, + "dependencies": { + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true + } } }, "universalify": { @@ -6240,7 +6604,7 @@ "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dev": true, "requires": { - "minipass": "3.1.3" + "minipass": "^3.0.0" } }, "fs-write-stream-atomic": { @@ -6249,10 +6613,10 @@ "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "iferr": "0.1.5", - "imurmurhash": "0.1.4", - "readable-stream": "2.3.7" + "graceful-fs": "^4.1.2", + "iferr": "^0.1.5", + "imurmurhash": "^0.1.4", + "readable-stream": "1 || 2" }, "dependencies": { "readable-stream": { @@ -6261,13 +6625,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -6291,10 +6655,10 @@ "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "inherits": "2.0.4", - "mkdirp": "0.5.5", - "rimraf": "2.7.1" + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" }, "dependencies": { "rimraf": { @@ -6303,7 +6667,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } } } @@ -6326,14 +6690,14 @@ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.3", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.3" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" }, "dependencies": { "is-fullwidth-code-point": { @@ -6342,7 +6706,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "string-width": { @@ -6351,9 +6715,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "strip-ansi": { @@ -6362,7 +6726,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } } } @@ -6373,13 +6737,13 @@ "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", "dev": true, "requires": { - "globule": "1.3.2" + "globule": "^1.0.0" } }, "gensync": { - "version": "1.0.0-beta.1", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz", - "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==", + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true }, "get-caller-file": { @@ -6388,6 +6752,17 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, + "get-intrinsic": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz", + "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + }, "get-stdin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", @@ -6400,7 +6775,7 @@ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", "dev": true, "requires": { - "pump": "3.0.0" + "pump": "^3.0.0" } }, "get-value": { @@ -6415,7 +6790,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" } }, "glob": { @@ -6424,12 +6799,12 @@ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.4", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-parent": { @@ -6438,7 +6813,7 @@ "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "dev": true, "requires": { - "is-glob": "4.0.1" + "is-glob": "^4.0.1" } }, "global-agent": { @@ -6448,13 +6823,13 @@ "dev": true, "optional": true, "requires": { - "boolean": "3.0.1", - "core-js": "3.6.5", - "es6-error": "4.1.1", - "matcher": "3.0.0", - "roarr": "2.15.4", - "semver": "7.3.2", - "serialize-error": "7.0.1" + "boolean": "^3.0.1", + "core-js": "^3.6.5", + "es6-error": "^4.1.1", + "matcher": "^3.0.0", + "roarr": "^2.15.3", + "semver": "^7.3.2", + "serialize-error": "^7.0.1" } }, "global-tunnel-ng": { @@ -6464,10 +6839,10 @@ "dev": true, "optional": true, "requires": { - "encodeurl": "1.0.2", - "lodash": "4.17.20", - "npm-conf": "1.1.3", - "tunnel": "0.0.6" + "encodeurl": "^1.0.2", + "lodash": "^4.17.10", + "npm-conf": "^1.1.3", + "tunnel": "^0.0.6" } }, "globals": { @@ -6483,7 +6858,7 @@ "dev": true, "optional": true, "requires": { - "define-properties": "1.1.3" + "define-properties": "^1.1.3" } }, "globby": { @@ -6492,12 +6867,12 @@ "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==", "dev": true, "requires": { - "array-union": "2.1.0", - "dir-glob": "3.0.1", - "fast-glob": "3.2.4", - "ignore": "5.1.8", - "merge2": "1.4.1", - "slash": "3.0.0" + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" } }, "globule": { @@ -6506,9 +6881,9 @@ "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==", "dev": true, "requires": { - "glob": "7.1.6", - "lodash": "4.17.20", - "minimatch": "3.0.4" + "glob": "~7.1.1", + "lodash": "~4.17.10", + "minimatch": "~3.0.2" } }, "got": { @@ -6517,17 +6892,17 @@ "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", "dev": true, "requires": { - "@sindresorhus/is": "0.14.0", - "@szmarczak/http-timer": "1.1.2", - "cacheable-request": "6.1.0", - "decompress-response": "3.3.0", - "duplexer3": "0.1.4", - "get-stream": "4.1.0", - "lowercase-keys": "1.0.1", - "mimic-response": "1.0.1", - "p-cancelable": "1.1.0", - "to-readable-stream": "1.0.0", - "url-parse-lax": "3.0.0" + "@sindresorhus/is": "^0.14.0", + "@szmarczak/http-timer": "^1.1.2", + "cacheable-request": "^6.0.0", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^4.1.0", + "lowercase-keys": "^1.0.1", + "mimic-response": "^1.0.1", + "p-cancelable": "^1.0.0", + "to-readable-stream": "^1.0.0", + "url-parse-lax": "^3.0.0" } }, "graceful-fs": { @@ -6542,8 +6917,8 @@ "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==", "dev": true, "requires": { - "duplexer": "0.1.2", - "pify": "4.0.1" + "duplexer": "^0.1.1", + "pify": "^4.0.1" } }, "handle-thing": { @@ -6564,8 +6939,8 @@ "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "dev": true, "requires": { - "ajv": "6.12.5", - "har-schema": "2.0.0" + "ajv": "^6.12.3", + "har-schema": "^2.0.0" } }, "has": { @@ -6574,7 +6949,7 @@ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dev": true, "requires": { - "function-bind": "1.1.1" + "function-bind": "^1.1.1" } }, "has-ansi": { @@ -6583,7 +6958,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-flag": { @@ -6610,9 +6985,9 @@ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" } }, "has-values": { @@ -6621,8 +6996,8 @@ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "is-buffer": { @@ -6637,7 +7012,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6646,7 +7021,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6657,7 +7032,7 @@ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -6668,9 +7043,9 @@ "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", "dev": true, "requires": { - "inherits": "2.0.4", - "readable-stream": "3.6.0", - "safe-buffer": "5.2.1" + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" }, "dependencies": { "safe-buffer": { @@ -6693,8 +7068,8 @@ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", "dev": true, "requires": { - "inherits": "2.0.4", - "minimalistic-assert": "1.0.1" + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" } }, "he": { @@ -6715,9 +7090,9 @@ "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "1.1.7", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" } }, "hoopy": { @@ -6738,10 +7113,10 @@ "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", "dev": true, "requires": { - "inherits": "2.0.4", - "obuf": "1.1.2", - "readable-stream": "2.3.7", - "wbuf": "1.7.3" + "inherits": "^2.0.1", + "obuf": "^1.0.0", + "readable-stream": "^2.0.1", + "wbuf": "^1.1.0" }, "dependencies": { "readable-stream": { @@ -6750,13 +7125,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -6791,13 +7166,13 @@ "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", "dev": true, "requires": { - "camel-case": "3.0.0", - "clean-css": "4.2.3", - "commander": "2.20.3", - "he": "1.2.0", - "param-case": "2.1.1", - "relateurl": "0.2.7", - "uglify-js": "3.11.0" + "camel-case": "^3.0.0", + "clean-css": "^4.2.1", + "commander": "^2.19.0", + "he": "^1.2.0", + "param-case": "^2.1.1", + "relateurl": "^0.2.7", + "uglify-js": "^3.5.1" } }, "html-minifier-terser": { @@ -6806,13 +7181,13 @@ "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==", "dev": true, "requires": { - "camel-case": "4.1.1", - "clean-css": "4.2.3", - "commander": "4.1.1", - "he": "1.2.0", - "param-case": "3.0.3", - "relateurl": "0.2.7", - "terser": "4.8.0" + "camel-case": "^4.1.1", + "clean-css": "^4.2.3", + "commander": "^4.1.1", + "he": "^1.2.0", + "param-case": "^3.0.3", + "relateurl": "^0.2.7", + "terser": "^4.6.3" }, "dependencies": { "camel-case": { @@ -6821,8 +7196,8 @@ "integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==", "dev": true, "requires": { - "pascal-case": "3.1.1", - "tslib": "1.13.0" + "pascal-case": "^3.1.1", + "tslib": "^1.10.0" } }, "commander": { @@ -6837,32 +7212,32 @@ "integrity": "sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==", "dev": true, "requires": { - "dot-case": "3.0.3", - "tslib": "1.13.0" + "dot-case": "^3.0.3", + "tslib": "^1.10.0" } }, "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true } } }, "html-webpack-plugin": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.3.0.tgz", - "integrity": "sha512-C0fzKN8yQoVLTelcJxZfJCE+aAvQiY2VUf3UuKrR4a9k5UMWYOtpDLsaXwATbcVCnI05hUS7L9ULQHWLZhyi3w==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz", + "integrity": "sha512-MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw==", "dev": true, "requires": { - "@types/html-minifier-terser": "5.1.1", - "@types/tapable": "1.0.6", - "@types/webpack": "4.41.22", - "html-minifier-terser": "5.1.1", - "loader-utils": "1.4.0", - "lodash": "4.17.20", - "pretty-error": "2.1.1", - "tapable": "1.1.3", + "@types/html-minifier-terser": "^5.0.0", + "@types/tapable": "^1.0.5", + "@types/webpack": "^4.41.8", + "html-minifier-terser": "^5.0.1", + "loader-utils": "^1.2.3", + "lodash": "^4.17.15", + "pretty-error": "^2.1.1", + "tapable": "^1.1.3", "util.promisify": "1.0.0" }, "dependencies": { @@ -6872,8 +7247,8 @@ "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==", "dev": true, "requires": { - "define-properties": "1.1.3", - "object.getownpropertydescriptors": "2.1.0" + "define-properties": "^1.1.2", + "object.getownpropertydescriptors": "^2.0.3" } } } @@ -6884,12 +7259,12 @@ "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", "dev": true, "requires": { - "domelementtype": "1.3.1", - "domhandler": "2.4.2", - "domutils": "1.7.0", - "entities": "1.1.2", - "inherits": "2.0.4", - "readable-stream": "3.6.0" + "domelementtype": "^1.3.1", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^3.1.1" }, "dependencies": { "entities": { @@ -6918,10 +7293,10 @@ "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", "dev": true, "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.1", - "statuses": "1.5.0", + "statuses": ">= 1.5.0 < 2", "toidentifier": "1.0.0" }, "dependencies": { @@ -6939,9 +7314,9 @@ "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", "dev": true, "requires": { - "eventemitter3": "4.0.7", - "follow-redirects": "1.5.10", - "requires-port": "1.0.0" + "eventemitter3": "^4.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" } }, "http-proxy-middleware": { @@ -6950,10 +7325,10 @@ "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==", "dev": true, "requires": { - "http-proxy": "1.18.1", - "is-glob": "4.0.1", - "lodash": "4.17.20", - "micromatch": "3.1.10" + "http-proxy": "^1.17.0", + "is-glob": "^4.0.0", + "lodash": "^4.17.11", + "micromatch": "^3.1.10" }, "dependencies": { "braces": { @@ -6962,16 +7337,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -6980,7 +7355,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -6991,10 +7366,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -7003,7 +7378,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -7020,7 +7395,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -7029,7 +7404,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7040,19 +7415,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.3", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "to-regex-range": { @@ -7061,8 +7436,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } } } @@ -7073,9 +7448,9 @@ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.16.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "https-browserify": { @@ -7090,7 +7465,7 @@ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "icss-utils": { @@ -7099,13 +7474,13 @@ "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.14" } }, "ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "dev": true }, "iferr": { @@ -7126,7 +7501,7 @@ "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", "dev": true, "requires": { - "import-from": "2.1.0" + "import-from": "^2.1.0" } }, "import-fresh": { @@ -7135,8 +7510,8 @@ "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=", "dev": true, "requires": { - "caller-path": "2.0.0", - "resolve-from": "3.0.0" + "caller-path": "^2.0.0", + "resolve-from": "^3.0.0" } }, "import-from": { @@ -7145,7 +7520,7 @@ "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "import-local": { @@ -7154,8 +7529,8 @@ "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", "dev": true, "requires": { - "pkg-dir": "3.0.0", - "resolve-cwd": "2.0.0" + "pkg-dir": "^3.0.0", + "resolve-cwd": "^2.0.0" } }, "imurmurhash": { @@ -7194,8 +7569,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -7217,19 +7592,19 @@ "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", "dev": true, "requires": { - "ansi-escapes": "4.3.1", - "chalk": "4.1.0", - "cli-cursor": "3.1.0", - "cli-width": "3.0.0", - "external-editor": "3.1.0", - "figures": "3.2.0", - "lodash": "4.17.20", + "ansi-escapes": "^4.2.1", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-width": "^3.0.0", + "external-editor": "^3.0.3", + "figures": "^3.0.0", + "lodash": "^4.17.19", "mute-stream": "0.0.8", - "run-async": "2.4.1", - "rxjs": "6.6.3", - "string-width": "4.2.0", - "strip-ansi": "6.0.0", - "through": "2.3.8" + "run-async": "^2.4.0", + "rxjs": "^6.6.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0", + "through": "^2.3.6" }, "dependencies": { "is-fullwidth-code-point": { @@ -7244,9 +7619,9 @@ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "emoji-regex": "8.0.0", - "is-fullwidth-code-point": "3.0.0", - "strip-ansi": "6.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } } } @@ -7257,17 +7632,8 @@ "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==", "dev": true, "requires": { - "default-gateway": "4.2.0", - "ipaddr.js": "1.9.1" - } - }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, - "requires": { - "loose-envify": "1.4.0" + "default-gateway": "^4.2.0", + "ipaddr.js": "^1.9.0" } }, "ip": { @@ -7300,7 +7666,7 @@ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "is-buffer": { @@ -7315,7 +7681,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7338,7 +7704,7 @@ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, "requires": { - "binary-extensions": "2.1.0" + "binary-extensions": "^2.0.0" } }, "is-buffer": { @@ -7358,12 +7724,12 @@ "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=", "dev": true, "requires": { - "css-color-names": "0.0.4", - "hex-color-regex": "1.1.0", - "hsl-regex": "1.0.0", - "hsla-regex": "1.0.0", - "rgb-regex": "1.0.1", - "rgba-regex": "1.0.0" + "css-color-names": "^0.0.4", + "hex-color-regex": "^1.1.0", + "hsl-regex": "^1.0.0", + "hsla-regex": "^1.0.0", + "rgb-regex": "^1.0.1", + "rgba-regex": "^1.0.0" } }, "is-data-descriptor": { @@ -7372,7 +7738,7 @@ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "is-buffer": { @@ -7387,7 +7753,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -7404,9 +7770,9 @@ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", "dev": true, "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" }, "dependencies": { "kind-of": { @@ -7459,7 +7825,7 @@ "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.1" } }, "is-negative-zero": { @@ -7492,7 +7858,7 @@ "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", "dev": true, "requires": { - "is-path-inside": "2.1.0" + "is-path-inside": "^2.1.0" } }, "is-path-inside": { @@ -7501,7 +7867,7 @@ "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.2" } }, "is-plain-obj": { @@ -7516,7 +7882,7 @@ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "is-regex": { @@ -7525,7 +7891,7 @@ "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", "dev": true, "requires": { - "has-symbols": "1.0.1" + "has-symbols": "^1.0.1" } }, "is-resolvable": { @@ -7546,7 +7912,7 @@ "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==", "dev": true, "requires": { - "html-comment-regex": "1.1.2" + "html-comment-regex": "^1.1.0" } }, "is-symbol": { @@ -7555,7 +7921,7 @@ "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", "dev": true, "requires": { - "has-symbols": "1.0.1" + "has-symbols": "^1.0.1" } }, "is-typedarray": { @@ -7582,7 +7948,7 @@ "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, "requires": { - "is-docker": "2.1.1" + "is-docker": "^2.0.0" } }, "isarray": { @@ -7622,14 +7988,14 @@ "dev": true }, "jest-worker": { - "version": "26.3.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz", - "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==", + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz", + "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==", "dev": true, "requires": { - "@types/node": "10.17.35", - "merge-stream": "2.0.0", - "supports-color": "7.2.0" + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^7.0.0" }, "dependencies": { "has-flag": { @@ -7644,7 +8010,7 @@ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "requires": { - "has-flag": "4.0.0" + "has-flag": "^4.0.0" } } } @@ -7667,8 +8033,8 @@ "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", "dev": true, "requires": { - "argparse": "1.0.10", - "esprima": "4.0.1" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "jsbn": { @@ -7731,7 +8097,7 @@ "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "dev": true, "requires": { - "minimist": "1.2.5" + "minimist": "^1.2.5" } }, "jsonfile": { @@ -7740,7 +8106,7 @@ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { - "graceful-fs": "4.2.4" + "graceful-fs": "^4.1.6" } }, "jsprim": { @@ -7782,8 +8148,8 @@ "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==", "dev": true, "requires": { - "lodash": "4.17.20", - "webpack-sources": "1.4.3" + "lodash": "^4.17.5", + "webpack-sources": "^1.1.0" } }, "launch-editor": { @@ -7792,8 +8158,8 @@ "integrity": "sha512-On+V7K2uZK6wK7x691ycSUbLD/FyKKelArkbaAMSSJU8JmqmhwN2+mnJDNINuJWSrh2L0kDk+ZQtbC/gOWUwLw==", "dev": true, "requires": { - "chalk": "2.4.2", - "shell-quote": "1.7.2" + "chalk": "^2.3.0", + "shell-quote": "^1.6.1" }, "dependencies": { "chalk": { @@ -7802,9 +8168,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -7815,7 +8181,7 @@ "integrity": "sha512-s0UO2/gEGiCgei3/2UN3SMuUj1phjQN8lcpnvgLSz26fAzNWPQ6Nf/kF5IFClnfU2ehp6LrmKdMU/beveO+2jg==", "dev": true, "requires": { - "launch-editor": "2.2.1" + "launch-editor": "^2.2.1" } }, "lazystream": { @@ -7824,7 +8190,7 @@ "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", "dev": true, "requires": { - "readable-stream": "2.3.7" + "readable-stream": "^2.0.5" }, "dependencies": { "readable-stream": { @@ -7833,40 +8199,25 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } }, - "leven": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", - "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", - "dev": true - }, - "levenary": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz", - "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==", - "dev": true, - "requires": { - "leven": "3.1.0" - } - }, "levn": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, "load-json-file": { @@ -7875,11 +8226,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" }, "dependencies": { "parse-json": { @@ -7888,7 +8239,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.2" + "error-ex": "^1.2.0" } }, "pify": { @@ -7905,8 +8256,8 @@ "integrity": "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==", "dev": true, "requires": { - "find-cache-dir": "0.1.1", - "mkdirp": "0.5.5" + "find-cache-dir": "^0.1.1", + "mkdirp": "^0.5.1" }, "dependencies": { "find-cache-dir": { @@ -7915,9 +8266,9 @@ "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", "dev": true, "requires": { - "commondir": "1.0.1", - "mkdirp": "0.5.5", - "pkg-dir": "1.0.0" + "commondir": "^1.0.1", + "mkdirp": "^0.5.1", + "pkg-dir": "^1.0.0" } }, "find-up": { @@ -7926,8 +8277,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "path-exists": { @@ -7936,7 +8287,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "pkg-dir": { @@ -7945,7 +8296,7 @@ "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { - "find-up": "1.1.2" + "find-up": "^1.0.0" } } } @@ -7962,9 +8313,9 @@ "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", "dev": true, "requires": { - "big.js": "5.2.2", - "emojis-list": "3.0.0", - "json5": "1.0.1" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" }, "dependencies": { "json5": { @@ -7973,7 +8324,7 @@ "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "requires": { - "minimist": "1.2.5" + "minimist": "^1.2.0" } } } @@ -7984,8 +8335,8 @@ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "p-locate": "3.0.0", - "path-exists": "3.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, "lodash": { @@ -8048,8 +8399,8 @@ "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.templatesettings": "4.2.0" + "lodash._reinterpolate": "^3.0.0", + "lodash.templatesettings": "^4.0.0" } }, "lodash.templatesettings": { @@ -8058,7 +8409,7 @@ "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0" + "lodash._reinterpolate": "^3.0.0" } }, "lodash.throttle": { @@ -8085,10 +8436,10 @@ "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", "dev": true, "requires": { - "ansi-escapes": "4.3.1", - "cli-cursor": "3.1.0", - "slice-ansi": "4.0.0", - "wrap-ansi": "6.2.0" + "ansi-escapes": "^4.3.0", + "cli-cursor": "^3.1.0", + "slice-ansi": "^4.0.0", + "wrap-ansi": "^6.2.0" } }, "loglevel": { @@ -8097,23 +8448,14 @@ "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==", "dev": true }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, - "requires": { - "js-tokens": "4.0.0" - } - }, "loud-rejection": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.3" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "lower-case": { @@ -8134,7 +8476,7 @@ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, "requires": { - "yallist": "4.0.0" + "yallist": "^4.0.0" } }, "make-dir": { @@ -8143,8 +8485,8 @@ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", "dev": true, "requires": { - "pify": "4.0.1", - "semver": "5.7.1" + "pify": "^4.0.1", + "semver": "^5.6.0" }, "dependencies": { "semver": { @@ -8173,7 +8515,7 @@ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { - "object-visit": "1.0.1" + "object-visit": "^1.0.0" } }, "matcher": { @@ -8183,7 +8525,7 @@ "dev": true, "optional": true, "requires": { - "escape-string-regexp": "4.0.0" + "escape-string-regexp": "^4.0.0" }, "dependencies": { "escape-string-regexp": { @@ -8201,9 +8543,9 @@ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", "dev": true, "requires": { - "hash-base": "3.1.0", - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" } }, "mdn-data": { @@ -8224,8 +8566,8 @@ "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", "dev": true, "requires": { - "errno": "0.1.7", - "readable-stream": "2.3.7" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" }, "dependencies": { "readable-stream": { @@ -8234,13 +8576,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -8251,16 +8593,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.5", - "normalize-package-data": "2.5.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" } }, "merge-descriptors": { @@ -8275,7 +8617,7 @@ "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "^0.6.1" }, "dependencies": { "source-map": { @@ -8316,8 +8658,8 @@ "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", "dev": true, "requires": { - "braces": "3.0.2", - "picomatch": "2.2.2" + "braces": "^3.0.1", + "picomatch": "^2.0.5" } }, "miller-rabin": { @@ -8326,8 +8668,8 @@ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", "dev": true, "requires": { - "bn.js": "4.11.9", - "brorand": "1.1.0" + "bn.js": "^4.0.0", + "brorand": "^1.0.1" }, "dependencies": { "bn.js": { @@ -8372,15 +8714,15 @@ "dev": true }, "mini-css-extract-plugin": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.10.0.tgz", - "integrity": "sha512-QgKgJBjaJhxVPwrLNqqwNS0AGkuQQ31Hp4xGXEK/P7wehEg6qmNtReHKai3zRXqY60wGVWLYcOMJK2b98aGc3A==", + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.2.tgz", + "integrity": "sha512-h2LknfX4U1kScXxH8xE9LCOqT5B+068EAj36qicMb8l4dqdJoyHcmWmpd+ueyZfgu/POvIn+teoUnTtei2ikug==", "dev": true, "requires": { - "loader-utils": "1.4.0", + "loader-utils": "^1.1.0", "normalize-url": "1.9.1", - "schema-utils": "1.0.0", - "webpack-sources": "1.4.3" + "schema-utils": "^1.0.0", + "webpack-sources": "^1.1.0" }, "dependencies": { "normalize-url": { @@ -8389,10 +8731,10 @@ "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", "dev": true, "requires": { - "object-assign": "4.1.1", - "prepend-http": "1.0.4", - "query-string": "4.3.4", - "sort-keys": "1.1.2" + "object-assign": "^4.0.1", + "prepend-http": "^1.0.0", + "query-string": "^4.1.0", + "sort-keys": "^1.0.0" } }, "prepend-http": { @@ -8407,9 +8749,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "6.12.5", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.5.2" + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" } } } @@ -8432,7 +8774,7 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -8447,7 +8789,7 @@ "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==", "dev": true, "requires": { - "yallist": "4.0.0" + "yallist": "^4.0.0" } }, "minipass-collect": { @@ -8456,7 +8798,7 @@ "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", "dev": true, "requires": { - "minipass": "3.1.3" + "minipass": "^3.0.0" } }, "minipass-flush": { @@ -8465,7 +8807,7 @@ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", "dev": true, "requires": { - "minipass": "3.1.3" + "minipass": "^3.0.0" } }, "minipass-pipeline": { @@ -8474,7 +8816,7 @@ "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", "dev": true, "requires": { - "minipass": "3.1.3" + "minipass": "^3.0.0" } }, "minizlib": { @@ -8483,8 +8825,8 @@ "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "dev": true, "requires": { - "minipass": "3.1.3", - "yallist": "4.0.0" + "minipass": "^3.0.0", + "yallist": "^4.0.0" } }, "mississippi": { @@ -8493,16 +8835,16 @@ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.7.1", - "end-of-stream": "1.4.4", - "flush-write-stream": "1.1.1", - "from2": "2.3.0", - "parallel-transform": "1.2.0", - "pump": "3.0.0", - "pumpify": "1.5.1", - "stream-each": "1.2.3", - "through2": "2.0.5" + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" } }, "mixin-deep": { @@ -8511,8 +8853,8 @@ "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" }, "dependencies": { "is-extendable": { @@ -8521,7 +8863,7 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "requires": { - "is-plain-object": "2.0.4" + "is-plain-object": "^2.0.4" } } } @@ -8532,13 +8874,13 @@ "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, "requires": { - "minimist": "1.2.5" + "minimist": "^1.2.5" } }, "moment": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz", - "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==", + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", + "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==", "dev": true }, "move-concurrently": { @@ -8547,12 +8889,12 @@ "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", "dev": true, "requires": { - "aproba": "1.2.0", - "copy-concurrently": "1.0.5", - "fs-write-stream-atomic": "1.0.10", - "mkdirp": "0.5.5", - "rimraf": "2.7.1", - "run-queue": "1.0.3" + "aproba": "^1.1.1", + "copy-concurrently": "^1.0.0", + "fs-write-stream-atomic": "^1.0.8", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.3" }, "dependencies": { "rimraf": { @@ -8561,7 +8903,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } } } @@ -8577,8 +8919,8 @@ "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", "dev": true, "requires": { - "dns-packet": "1.3.1", - "thunky": "1.1.0" + "dns-packet": "^1.3.1", + "thunky": "^1.0.2" } }, "multicast-dns-service-types": { @@ -8594,9 +8936,9 @@ "dev": true }, "nan": { - "version": "2.14.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", - "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", "dev": true }, "nanomatch": { @@ -8605,17 +8947,17 @@ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-windows": "1.0.2", - "kind-of": "6.0.3", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" } }, "natural-compare": { @@ -8648,7 +8990,7 @@ "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", "dev": true, "requires": { - "lower-case": "1.1.4" + "lower-case": "^1.1.1" } }, "node-forge": { @@ -8663,18 +9005,18 @@ "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", "dev": true, "requires": { - "fstream": "1.0.12", - "glob": "7.1.6", - "graceful-fs": "4.2.4", - "mkdirp": "0.5.5", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.5", - "request": "2.88.2", - "rimraf": "2.7.1", - "semver": "5.3.0", - "tar": "2.2.2", - "which": "1.3.1" + "fstream": "^1.0.0", + "glob": "^7.0.3", + "graceful-fs": "^4.1.2", + "mkdirp": "^0.5.0", + "nopt": "2 || 3", + "npmlog": "0 || 1 || 2 || 3 || 4", + "osenv": "0", + "request": "^2.87.0", + "rimraf": "2", + "semver": "~5.3.0", + "tar": "^2.0.0", + "which": "1" }, "dependencies": { "rimraf": { @@ -8683,7 +9025,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } }, "semver": { @@ -8698,9 +9040,9 @@ "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", "dev": true, "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.12", - "inherits": "2.0.4" + "block-stream": "*", + "fstream": "^1.0.12", + "inherits": "2" } }, "which": { @@ -8709,7 +9051,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } } } @@ -8720,29 +9062,29 @@ "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", "dev": true, "requires": { - "assert": "1.5.0", - "browserify-zlib": "0.2.0", - "buffer": "4.9.2", - "console-browserify": "1.2.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "domain-browser": "1.2.0", - "events": "3.2.0", - "https-browserify": "1.0.0", - "os-browserify": "0.3.0", + "assert": "^1.1.1", + "browserify-zlib": "^0.2.0", + "buffer": "^4.3.0", + "console-browserify": "^1.1.0", + "constants-browserify": "^1.0.0", + "crypto-browserify": "^3.11.0", + "domain-browser": "^1.1.1", + "events": "^3.0.0", + "https-browserify": "^1.0.0", + "os-browserify": "^0.3.0", "path-browserify": "0.0.1", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.7", - "stream-browserify": "2.0.2", - "stream-http": "2.8.3", - "string_decoder": "1.1.1", - "timers-browserify": "2.0.11", + "process": "^0.11.10", + "punycode": "^1.2.4", + "querystring-es3": "^0.2.0", + "readable-stream": "^2.3.3", + "stream-browserify": "^2.0.1", + "stream-http": "^2.7.2", + "string_decoder": "^1.0.0", + "timers-browserify": "^2.0.4", "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.11.1", - "vm-browserify": "1.1.2" + "url": "^0.11.0", + "util": "^0.11.0", + "vm-browserify": "^1.0.1" }, "dependencies": { "buffer": { @@ -8751,9 +9093,9 @@ "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", "dev": true, "requires": { - "base64-js": "1.3.1", - "ieee754": "1.1.13", - "isarray": "1.0.0" + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" } }, "punycode": { @@ -8768,13 +9110,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -8785,8 +9127,8 @@ "integrity": "sha512-0So+BicZSQaY4sLqeutdkXWiTsmr+QrlGtm5dn4OPJBcnZRmjupFbWnZbDLec95KQTZHAwt8+vk+nEIXzPHxGw==", "dev": true, "requires": { - "loader-utils": "2.0.0", - "schema-utils": "2.7.1" + "loader-utils": "^2.0.0", + "schema-utils": "^2.7.0" }, "dependencies": { "loader-utils": { @@ -8795,17 +9137,17 @@ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { - "big.js": "5.2.2", - "emojis-list": "3.0.0", - "json5": "2.1.3" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" } } } }, "node-releases": { - "version": "1.1.61", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz", - "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==", + "version": "1.1.65", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.65.tgz", + "integrity": "sha512-YpzJOe2WFIW0V4ZkJQd/DGR/zdVwc/pI4Nl1CZrBO19FdRcSTmsuhdttw9rsTzzJLrNcSloLiBbEYx1C4f6gpA==", "dev": true }, "node-sass": { @@ -8814,23 +9156,23 @@ "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", "dev": true, "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.3", - "get-stdin": "4.0.1", - "glob": "7.1.6", - "in-publish": "2.0.1", - "lodash": "4.17.20", - "meow": "3.7.0", - "mkdirp": "0.5.5", - "nan": "2.14.1", - "node-gyp": "3.8.0", - "npmlog": "4.1.2", - "request": "2.88.2", + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^3.0.0", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "in-publish": "^2.0.0", + "lodash": "^4.17.15", + "meow": "^3.7.0", + "mkdirp": "^0.5.1", + "nan": "^2.13.2", + "node-gyp": "^3.8.0", + "npmlog": "^4.0.0", + "request": "^2.88.0", "sass-graph": "2.2.5", - "stdout-stream": "1.4.1", - "true-case-path": "1.0.3" + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" }, "dependencies": { "ansi-styles": { @@ -8845,11 +9187,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "cross-spawn": { @@ -8858,8 +9200,8 @@ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { - "lru-cache": "4.1.5", - "which": "1.3.1" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, "lru-cache": { @@ -8868,8 +9210,8 @@ "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "strip-ansi": { @@ -8878,7 +9220,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "supports-color": { @@ -8893,7 +9235,7 @@ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "yallist": { @@ -8910,7 +9252,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1.1.1" + "abbrev": "1" } }, "normalize-package-data": { @@ -8919,10 +9261,10 @@ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, "requires": { - "hosted-git-info": "2.8.8", - "resolve": "1.17.0", - "semver": "5.7.1", - "validate-npm-package-license": "3.0.4" + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" }, "dependencies": { "semver": { @@ -8958,8 +9300,8 @@ "dev": true, "optional": true, "requires": { - "config-chain": "1.1.12", - "pify": "3.0.0" + "config-chain": "^1.1.11", + "pify": "^3.0.0" }, "dependencies": { "pify": { @@ -8977,7 +9319,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" }, "dependencies": { "path-key": { @@ -8994,10 +9336,10 @@ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "requires": { - "are-we-there-yet": "1.1.5", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "nth-check": { @@ -9006,7 +9348,7 @@ "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", "dev": true, "requires": { - "boolbase": "1.0.0" + "boolbase": "~1.0.0" } }, "num2fraction": { @@ -9039,9 +9381,9 @@ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" }, "dependencies": { "define-property": { @@ -9050,7 +9392,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "is-buffer": { @@ -9065,7 +9407,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -9088,8 +9430,30 @@ "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.18.0-next.1" + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + } } }, "object-keys": { @@ -9104,19 +9468,19 @@ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.0" } }, "object.assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz", - "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.18.0-next.1", - "has-symbols": "1.0.1", - "object-keys": "1.1.1" + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" } }, "object.getownpropertydescriptors": { @@ -9125,29 +9489,8 @@ "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.17.7" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "dev": true, - "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" - } - } + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" } }, "object.pick": { @@ -9156,7 +9499,7 @@ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { - "isobject": "3.0.1" + "isobject": "^3.0.1" } }, "object.values": { @@ -9165,31 +9508,10 @@ "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.17.7", - "function-bind": "1.1.1", - "has": "1.0.3" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "dev": true, - "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" - } - } + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" } }, "obuf": { @@ -9219,7 +9541,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "onetime": { @@ -9228,7 +9550,7 @@ "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, "requires": { - "mimic-fn": "2.1.0" + "mimic-fn": "^2.1.0" } }, "open": { @@ -9237,8 +9559,8 @@ "integrity": "sha512-lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA==", "dev": true, "requires": { - "is-docker": "2.1.1", - "is-wsl": "2.2.0" + "is-docker": "^2.0.0", + "is-wsl": "^2.1.1" } }, "opener": { @@ -9253,7 +9575,7 @@ "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", "dev": true, "requires": { - "is-wsl": "1.1.0" + "is-wsl": "^1.1.0" }, "dependencies": { "is-wsl": { @@ -9265,13 +9587,13 @@ } }, "optimize-css-assets-webpack-plugin": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.3.tgz", - "integrity": "sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz", + "integrity": "sha512-wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A==", "dev": true, "requires": { - "cssnano": "4.1.10", - "last-call-webpack-plugin": "3.0.0" + "cssnano": "^4.1.10", + "last-call-webpack-plugin": "^3.0.0" } }, "optionator": { @@ -9280,12 +9602,12 @@ "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", "dev": true, "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "word-wrap": "1.2.3" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" } }, "original": { @@ -9294,7 +9616,7 @@ "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==", "dev": true, "requires": { - "url-parse": "1.4.7" + "url-parse": "^1.4.3" } }, "os-browserify": { @@ -9321,8 +9643,8 @@ "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "ouch": { @@ -9332,9 +9654,9 @@ "dev": true, "requires": { "@positron/stack-trace": "1.0.0", - "ejs": "2.7.4", - "escape-html": "1.0.3", - "lodash": "4.17.20" + "ejs": "^2.3.1", + "escape-html": "^1.0.1", + "lodash": "^4.17.10" } }, "p-cancelable": { @@ -9355,7 +9677,7 @@ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -9364,7 +9686,7 @@ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", "dev": true, "requires": { - "p-limit": "2.3.0" + "p-limit": "^2.0.0" } }, "p-map": { @@ -9373,7 +9695,7 @@ "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, "requires": { - "aggregate-error": "3.1.0" + "aggregate-error": "^3.0.0" } }, "p-retry": { @@ -9382,7 +9704,7 @@ "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==", "dev": true, "requires": { - "retry": "0.12.0" + "retry": "^0.12.0" } }, "p-try": { @@ -9403,9 +9725,9 @@ "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", "dev": true, "requires": { - "cyclist": "1.0.1", - "inherits": "2.0.4", - "readable-stream": "2.3.7" + "cyclist": "^1.0.1", + "inherits": "^2.0.3", + "readable-stream": "^2.1.5" }, "dependencies": { "readable-stream": { @@ -9414,13 +9736,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -9431,7 +9753,7 @@ "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", "dev": true, "requires": { - "no-case": "2.3.2" + "no-case": "^2.2.0" } }, "parent-module": { @@ -9440,7 +9762,7 @@ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, "requires": { - "callsites": "3.1.0" + "callsites": "^3.0.0" }, "dependencies": { "callsites": { @@ -9457,11 +9779,11 @@ "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", "dev": true, "requires": { - "asn1.js": "5.4.1", - "browserify-aes": "1.2.0", - "evp_bytestokey": "1.0.3", - "pbkdf2": "3.1.1", - "safe-buffer": "5.1.2" + "asn1.js": "^5.2.0", + "browserify-aes": "^1.0.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" } }, "parse-json": { @@ -9470,8 +9792,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "1.3.2", - "json-parse-better-errors": "1.0.2" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" } }, "parseurl": { @@ -9486,8 +9808,8 @@ "integrity": "sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==", "dev": true, "requires": { - "no-case": "3.0.3", - "tslib": "1.13.0" + "no-case": "^3.0.3", + "tslib": "^1.10.0" }, "dependencies": { "lower-case": { @@ -9496,7 +9818,7 @@ "integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==", "dev": true, "requires": { - "tslib": "1.13.0" + "tslib": "^1.10.0" } }, "no-case": { @@ -9505,14 +9827,14 @@ "integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==", "dev": true, "requires": { - "lower-case": "2.0.1", - "tslib": "1.13.0" + "lower-case": "^2.0.1", + "tslib": "^1.10.0" } }, "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", "dev": true } } @@ -9583,11 +9905,11 @@ "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==", "dev": true, "requires": { - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "performance-now": { @@ -9620,7 +9942,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { @@ -9629,7 +9951,7 @@ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "find-up": "3.0.0" + "find-up": "^3.0.0" } }, "pkg-up": { @@ -9638,7 +9960,7 @@ "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", "dev": true, "requires": { - "find-up": "3.0.0" + "find-up": "^3.0.0" } }, "plist": { @@ -9647,9 +9969,9 @@ "integrity": "sha512-GpgvHHocGRyQm74b6FWEZZVRroHKE1I0/BTjAmySaohK+cUn+hZpbqXkc3KWgW3gQYkqcQej35FohcT0FRlkRQ==", "dev": true, "requires": { - "base64-js": "1.3.1", - "xmlbuilder": "9.0.7", - "xmldom": "0.1.31" + "base64-js": "^1.2.3", + "xmlbuilder": "^9.0.7", + "xmldom": "0.1.x" } }, "portfinder": { @@ -9658,9 +9980,9 @@ "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==", "dev": true, "requires": { - "async": "2.6.3", - "debug": "3.2.6", - "mkdirp": "0.5.5" + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.5" }, "dependencies": { "async": { @@ -9669,7 +9991,7 @@ "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", "dev": true, "requires": { - "lodash": "4.17.20" + "lodash": "^4.17.14" } }, "debug": { @@ -9678,7 +10000,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "ms": { @@ -9701,9 +10023,9 @@ "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", "dev": true, "requires": { - "chalk": "2.4.2", - "source-map": "0.6.1", - "supports-color": "6.1.0" + "chalk": "^2.4.2", + "source-map": "^0.6.1", + "supports-color": "^6.1.0" }, "dependencies": { "chalk": { @@ -9712,9 +10034,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" }, "dependencies": { "supports-color": { @@ -9723,7 +10045,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -9740,20 +10062,20 @@ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } }, "postcss-calc": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.4.tgz", - "integrity": "sha512-0I79VRAd1UTkaHzY9w83P39YGO/M3bG7/tNLrHGEunBolfoGM0hSjrGvjoeaj0JE/zIw5GsI2KZ0UwDJqv5hjw==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz", + "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==", "dev": true, "requires": { - "postcss": "7.0.35", - "postcss-selector-parser": "6.0.4", - "postcss-value-parser": "4.1.0" + "postcss": "^7.0.27", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.0.2" } }, "postcss-colormin": { @@ -9762,11 +10084,11 @@ "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==", "dev": true, "requires": { - "browserslist": "4.14.5", - "color": "3.1.2", - "has": "1.0.3", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "browserslist": "^4.0.0", + "color": "^3.0.0", + "has": "^1.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9783,8 +10105,8 @@ "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==", "dev": true, "requires": { - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9801,7 +10123,7 @@ "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.0" } }, "postcss-discard-duplicates": { @@ -9810,7 +10132,7 @@ "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.0" } }, "postcss-discard-empty": { @@ -9819,7 +10141,7 @@ "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.0" } }, "postcss-discard-overridden": { @@ -9828,7 +10150,7 @@ "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.0" } }, "postcss-load-config": { @@ -9837,8 +10159,8 @@ "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==", "dev": true, "requires": { - "cosmiconfig": "5.2.1", - "import-cwd": "2.1.0" + "cosmiconfig": "^5.0.0", + "import-cwd": "^2.0.0" } }, "postcss-loader": { @@ -9847,10 +10169,10 @@ "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==", "dev": true, "requires": { - "loader-utils": "1.4.0", - "postcss": "7.0.35", - "postcss-load-config": "2.1.2", - "schema-utils": "1.0.0" + "loader-utils": "^1.1.0", + "postcss": "^7.0.0", + "postcss-load-config": "^2.0.0", + "schema-utils": "^1.0.0" }, "dependencies": { "schema-utils": { @@ -9859,9 +10181,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "6.12.5", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.5.2" + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" } } } @@ -9873,9 +10195,9 @@ "dev": true, "requires": { "css-color-names": "0.0.4", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1", - "stylehacks": "4.0.3" + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0", + "stylehacks": "^4.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9892,12 +10214,12 @@ "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==", "dev": true, "requires": { - "browserslist": "4.14.5", - "caniuse-api": "3.0.0", - "cssnano-util-same-parent": "4.0.1", - "postcss": "7.0.35", - "postcss-selector-parser": "3.1.2", - "vendors": "1.0.4" + "browserslist": "^4.0.0", + "caniuse-api": "^3.0.0", + "cssnano-util-same-parent": "^4.0.0", + "postcss": "^7.0.0", + "postcss-selector-parser": "^3.0.0", + "vendors": "^1.0.0" }, "dependencies": { "postcss-selector-parser": { @@ -9906,9 +10228,9 @@ "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "5.2.0", - "indexes-of": "1.0.1", - "uniq": "1.0.1" + "dot-prop": "^5.2.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1" } } } @@ -9919,8 +10241,8 @@ "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==", "dev": true, "requires": { - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9937,10 +10259,10 @@ "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==", "dev": true, "requires": { - "cssnano-util-get-arguments": "4.0.0", - "is-color-stop": "1.1.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-arguments": "^4.0.0", + "is-color-stop": "^1.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9957,12 +10279,12 @@ "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==", "dev": true, "requires": { - "alphanum-sort": "1.0.2", - "browserslist": "4.14.5", - "cssnano-util-get-arguments": "4.0.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1", - "uniqs": "2.0.0" + "alphanum-sort": "^1.0.0", + "browserslist": "^4.0.0", + "cssnano-util-get-arguments": "^4.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0", + "uniqs": "^2.0.0" }, "dependencies": { "postcss-value-parser": { @@ -9979,10 +10301,10 @@ "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==", "dev": true, "requires": { - "alphanum-sort": "1.0.2", - "has": "1.0.3", - "postcss": "7.0.35", - "postcss-selector-parser": "3.1.2" + "alphanum-sort": "^1.0.0", + "has": "^1.0.0", + "postcss": "^7.0.0", + "postcss-selector-parser": "^3.0.0" }, "dependencies": { "postcss-selector-parser": { @@ -9991,9 +10313,9 @@ "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "5.2.0", - "indexes-of": "1.0.1", - "uniq": "1.0.1" + "dot-prop": "^5.2.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1" } } } @@ -10004,7 +10326,7 @@ "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.5" } }, "postcss-modules-local-by-default": { @@ -10013,10 +10335,10 @@ "integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==", "dev": true, "requires": { - "icss-utils": "4.1.1", - "postcss": "7.0.35", - "postcss-selector-parser": "6.0.4", - "postcss-value-parser": "4.1.0" + "icss-utils": "^4.1.1", + "postcss": "^7.0.32", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.1.0" } }, "postcss-modules-scope": { @@ -10025,8 +10347,8 @@ "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==", "dev": true, "requires": { - "postcss": "7.0.35", - "postcss-selector-parser": "6.0.4" + "postcss": "^7.0.6", + "postcss-selector-parser": "^6.0.0" } }, "postcss-modules-values": { @@ -10035,8 +10357,8 @@ "integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==", "dev": true, "requires": { - "icss-utils": "4.1.1", - "postcss": "7.0.35" + "icss-utils": "^4.0.0", + "postcss": "^7.0.6" } }, "postcss-normalize-charset": { @@ -10045,7 +10367,7 @@ "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.0" } }, "postcss-normalize-display-values": { @@ -10054,9 +10376,9 @@ "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==", "dev": true, "requires": { - "cssnano-util-get-match": "4.0.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-match": "^4.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10073,10 +10395,10 @@ "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==", "dev": true, "requires": { - "cssnano-util-get-arguments": "4.0.0", - "has": "1.0.3", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-arguments": "^4.0.0", + "has": "^1.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10093,10 +10415,10 @@ "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==", "dev": true, "requires": { - "cssnano-util-get-arguments": "4.0.0", - "cssnano-util-get-match": "4.0.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-arguments": "^4.0.0", + "cssnano-util-get-match": "^4.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10113,9 +10435,9 @@ "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==", "dev": true, "requires": { - "has": "1.0.3", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "has": "^1.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10132,9 +10454,9 @@ "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==", "dev": true, "requires": { - "cssnano-util-get-match": "4.0.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-match": "^4.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10151,9 +10473,9 @@ "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==", "dev": true, "requires": { - "browserslist": "4.14.5", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "browserslist": "^4.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10170,10 +10492,10 @@ "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==", "dev": true, "requires": { - "is-absolute-url": "2.1.0", - "normalize-url": "3.3.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "is-absolute-url": "^2.0.0", + "normalize-url": "^3.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "normalize-url": { @@ -10196,8 +10518,8 @@ "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==", "dev": true, "requires": { - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10214,9 +10536,9 @@ "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==", "dev": true, "requires": { - "cssnano-util-get-arguments": "4.0.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-arguments": "^4.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10233,10 +10555,10 @@ "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==", "dev": true, "requires": { - "browserslist": "4.14.5", - "caniuse-api": "3.0.0", - "has": "1.0.3", - "postcss": "7.0.35" + "browserslist": "^4.0.0", + "caniuse-api": "^3.0.0", + "has": "^1.0.0", + "postcss": "^7.0.0" } }, "postcss-reduce-transforms": { @@ -10245,10 +10567,10 @@ "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==", "dev": true, "requires": { - "cssnano-util-get-match": "4.0.0", - "has": "1.0.3", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1" + "cssnano-util-get-match": "^4.0.0", + "has": "^1.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10274,7 +10596,7 @@ "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==", "dev": true, "requires": { - "postcss": "7.0.35" + "postcss": "^7.0.26" } }, "postcss-selector-parser": { @@ -10283,10 +10605,10 @@ "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==", "dev": true, "requires": { - "cssesc": "3.0.0", - "indexes-of": "1.0.1", - "uniq": "1.0.1", - "util-deprecate": "1.0.2" + "cssesc": "^3.0.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1", + "util-deprecate": "^1.0.2" } }, "postcss-svgo": { @@ -10295,10 +10617,10 @@ "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==", "dev": true, "requires": { - "is-svg": "3.0.0", - "postcss": "7.0.35", - "postcss-value-parser": "3.3.1", - "svgo": "1.3.2" + "is-svg": "^3.0.0", + "postcss": "^7.0.0", + "postcss-value-parser": "^3.0.0", + "svgo": "^1.0.0" }, "dependencies": { "postcss-value-parser": { @@ -10315,9 +10637,9 @@ "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==", "dev": true, "requires": { - "alphanum-sort": "1.0.2", - "postcss": "7.0.35", - "uniqs": "2.0.0" + "alphanum-sort": "^1.0.0", + "postcss": "^7.0.0", + "uniqs": "^2.0.0" } }, "postcss-value-parser": { @@ -10346,13 +10668,13 @@ "optional": true }, "pretty-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz", - "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz", + "integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==", "dev": true, "requires": { - "renderkid": "2.0.3", - "utila": "0.4.0" + "lodash": "^4.17.20", + "renderkid": "^2.0.4" } }, "process": { @@ -10392,7 +10714,7 @@ "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==", "dev": true, "requires": { - "forwarded": "0.1.2", + "forwarded": "~0.1.2", "ipaddr.js": "1.9.1" } }, @@ -10420,12 +10742,12 @@ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", "dev": true, "requires": { - "bn.js": "4.11.9", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "parse-asn1": "5.1.6", - "randombytes": "2.1.0", - "safe-buffer": "5.1.2" + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" }, "dependencies": { "bn.js": { @@ -10442,8 +10764,8 @@ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "pumpify": { @@ -10452,9 +10774,9 @@ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", "dev": true, "requires": { - "duplexify": "3.7.1", - "inherits": "2.0.4", - "pump": "2.0.1" + "duplexify": "^3.6.0", + "inherits": "^2.0.3", + "pump": "^2.0.0" }, "dependencies": { "pump": { @@ -10463,8 +10785,8 @@ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } } } @@ -10488,9 +10810,9 @@ "dev": true }, "quasar": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/quasar/-/quasar-1.14.0.tgz", - "integrity": "sha512-S7tREMAKP53n9slk1E6e0qwKQaNAA5N1aGUDUTr3zyVtaDj3FeIvacoppTZFUhXTrwAbbRd/mMZdMHLSuNsbBQ==" + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/quasar/-/quasar-1.14.3.tgz", + "integrity": "sha512-0baTygeaRhrOK9e+mtc32i6+xOnPKXaplgELJJdGWeoQBCwwfUX0tah0fgUmrdOEft3XmwhYW0a9yv/TAPUz7A==" }, "query-string": { "version": "4.3.4", @@ -10498,8 +10820,8 @@ "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", "dev": true, "requires": { - "object-assign": "4.1.1", - "strict-uri-encode": "1.1.0" + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" } }, "querystring": { @@ -10526,7 +10848,7 @@ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.1.0" } }, "randomfill": { @@ -10535,8 +10857,8 @@ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", "dev": true, "requires": { - "randombytes": "2.1.0", - "safe-buffer": "5.1.2" + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" } }, "range-parser": { @@ -10563,9 +10885,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.5.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" }, "dependencies": { "path-type": { @@ -10574,9 +10896,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pify": { @@ -10593,8 +10915,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" }, "dependencies": { "find-up": { @@ -10603,8 +10925,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "path-exists": { @@ -10613,7 +10935,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } } } @@ -10624,18 +10946,18 @@ "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dev": true, "requires": { - "inherits": "2.0.4", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } }, "readdir-glob": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.0.tgz", - "integrity": "sha512-KgT0oXPIDQRRRYFf+06AUaodICTep2Q5635BORLzTEzp7rEqcR14a47j3Vzm3ix7FeI1lp8mYyG7r8lTB06Pyg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.1.tgz", + "integrity": "sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA==", "dev": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "readdirp": { @@ -10644,7 +10966,7 @@ "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", "dev": true, "requires": { - "picomatch": "2.2.2" + "picomatch": "^2.2.1" } }, "redent": { @@ -10653,8 +10975,8 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" }, "dependencies": { "indent-string": { @@ -10663,15 +10985,15 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } } } }, "regenerate": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz", - "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", + "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==", "dev": true }, "regenerate-unicode-properties": { @@ -10680,7 +11002,7 @@ "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", "dev": true, "requires": { - "regenerate": "1.4.1" + "regenerate": "^1.4.0" } }, "regenerator-runtime": { @@ -10695,7 +11017,7 @@ "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==", "dev": true, "requires": { - "@babel/runtime": "7.11.2" + "@babel/runtime": "^7.8.4" } }, "regex-not": { @@ -10704,8 +11026,8 @@ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", "dev": true, "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" } }, "regexp.prototype.flags": { @@ -10714,29 +11036,8 @@ "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.17.7" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "dev": true, - "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" - } - } + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" } }, "regexpp": { @@ -10751,12 +11052,12 @@ "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==", "dev": true, "requires": { - "regenerate": "1.4.1", - "regenerate-unicode-properties": "8.2.0", - "regjsgen": "0.5.2", - "regjsparser": "0.6.4", - "unicode-match-property-ecmascript": "1.0.4", - "unicode-match-property-value-ecmascript": "1.2.0" + "regenerate": "^1.4.0", + "regenerate-unicode-properties": "^8.2.0", + "regjsgen": "^0.5.1", + "regjsparser": "^0.6.4", + "unicode-match-property-ecmascript": "^1.0.4", + "unicode-match-property-value-ecmascript": "^1.2.0" } }, "register-service-worker": { @@ -10777,7 +11078,7 @@ "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==", "dev": true, "requires": { - "jsesc": "0.5.0" + "jsesc": "~0.5.0" }, "dependencies": { "jsesc": { @@ -10801,16 +11102,16 @@ "dev": true }, "renderkid": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz", - "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.4.tgz", + "integrity": "sha512-K2eXrSOJdq+HuKzlcjOlGoOarUu5SDguDEhE7+Ah4zuOWL40j8A/oHvLlLob9PSTNvVnBd+/q0Er1QfpEuem5g==", "dev": true, "requires": { - "css-select": "1.2.0", - "dom-converter": "0.2.0", - "htmlparser2": "3.10.1", - "strip-ansi": "3.0.1", - "utila": "0.4.0" + "css-select": "^1.1.0", + "dom-converter": "^0.2", + "htmlparser2": "^3.3.0", + "lodash": "^4.17.20", + "strip-ansi": "^3.0.0" }, "dependencies": { "css-select": { @@ -10819,10 +11120,10 @@ "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "dev": true, "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.3", + "boolbase": "~1.0.0", + "css-what": "2.1", "domutils": "1.5.1", - "nth-check": "1.0.2" + "nth-check": "~1.0.1" } }, "css-what": { @@ -10837,8 +11138,8 @@ "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", "dev": true, "requires": { - "dom-serializer": "0.2.2", - "domelementtype": "1.3.1" + "dom-serializer": "0", + "domelementtype": "1" } }, "strip-ansi": { @@ -10847,7 +11148,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } } } @@ -10870,7 +11171,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.1.0" + "is-finite": "^1.0.0" } }, "request": { @@ -10879,26 +11180,26 @@ "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "dev": true, "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.10.1", - "caseless": "0.12.0", - "combined-stream": "1.0.8", - "extend": "3.0.2", - "forever-agent": "0.6.1", - "form-data": "2.3.3", - "har-validator": "5.1.5", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.27", - "oauth-sign": "0.9.0", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.5.0", - "tunnel-agent": "0.6.0", - "uuid": "3.4.0" + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" }, "dependencies": { "qs": { @@ -10939,7 +11240,7 @@ "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { - "path-parse": "1.0.6" + "path-parse": "^1.0.6" } }, "resolve-cwd": { @@ -10948,7 +11249,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" } }, "resolve-from": { @@ -10969,7 +11270,7 @@ "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", "dev": true, "requires": { - "lowercase-keys": "1.0.1" + "lowercase-keys": "^1.0.0" } }, "restore-cursor": { @@ -10978,8 +11279,8 @@ "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, "requires": { - "onetime": "5.1.2", - "signal-exit": "3.0.3" + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" } }, "ret": { @@ -11018,7 +11319,7 @@ "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } }, "ripemd160": { @@ -11027,8 +11328,8 @@ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", "dev": true, "requires": { - "hash-base": "3.1.0", - "inherits": "2.0.4" + "hash-base": "^3.0.0", + "inherits": "^2.0.1" } }, "roarr": { @@ -11038,12 +11339,12 @@ "dev": true, "optional": true, "requires": { - "boolean": "3.0.1", - "detect-node": "2.0.4", - "globalthis": "1.0.1", - "json-stringify-safe": "5.0.1", - "semver-compare": "1.0.0", - "sprintf-js": "1.1.2" + "boolean": "^3.0.1", + "detect-node": "^2.0.4", + "globalthis": "^1.0.1", + "json-stringify-safe": "^5.0.1", + "semver-compare": "^1.0.0", + "sprintf-js": "^1.1.2" } }, "rtlcss": { @@ -11052,11 +11353,11 @@ "integrity": "sha512-NCVdF45w70/3CQeqVvQ84bu2HN8agNn+CDjw+RxXaiWb7mPOmEvltdd1z4qzm9kin4Jnu9ShFBIx28yvWerZ2g==", "dev": true, "requires": { - "chalk": "2.4.2", - "findup": "0.1.5", - "mkdirp": "0.5.5", - "postcss": "6.0.23", - "strip-json-comments": "2.0.1" + "chalk": "^2.4.2", + "findup": "^0.1.5", + "mkdirp": "^0.5.1", + "postcss": "^6.0.23", + "strip-json-comments": "^2.0.0" }, "dependencies": { "chalk": { @@ -11065,9 +11366,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "postcss": { @@ -11076,9 +11377,9 @@ "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", "dev": true, "requires": { - "chalk": "2.4.2", - "source-map": "0.6.1", - "supports-color": "5.5.0" + "chalk": "^2.4.1", + "source-map": "^0.6.1", + "supports-color": "^5.4.0" } }, "source-map": { @@ -11096,9 +11397,9 @@ "dev": true }, "run-parallel": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", - "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz", + "integrity": "sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==", "dev": true }, "run-queue": { @@ -11107,7 +11408,7 @@ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", "dev": true, "requires": { - "aproba": "1.2.0" + "aproba": "^1.1.1" } }, "rxjs": { @@ -11116,7 +11417,7 @@ "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==", "dev": true, "requires": { - "tslib": "1.13.0" + "tslib": "^1.9.0" }, "dependencies": { "tslib": { @@ -11139,7 +11440,7 @@ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { - "ret": "0.1.15" + "ret": "~0.1.10" } }, "safer-buffer": { @@ -11154,7 +11455,7 @@ "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==", "dev": true, "requires": { - "truncate-utf8-bytes": "1.0.2" + "truncate-utf8-bytes": "^1.0.0" } }, "sass-graph": { @@ -11163,10 +11464,10 @@ "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", "dev": true, "requires": { - "glob": "7.1.6", - "lodash": "4.17.20", - "scss-tokenizer": "0.2.3", - "yargs": "13.3.2" + "glob": "^7.0.0", + "lodash": "^4.0.0", + "scss-tokenizer": "^0.2.3", + "yargs": "^13.3.2" }, "dependencies": { "ansi-regex": { @@ -11187,9 +11488,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "7.0.3", - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "5.2.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } }, "strip-ansi": { @@ -11198,7 +11499,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.1.0" + "ansi-regex": "^4.1.0" } }, "yargs": { @@ -11207,16 +11508,16 @@ "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { - "cliui": "5.0.0", - "find-up": "3.0.0", - "get-caller-file": "2.0.5", - "require-directory": "2.1.1", - "require-main-filename": "2.0.0", - "set-blocking": "2.0.0", - "string-width": "3.1.0", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "13.1.2" + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" } } } @@ -11227,11 +11528,11 @@ "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==", "dev": true, "requires": { - "clone-deep": "4.0.1", - "loader-utils": "1.4.0", - "neo-async": "2.6.2", - "schema-utils": "2.7.1", - "semver": "6.3.0" + "clone-deep": "^4.0.1", + "loader-utils": "^1.2.3", + "neo-async": "^2.6.1", + "schema-utils": "^2.6.1", + "semver": "^6.3.0" }, "dependencies": { "semver": { @@ -11254,9 +11555,9 @@ "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", "dev": true, "requires": { - "@types/json-schema": "7.0.6", - "ajv": "6.12.5", - "ajv-keywords": "3.5.2" + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" } }, "scss-tokenizer": { @@ -11265,8 +11566,8 @@ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "requires": { - "js-base64": "2.6.4", - "source-map": "0.4.4" + "js-base64": "^2.1.8", + "source-map": "^0.4.2" }, "dependencies": { "source-map": { @@ -11275,7 +11576,7 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } @@ -11292,7 +11593,7 @@ "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==", "dev": true, "requires": { - "node-forge": "0.10.0" + "node-forge": "^0.10.0" } }, "semver": { @@ -11315,18 +11616,18 @@ "dev": true, "requires": { "debug": "2.6.9", - "depd": "1.1.2", - "destroy": "1.0.4", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.7.2", + "http-errors": "~1.7.2", "mime": "1.6.0", "ms": "2.1.1", - "on-finished": "2.3.0", - "range-parser": "1.2.1", - "statuses": "1.5.0" + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" }, "dependencies": { "debug": { @@ -11361,7 +11662,7 @@ "dev": true, "optional": true, "requires": { - "type-fest": "0.13.1" + "type-fest": "^0.13.1" } }, "serialize-javascript": { @@ -11370,7 +11671,7 @@ "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", "dev": true, "requires": { - "randombytes": "2.1.0" + "randombytes": "^2.1.0" } }, "serve-index": { @@ -11379,13 +11680,13 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { - "accepts": "1.3.7", + "accepts": "~1.3.4", "batch": "0.6.1", "debug": "2.6.9", - "escape-html": "1.0.3", - "http-errors": "1.6.3", - "mime-types": "2.1.27", - "parseurl": "1.3.3" + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" }, "dependencies": { "debug": { @@ -11403,10 +11704,10 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": "1.5.0" + "statuses": ">= 1.4.0 < 2" } }, "inherits": { @@ -11429,9 +11730,9 @@ "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", "dev": true, "requires": { - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "parseurl": "1.3.3", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", "send": "0.17.1" } }, @@ -11447,10 +11748,10 @@ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -11459,7 +11760,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11482,8 +11783,8 @@ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { - "inherits": "2.0.4", - "safe-buffer": "5.1.2" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "shallow-clone": { @@ -11492,7 +11793,7 @@ "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.2" } }, "shebang-command": { @@ -11501,7 +11802,7 @@ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { - "shebang-regex": "3.0.0" + "shebang-regex": "^3.0.0" } }, "shebang-regex": { @@ -11528,7 +11829,7 @@ "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=", "dev": true, "requires": { - "is-arrayish": "0.3.2" + "is-arrayish": "^0.3.1" }, "dependencies": { "is-arrayish": { @@ -11551,19 +11852,18 @@ "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, "requires": { - "ansi-styles": "4.2.1", - "astral-regex": "2.0.0", - "is-fullwidth-code-point": "3.0.0" + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" }, "dependencies": { "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "1.1.1", - "color-convert": "2.0.1" + "color-convert": "^2.0.1" } }, "color-convert": { @@ -11572,7 +11872,7 @@ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "color-name": "1.1.4" + "color-name": "~1.1.4" } }, "color-name": { @@ -11595,14 +11895,14 @@ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "dev": true, "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.3", - "use": "3.1.1" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { "debug": { @@ -11620,7 +11920,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } }, "extend-shallow": { @@ -11629,7 +11929,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -11640,9 +11940,9 @@ "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { "define-property": { @@ -11651,7 +11951,7 @@ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "is-descriptor": "1.0.2" + "is-descriptor": "^1.0.0" } }, "is-accessor-descriptor": { @@ -11660,7 +11960,7 @@ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-data-descriptor": { @@ -11669,7 +11969,7 @@ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, "requires": { - "kind-of": "6.0.3" + "kind-of": "^6.0.0" } }, "is-descriptor": { @@ -11678,9 +11978,9 @@ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.3" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } } } @@ -11691,7 +11991,7 @@ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.2.0" }, "dependencies": { "is-buffer": { @@ -11706,7 +12006,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -11717,8 +12017,8 @@ "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==", "dev": true, "requires": { - "faye-websocket": "0.10.0", - "uuid": "3.4.0", + "faye-websocket": "^0.10.0", + "uuid": "^3.4.0", "websocket-driver": "0.6.5" } }, @@ -11728,12 +12028,12 @@ "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==", "dev": true, "requires": { - "debug": "3.2.6", - "eventsource": "1.0.7", - "faye-websocket": "0.11.3", - "inherits": "2.0.4", - "json3": "3.3.3", - "url-parse": "1.4.7" + "debug": "^3.2.5", + "eventsource": "^1.0.7", + "faye-websocket": "~0.11.1", + "inherits": "^2.0.3", + "json3": "^3.3.2", + "url-parse": "^1.4.3" }, "dependencies": { "debug": { @@ -11742,7 +12042,7 @@ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.1.2" + "ms": "^2.1.1" } }, "faye-websocket": { @@ -11751,7 +12051,7 @@ "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", "dev": true, "requires": { - "websocket-driver": "0.6.5" + "websocket-driver": ">=0.5.1" } }, "ms": { @@ -11768,7 +12068,7 @@ "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", "dev": true, "requires": { - "is-plain-obj": "1.1.0" + "is-plain-obj": "^1.0.0" } }, "source-list-map": { @@ -11789,11 +12089,11 @@ "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", "dev": true, "requires": { - "atob": "2.1.2", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, "source-map-support": { @@ -11802,8 +12102,8 @@ "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "dev": true, "requires": { - "buffer-from": "1.1.1", - "source-map": "0.6.1" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" }, "dependencies": { "source-map": { @@ -11826,8 +12126,8 @@ "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", "dev": true, "requires": { - "spdx-expression-parse": "3.0.1", - "spdx-license-ids": "3.0.6" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -11842,8 +12142,8 @@ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, "requires": { - "spdx-exceptions": "2.3.0", - "spdx-license-ids": "3.0.6" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -11858,11 +12158,11 @@ "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", "dev": true, "requires": { - "debug": "4.2.0", - "handle-thing": "2.0.1", - "http-deceiver": "1.2.7", - "select-hose": "2.0.0", - "spdy-transport": "3.0.0" + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" }, "dependencies": { "debug": { @@ -11888,12 +12188,12 @@ "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, "requires": { - "debug": "4.2.0", - "detect-node": "2.0.4", - "hpack.js": "2.1.6", - "obuf": "1.1.2", - "readable-stream": "3.6.0", - "wbuf": "1.7.3" + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.3" }, "dependencies": { "debug": { @@ -11919,7 +12219,7 @@ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dev": true, "requires": { - "extend-shallow": "3.0.2" + "extend-shallow": "^3.0.0" } }, "sprintf-js": { @@ -11935,15 +12235,15 @@ "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", "dev": true, "requires": { - "asn1": "0.2.4", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.2", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.2", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "safer-buffer": "2.1.2", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" } }, "ssri": { @@ -11952,7 +12252,7 @@ "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==", "dev": true, "requires": { - "minipass": "3.1.3" + "minipass": "^3.1.1" } }, "stable": { @@ -11973,8 +12273,8 @@ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { "define-property": { @@ -11983,7 +12283,7 @@ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { - "is-descriptor": "0.1.6" + "is-descriptor": "^0.1.0" } } } @@ -12000,7 +12300,7 @@ "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", "dev": true, "requires": { - "readable-stream": "2.3.7" + "readable-stream": "^2.0.1" }, "dependencies": { "readable-stream": { @@ -12009,13 +12309,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -12026,8 +12326,8 @@ "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "dev": true, "requires": { - "inherits": "2.0.4", - "readable-stream": "2.3.7" + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" }, "dependencies": { "readable-stream": { @@ -12036,13 +12336,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -12053,8 +12353,8 @@ "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", "dev": true, "requires": { - "end-of-stream": "1.4.4", - "stream-shift": "1.0.1" + "end-of-stream": "^1.1.0", + "stream-shift": "^1.0.0" } }, "stream-http": { @@ -12063,11 +12363,11 @@ "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", "dev": true, "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.4", - "readable-stream": "2.3.7", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.2" + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.3.6", + "to-arraybuffer": "^1.0.0", + "xtend": "^4.0.0" }, "dependencies": { "readable-stream": { @@ -12076,13 +12376,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -12105,8 +12405,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" }, "dependencies": { "ansi-regex": { @@ -12121,69 +12421,71 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } } } }, "string.prototype.trimend": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", - "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz", + "integrity": "sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.17.7" + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1" }, "dependencies": { "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", "dev": true, "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } } } }, "string.prototype.trimstart": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", - "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz", + "integrity": "sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.17.7" + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1" }, "dependencies": { "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", "dev": true, "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" } } } @@ -12194,7 +12496,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -12203,7 +12505,7 @@ "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "5.0.0" + "ansi-regex": "^5.0.0" }, "dependencies": { "ansi-regex": { @@ -12220,7 +12522,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-eof": { @@ -12235,7 +12537,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "strip-json-comments": { @@ -12250,9 +12552,9 @@ "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==", "dev": true, "requires": { - "browserslist": "4.14.5", - "postcss": "7.0.35", - "postcss-selector-parser": "3.1.2" + "browserslist": "^4.0.0", + "postcss": "^7.0.0", + "postcss-selector-parser": "^3.0.0" }, "dependencies": { "postcss-selector-parser": { @@ -12261,9 +12563,9 @@ "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "5.2.0", - "indexes-of": "1.0.1", - "uniq": "1.0.1" + "dot-prop": "^5.2.0", + "indexes-of": "^1.0.1", + "uniq": "^1.0.1" } } } @@ -12274,14 +12576,14 @@ "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==", "dev": true, "requires": { - "css-parse": "2.0.0", - "debug": "3.1.0", - "glob": "7.1.6", - "mkdirp": "1.0.4", - "safer-buffer": "2.1.2", - "sax": "1.2.4", - "semver": "6.3.0", - "source-map": "0.7.3" + "css-parse": "~2.0.0", + "debug": "~3.1.0", + "glob": "^7.1.6", + "mkdirp": "~1.0.4", + "safer-buffer": "^2.1.2", + "sax": "~1.2.4", + "semver": "^6.3.0", + "source-map": "^0.7.3" }, "dependencies": { "mkdirp": { @@ -12310,9 +12612,9 @@ "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", "dev": true, "requires": { - "loader-utils": "1.4.0", - "lodash.clonedeep": "4.5.0", - "when": "3.6.4" + "loader-utils": "^1.0.2", + "lodash.clonedeep": "^4.5.0", + "when": "~3.6.x" } }, "sumchecker": { @@ -12321,7 +12623,7 @@ "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", "dev": true, "requires": { - "debug": "4.2.0" + "debug": "^4.1.0" }, "dependencies": { "debug": { @@ -12347,7 +12649,7 @@ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "svgo": { @@ -12356,19 +12658,19 @@ "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", "dev": true, "requires": { - "chalk": "2.4.2", - "coa": "2.0.2", - "css-select": "2.1.0", - "css-select-base-adapter": "0.1.1", + "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.3", - "js-yaml": "3.14.0", - "mkdirp": "0.5.5", - "object.values": "1.1.1", - "sax": "1.2.4", - "stable": "0.1.8", - "unquote": "1.1.1", - "util.promisify": "1.0.1" + "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": { "chalk": { @@ -12377,9 +12679,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -12390,10 +12692,10 @@ "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", "dev": true, "requires": { - "ajv": "6.12.5", - "lodash": "4.17.20", - "slice-ansi": "2.1.0", - "string-width": "3.1.0" + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" }, "dependencies": { "ansi-regex": { @@ -12420,9 +12722,9 @@ "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "astral-regex": "1.0.0", - "is-fullwidth-code-point": "2.0.0" + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", + "is-fullwidth-code-point": "^2.0.0" } }, "string-width": { @@ -12431,9 +12733,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "7.0.3", - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "5.2.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } }, "strip-ansi": { @@ -12442,7 +12744,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.1.0" + "ansi-regex": "^4.1.0" } } } @@ -12459,12 +12761,12 @@ "integrity": "sha512-0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg==", "dev": true, "requires": { - "chownr": "2.0.0", - "fs-minipass": "2.1.0", - "minipass": "3.1.3", - "minizlib": "2.1.2", - "mkdirp": "1.0.4", - "yallist": "4.0.0" + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" }, "dependencies": { "mkdirp": { @@ -12481,11 +12783,11 @@ "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==", "dev": true, "requires": { - "bl": "4.0.3", - "end-of-stream": "1.4.4", - "fs-constants": "1.0.0", - "inherits": "2.0.4", - "readable-stream": "3.6.0" + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" } }, "terser": { @@ -12494,9 +12796,9 @@ "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==", "dev": true, "requires": { - "commander": "2.20.3", - "source-map": "0.6.1", - "source-map-support": "0.5.19" + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" }, "dependencies": { "source-map": { @@ -12508,20 +12810,20 @@ } }, "terser-webpack-plugin": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.1.0.tgz", - "integrity": "sha512-0ZWDPIP8BtEDZdChbufcXUigOYk6dOX/P/X0hWxqDDcVAQLb8Yy/0FAaemSfax3PAA67+DJR778oz8qVbmy4hA==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.2.tgz", + "integrity": "sha512-3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ==", "dev": true, "requires": { - "cacache": "15.0.5", - "find-cache-dir": "3.3.1", - "jest-worker": "26.3.0", - "p-limit": "3.0.2", - "schema-utils": "2.7.1", - "serialize-javascript": "4.0.0", - "source-map": "0.6.1", - "terser": "5.3.3", - "webpack-sources": "1.4.3" + "cacache": "^15.0.5", + "find-cache-dir": "^3.3.1", + "jest-worker": "^26.3.0", + "p-limit": "^3.0.2", + "schema-utils": "^2.7.1", + "serialize-javascript": "^5.0.1", + "source-map": "^0.6.1", + "terser": "^5.3.2", + "webpack-sources": "^1.4.3" }, "dependencies": { "find-cache-dir": { @@ -12530,9 +12832,9 @@ "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", "dev": true, "requires": { - "commondir": "1.0.1", - "make-dir": "3.1.0", - "pkg-dir": "4.2.0" + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" } }, "find-up": { @@ -12541,8 +12843,8 @@ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "5.0.0", - "path-exists": "4.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "locate-path": { @@ -12551,7 +12853,7 @@ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "4.1.0" + "p-locate": "^4.1.0" } }, "make-dir": { @@ -12560,7 +12862,7 @@ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "requires": { - "semver": "6.3.0" + "semver": "^6.0.0" } }, "p-limit": { @@ -12569,7 +12871,7 @@ "integrity": "sha512-iwqZSOoWIW+Ew4kAGUlN16J4M7OB3ysMLSZtnhmqx7njIHFPlxWBX8xo3lVTyFVq6mI/lL9qt2IsN1sHwaxJkg==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } }, "p-locate": { @@ -12578,7 +12880,7 @@ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "2.3.0" + "p-limit": "^2.2.0" }, "dependencies": { "p-limit": { @@ -12587,7 +12889,7 @@ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "p-try": "2.2.0" + "p-try": "^2.0.0" } } } @@ -12604,7 +12906,7 @@ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "4.1.0" + "find-up": "^4.0.0" } }, "semver": { @@ -12613,6 +12915,15 @@ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true }, + "serialize-javascript": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", + "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -12620,14 +12931,14 @@ "dev": true }, "terser": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.3.tgz", - "integrity": "sha512-vRQDIlD+2Pg8YMwVK9kMM3yGylG95EIwzBai1Bw7Ot4OBfn3VP1TZn3EWx4ep2jERN/AmnVaTiGuelZSN7ds/A==", + "version": "5.3.8", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.3.8.tgz", + "integrity": "sha512-zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ==", "dev": true, "requires": { - "commander": "2.20.3", - "source-map": "0.7.3", - "source-map-support": "0.5.19" + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.19" }, "dependencies": { "source-map": { @@ -12658,8 +12969,8 @@ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "readable-stream": "2.3.7", - "xtend": "4.0.2" + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" }, "dependencies": { "readable-stream": { @@ -12668,13 +12979,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -12686,12 +12997,12 @@ "dev": true }, "timers-browserify": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", - "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz", + "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==", "dev": true, "requires": { - "setimmediate": "1.0.5" + "setimmediate": "^1.0.4" } }, "timsort": { @@ -12706,7 +13017,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.2" } }, "to-arraybuffer": { @@ -12727,7 +13038,7 @@ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "is-buffer": { @@ -12742,7 +13053,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -12759,10 +13070,10 @@ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "dev": true, "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, "to-regex-range": { @@ -12771,7 +13082,7 @@ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { - "is-number": "7.0.0" + "is-number": "^7.0.0" } }, "toidentifier": { @@ -12786,8 +13097,8 @@ "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "dev": true, "requires": { - "psl": "1.8.0", - "punycode": "2.1.1" + "psl": "^1.1.28", + "punycode": "^2.1.1" } }, "trim-newlines": { @@ -12802,7 +13113,7 @@ "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.2" } }, "truncate-utf8-bytes": { @@ -12811,7 +13122,7 @@ "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=", "dev": true, "requires": { - "utf8-byte-length": "1.0.4" + "utf8-byte-length": "^1.0.1" } }, "tryer": { @@ -12826,11 +13137,11 @@ "integrity": "sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==", "dev": true, "requires": { - "chalk": "2.4.2", - "enhanced-resolve": "4.3.0", - "loader-utils": "1.4.0", - "micromatch": "4.0.2", - "semver": "6.3.0" + "chalk": "^2.3.0", + "enhanced-resolve": "^4.0.0", + "loader-utils": "^1.0.2", + "micromatch": "^4.0.0", + "semver": "^6.0.0" }, "dependencies": { "chalk": { @@ -12839,9 +13150,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "semver": { @@ -12863,7 +13174,7 @@ "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", "dev": true, "requires": { - "tslib": "1.13.0" + "tslib": "^1.8.1" }, "dependencies": { "tslib": { @@ -12893,7 +13204,7 @@ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } }, "tweetnacl": { @@ -12908,7 +13219,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } }, "type-fest": { @@ -12925,7 +13236,7 @@ "dev": true, "requires": { "media-typer": "0.3.0", - "mime-types": "2.1.27" + "mime-types": "~2.1.24" } }, "typedarray": { @@ -12935,15 +13246,15 @@ "dev": true }, "typescript": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz", - "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz", + "integrity": "sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==", "dev": true }, "uglify-js": { - "version": "3.11.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.0.tgz", - "integrity": "sha512-e1KQFRCpOxnrJsJVqDUCjURq+wXvIn7cK2sRAx9XL3HYLL9aezOP4Pb1+Y3/o693EPk111Yj2Q+IUXxcpHlygQ==", + "version": "3.11.5", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz", + "integrity": "sha512-btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w==", "dev": true }, "unicode-canonical-property-names-ecmascript": { @@ -12958,8 +13269,8 @@ "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", "dev": true, "requires": { - "unicode-canonical-property-names-ecmascript": "1.0.4", - "unicode-property-aliases-ecmascript": "1.1.0" + "unicode-canonical-property-names-ecmascript": "^1.0.4", + "unicode-property-aliases-ecmascript": "^1.0.4" } }, "unicode-match-property-value-ecmascript": { @@ -12980,10 +13291,10 @@ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "2.0.1" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^2.0.1" } }, "uniq": { @@ -13004,7 +13315,7 @@ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "dev": true, "requires": { - "unique-slug": "2.0.2" + "unique-slug": "^2.0.0" } }, "unique-slug": { @@ -13013,7 +13324,7 @@ "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", "dev": true, "requires": { - "imurmurhash": "0.1.4" + "imurmurhash": "^0.1.4" } }, "universalify": { @@ -13040,8 +13351,8 @@ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { "has-value": { @@ -13050,9 +13361,9 @@ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" }, "dependencies": { "isobject": { @@ -13092,7 +13403,7 @@ "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==", "dev": true, "requires": { - "punycode": "2.1.1" + "punycode": "^2.1.0" } }, "urix": { @@ -13125,9 +13436,9 @@ "integrity": "sha512-IzgAAIC8wRrg6NYkFIJY09vtktQcsvU8V6HhtQj9PTefbYImzLB1hufqo4m+RyM5N3mLx5BqJKccgxJS+W3kqw==", "dev": true, "requires": { - "loader-utils": "2.0.0", - "mime-types": "2.1.27", - "schema-utils": "2.7.1" + "loader-utils": "^2.0.0", + "mime-types": "^2.1.26", + "schema-utils": "^2.6.5" }, "dependencies": { "loader-utils": { @@ -13136,9 +13447,9 @@ "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "dev": true, "requires": { - "big.js": "5.2.2", - "emojis-list": "3.0.0", - "json5": "2.1.3" + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" } } } @@ -13149,8 +13460,8 @@ "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", "dev": true, "requires": { - "querystringify": "2.2.0", - "requires-port": "1.0.0" + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" } }, "url-parse-lax": { @@ -13159,7 +13470,7 @@ "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "dev": true, "requires": { - "prepend-http": "2.0.0" + "prepend-http": "^2.0.0" } }, "use": { @@ -13203,31 +13514,10 @@ "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==", "dev": true, "requires": { - "define-properties": "1.1.3", - "es-abstract": "1.17.7", - "has-symbols": "1.0.1", - "object.getownpropertydescriptors": "2.1.0" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", - "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", - "dev": true, - "requires": { - "es-to-primitive": "1.2.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "has-symbols": "1.0.1", - "is-callable": "1.2.2", - "is-regex": "1.1.1", - "object-inspect": "1.8.0", - "object-keys": "1.1.1", - "object.assign": "4.1.1", - "string.prototype.trimend": "1.0.1", - "string.prototype.trimstart": "1.0.1" - } - } + "define-properties": "^1.1.3", + "es-abstract": "^1.17.2", + "has-symbols": "^1.0.1", + "object.getownpropertydescriptors": "^2.1.0" } }, "utila": { @@ -13260,8 +13550,8 @@ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, "requires": { - "spdx-correct": "3.1.1", - "spdx-expression-parse": "3.0.1" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "vary": { @@ -13282,9 +13572,9 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" } }, "vm-browserify": { @@ -13305,12 +13595,12 @@ "integrity": "sha512-Kr21uPfthDc63nDl27AGQEhtt9VrZ9nkYk/NTftJ2ws9XiJwzJJCnCr3AITQ2jpRMA0XPGDECxYH8E027qMK9Q==", "dev": true, "requires": { - "debug": "4.2.0", - "eslint-scope": "5.1.1", - "eslint-visitor-keys": "1.3.0", - "espree": "6.2.1", - "esquery": "1.3.1", - "lodash": "4.17.20" + "debug": "^4.1.1", + "eslint-scope": "^5.0.0", + "eslint-visitor-keys": "^1.1.0", + "espree": "^6.2.1", + "esquery": "^1.0.1", + "lodash": "^4.17.15" }, "dependencies": { "debug": { @@ -13328,8 +13618,8 @@ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "esrecurse": "4.3.0", - "estraverse": "4.3.0" + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" } }, "ms": { @@ -13352,11 +13642,11 @@ "integrity": "sha512-Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA==", "dev": true, "requires": { - "@vue/component-compiler-utils": "3.2.0", - "hash-sum": "1.0.2", - "loader-utils": "1.4.0", - "vue-hot-reload-api": "2.3.4", - "vue-style-loader": "4.1.2" + "@vue/component-compiler-utils": "^3.1.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "vue-hot-reload-api": "^2.3.0", + "vue-style-loader": "^4.1.0" } }, "vue-router": { @@ -13371,13 +13661,13 @@ "integrity": "sha512-3LODaOsnQx7iMFTBLjki8xSyOxhCtbZ+nQie0wWY4iOVeEtTg1a3YQAjd82WvKxrWHHTshjvLb7OXMc2/dYuxw==", "dev": true, "requires": { - "chalk": "1.1.3", - "hash-sum": "1.0.2", - "he": "1.2.0", - "lodash.template": "4.5.0", - "lodash.uniq": "4.5.0", - "resolve": "1.17.0", - "serialize-javascript": "3.1.0", + "chalk": "^1.1.3", + "hash-sum": "^1.0.2", + "he": "^1.1.0", + "lodash.template": "^4.5.0", + "lodash.uniq": "^4.5.0", + "resolve": "^1.2.0", + "serialize-javascript": "^3.1.0", "source-map": "0.5.6" }, "dependencies": { @@ -13393,11 +13683,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "serialize-javascript": { @@ -13406,7 +13696,7 @@ "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", "dev": true, "requires": { - "randombytes": "2.1.0" + "randombytes": "^2.1.0" } }, "source-map": { @@ -13421,7 +13711,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "supports-color": { @@ -13438,8 +13728,8 @@ "integrity": "sha512-0ip8ge6Gzz/Bk0iHovU9XAUQaFt/G2B61bnWa2tCcqqdgfHs1lF9xXorFbE55Gmy92okFT+8bfmySuUOu13vxQ==", "dev": true, "requires": { - "hash-sum": "1.0.2", - "loader-utils": "1.4.0" + "hash-sum": "^1.0.2", + "loader-utils": "^1.0.2" } }, "vue-template-compiler": { @@ -13448,8 +13738,8 @@ "integrity": "sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==", "dev": true, "requires": { - "de-indent": "1.0.2", - "he": "1.2.0" + "de-indent": "^1.0.2", + "he": "^1.1.0" } }, "vue-template-es2015-compiler": { @@ -13470,10 +13760,10 @@ "integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==", "dev": true, "requires": { - "chokidar": "3.4.2", - "graceful-fs": "4.2.4", - "neo-async": "2.6.2", - "watchpack-chokidar2": "2.0.0" + "chokidar": "^3.4.1", + "graceful-fs": "^4.1.2", + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.0" } }, "watchpack-chokidar2": { @@ -13483,7 +13773,7 @@ "dev": true, "optional": true, "requires": { - "chokidar": "2.1.8" + "chokidar": "^2.1.8" }, "dependencies": { "anymatch": { @@ -13493,8 +13783,8 @@ "dev": true, "optional": true, "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" }, "dependencies": { "normalize-path": { @@ -13504,7 +13794,7 @@ "dev": true, "optional": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } } } @@ -13521,17 +13811,18 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, + "optional": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -13539,8 +13830,9 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -13552,18 +13844,18 @@ "dev": true, "optional": true, "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.3", - "braces": "2.3.2", - "fsevents": "1.2.13", - "glob-parent": "3.1.0", - "inherits": "2.0.4", - "is-binary-path": "1.0.1", - "is-glob": "4.0.1", - "normalize-path": "3.0.0", - "path-is-absolute": "1.0.1", - "readdirp": "2.2.1", - "upath": "1.2.0" + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" } }, "fill-range": { @@ -13571,11 +13863,12 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, + "optional": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -13583,8 +13876,9 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -13596,7 +13890,7 @@ "dev": true, "optional": true, "requires": { - "nan": "2.14.1" + "nan": "^2.12.1" } }, "glob-parent": { @@ -13606,8 +13900,8 @@ "dev": true, "optional": true, "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { "is-glob": { @@ -13617,7 +13911,7 @@ "dev": true, "optional": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -13629,22 +13923,24 @@ "dev": true, "optional": true, "requires": { - "binary-extensions": "1.13.1" + "binary-extensions": "^1.0.0" } }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "dev": true, + "optional": true }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, + "optional": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -13652,8 +13948,9 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -13663,20 +13960,21 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, + "optional": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.3", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "readable-stream": { @@ -13686,13 +13984,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -13702,9 +14000,9 @@ "dev": true, "optional": true, "requires": { - "graceful-fs": "4.2.4", - "micromatch": "3.1.10", - "readable-stream": "2.3.7" + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" } }, "to-regex-range": { @@ -13712,9 +14010,10 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, + "optional": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } } } @@ -13725,38 +14024,38 @@ "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "dev": true, "requires": { - "minimalistic-assert": "1.0.1" + "minimalistic-assert": "^1.0.0" } }, "webpack": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz", - "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz", + "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==", "dev": true, "requires": { "@webassemblyjs/ast": "1.9.0", "@webassemblyjs/helper-module-context": "1.9.0", "@webassemblyjs/wasm-edit": "1.9.0", "@webassemblyjs/wasm-parser": "1.9.0", - "acorn": "6.4.1", - "ajv": "6.12.5", - "ajv-keywords": "3.5.2", - "chrome-trace-event": "1.0.2", - "enhanced-resolve": "4.3.0", - "eslint-scope": "4.0.3", - "json-parse-better-errors": "1.0.2", - "loader-runner": "2.4.0", - "loader-utils": "1.4.0", - "memory-fs": "0.4.1", - "micromatch": "3.1.10", - "mkdirp": "0.5.5", - "neo-async": "2.6.2", - "node-libs-browser": "2.2.1", - "schema-utils": "1.0.0", - "tapable": "1.1.3", - "terser-webpack-plugin": "1.4.5", - "watchpack": "1.7.4", - "webpack-sources": "1.4.3" + "acorn": "^6.4.1", + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^4.3.0", + "eslint-scope": "^4.0.3", + "json-parse-better-errors": "^1.0.2", + "loader-runner": "^2.4.0", + "loader-utils": "^1.2.3", + "memory-fs": "^0.4.1", + "micromatch": "^3.1.10", + "mkdirp": "^0.5.3", + "neo-async": "^2.6.1", + "node-libs-browser": "^2.2.1", + "schema-utils": "^1.0.0", + "tapable": "^1.1.3", + "terser-webpack-plugin": "^1.4.3", + "watchpack": "^1.7.4", + "webpack-sources": "^1.4.1" }, "dependencies": { "braces": { @@ -13765,16 +14064,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -13783,7 +14082,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -13794,21 +14093,21 @@ "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", "dev": true, "requires": { - "bluebird": "3.7.2", - "chownr": "1.1.4", - "figgy-pudding": "3.5.2", - "glob": "7.1.6", - "graceful-fs": "4.2.4", - "infer-owner": "1.0.4", - "lru-cache": "5.1.1", - "mississippi": "3.0.0", - "mkdirp": "0.5.5", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.7.1", - "ssri": "6.0.1", - "unique-filename": "1.1.1", - "y18n": "4.0.0" + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" } }, "chownr": { @@ -13823,10 +14122,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -13835,7 +14134,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -13852,7 +14151,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -13861,7 +14160,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -13878,7 +14177,7 @@ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "3.1.1" + "yallist": "^3.0.2" } }, "memory-fs": { @@ -13887,8 +14186,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "0.1.7", - "readable-stream": "2.3.7" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" } }, "micromatch": { @@ -13897,19 +14196,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.3", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "readable-stream": { @@ -13918,13 +14217,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -13933,7 +14232,7 @@ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "glob": "7.1.6" + "glob": "^7.1.3" } }, "schema-utils": { @@ -13942,9 +14241,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "6.12.5", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.5.2" + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" } }, "source-map": { @@ -13959,7 +14258,7 @@ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", "dev": true, "requires": { - "figgy-pudding": "3.5.2" + "figgy-pudding": "^3.5.1" } }, "terser-webpack-plugin": { @@ -13968,15 +14267,15 @@ "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", "dev": true, "requires": { - "cacache": "12.0.4", - "find-cache-dir": "2.1.0", - "is-wsl": "1.1.0", - "schema-utils": "1.0.0", - "serialize-javascript": "4.0.0", - "source-map": "0.6.1", - "terser": "4.8.0", - "webpack-sources": "1.4.3", - "worker-farm": "1.7.0" + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", + "is-wsl": "^1.1.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^4.0.0", + "source-map": "^0.6.1", + "terser": "^4.1.2", + "webpack-sources": "^1.4.0", + "worker-farm": "^1.7.0" } }, "to-regex-range": { @@ -13985,8 +14284,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "yallist": { @@ -13998,30 +14297,30 @@ } }, "webpack-bundle-analyzer": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz", - "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==", + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.9.0.tgz", + "integrity": "sha512-Ob8amZfCm3rMB1ScjQVlbYYUEJyEjdEtQ92jqiFUYt5VkEeO2v5UMbv49P/gnmCZm3A6yaFQzCBvpZqN4MUsdA==", "dev": true, "requires": { - "acorn": "7.4.0", - "acorn-walk": "7.2.0", - "bfj": "6.1.2", - "chalk": "2.4.2", - "commander": "2.20.3", - "ejs": "2.7.4", - "express": "4.17.1", - "filesize": "3.6.1", - "gzip-size": "5.1.1", - "lodash": "4.17.20", - "mkdirp": "0.5.5", - "opener": "1.5.2", - "ws": "6.2.1" + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1", + "bfj": "^6.1.1", + "chalk": "^2.4.1", + "commander": "^2.18.0", + "ejs": "^2.6.1", + "express": "^4.16.3", + "filesize": "^3.6.1", + "gzip-size": "^5.0.0", + "lodash": "^4.17.19", + "mkdirp": "^0.5.1", + "opener": "^1.5.1", + "ws": "^6.0.0" }, "dependencies": { "acorn": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz", - "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true }, "chalk": { @@ -14030,9 +14329,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -14043,8 +14342,8 @@ "integrity": "sha512-7doO/SRtLu8q5WM0s7vPKPWX580qhi0/yBHkOxNkv50f6qB76Zy9o2wRTrrPULqYTvQlVHuvbA8v+G5ayuUDsA==", "dev": true, "requires": { - "deepmerge": "1.5.2", - "javascript-stringify": "2.0.1" + "deepmerge": "^1.5.2", + "javascript-stringify": "^2.0.1" } }, "webpack-dev-middleware": { @@ -14053,11 +14352,11 @@ "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==", "dev": true, "requires": { - "memory-fs": "0.4.1", - "mime": "2.4.6", - "mkdirp": "0.5.5", - "range-parser": "1.2.1", - "webpack-log": "2.0.0" + "memory-fs": "^0.4.1", + "mime": "^2.4.4", + "mkdirp": "^0.5.1", + "range-parser": "^1.2.1", + "webpack-log": "^2.0.0" }, "dependencies": { "memory-fs": { @@ -14066,8 +14365,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "0.1.7", - "readable-stream": "2.3.7" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" } }, "mime": { @@ -14082,13 +14381,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } } } @@ -14100,38 +14399,38 @@ "dev": true, "requires": { "ansi-html": "0.0.7", - "bonjour": "3.5.0", - "chokidar": "2.1.8", - "compression": "1.7.4", - "connect-history-api-fallback": "1.6.0", - "debug": "4.2.0", - "del": "4.1.1", - "express": "4.17.1", - "html-entities": "1.3.1", + "bonjour": "^3.5.0", + "chokidar": "^2.1.8", + "compression": "^1.7.4", + "connect-history-api-fallback": "^1.6.0", + "debug": "^4.1.1", + "del": "^4.1.1", + "express": "^4.17.1", + "html-entities": "^1.3.1", "http-proxy-middleware": "0.19.1", - "import-local": "2.0.0", - "internal-ip": "4.3.0", - "ip": "1.1.5", - "is-absolute-url": "3.0.3", - "killable": "1.0.1", - "loglevel": "1.7.0", - "opn": "5.5.0", - "p-retry": "3.0.1", - "portfinder": "1.0.28", - "schema-utils": "1.0.0", - "selfsigned": "1.10.8", - "semver": "6.3.0", - "serve-index": "1.9.1", + "import-local": "^2.0.0", + "internal-ip": "^4.3.0", + "ip": "^1.1.5", + "is-absolute-url": "^3.0.3", + "killable": "^1.0.1", + "loglevel": "^1.6.8", + "opn": "^5.5.0", + "p-retry": "^3.0.1", + "portfinder": "^1.0.26", + "schema-utils": "^1.0.0", + "selfsigned": "^1.10.7", + "semver": "^6.3.0", + "serve-index": "^1.9.1", "sockjs": "0.3.20", "sockjs-client": "1.4.0", - "spdy": "4.0.2", - "strip-ansi": "3.0.1", - "supports-color": "6.1.0", - "url": "0.11.0", - "webpack-dev-middleware": "3.7.2", - "webpack-log": "2.0.0", - "ws": "6.2.1", - "yargs": "13.3.2" + "spdy": "^4.0.2", + "strip-ansi": "^3.0.1", + "supports-color": "^6.1.0", + "url": "^0.11.0", + "webpack-dev-middleware": "^3.7.2", + "webpack-log": "^2.0.0", + "ws": "^6.2.1", + "yargs": "^13.3.2" }, "dependencies": { "anymatch": { @@ -14140,8 +14439,8 @@ "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" }, "dependencies": { "normalize-path": { @@ -14150,7 +14449,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } } } @@ -14167,16 +14466,16 @@ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.3", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" }, "dependencies": { "extend-shallow": { @@ -14185,7 +14484,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -14196,18 +14495,18 @@ "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", "dev": true, "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.3", - "braces": "2.3.2", - "fsevents": "1.2.13", - "glob-parent": "3.1.0", - "inherits": "2.0.4", - "is-binary-path": "1.0.1", - "is-glob": "4.0.1", - "normalize-path": "3.0.0", - "path-is-absolute": "1.0.1", - "readdirp": "2.2.1", - "upath": "1.2.0" + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" } }, "debug": { @@ -14231,10 +14530,10 @@ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" }, "dependencies": { "extend-shallow": { @@ -14243,7 +14542,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } } } @@ -14255,7 +14554,7 @@ "dev": true, "optional": true, "requires": { - "nan": "2.14.1" + "nan": "^2.12.1" } }, "glob-parent": { @@ -14264,8 +14563,8 @@ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" }, "dependencies": { "is-glob": { @@ -14274,7 +14573,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -14291,7 +14590,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.13.1" + "binary-extensions": "^1.0.0" } }, "is-buffer": { @@ -14306,7 +14605,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -14315,7 +14614,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } } } @@ -14326,19 +14625,19 @@ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.3", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" } }, "ms": { @@ -14353,13 +14652,13 @@ "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.4", - "isarray": "1.0.0", - "process-nextick-args": "2.0.1", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -14368,9 +14667,9 @@ "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "micromatch": "3.1.10", - "readable-stream": "2.3.7" + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" } }, "schema-utils": { @@ -14379,9 +14678,9 @@ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", "dev": true, "requires": { - "ajv": "6.12.5", - "ajv-errors": "1.0.1", - "ajv-keywords": "3.5.2" + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" } }, "semver": { @@ -14396,9 +14695,9 @@ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "emoji-regex": "7.0.3", - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "5.2.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" }, "dependencies": { "ansi-regex": { @@ -14413,7 +14712,7 @@ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "4.1.0" + "ansi-regex": "^4.1.0" } } } @@ -14424,7 +14723,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "supports-color": { @@ -14433,7 +14732,7 @@ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "to-regex-range": { @@ -14442,8 +14741,8 @@ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" } }, "yargs": { @@ -14452,16 +14751,16 @@ "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { - "cliui": "5.0.0", - "find-up": "3.0.0", - "get-caller-file": "2.0.5", - "require-directory": "2.1.1", - "require-main-filename": "2.0.0", - "set-blocking": "2.0.0", - "string-width": "3.1.0", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "13.1.2" + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" } } } @@ -14472,8 +14771,8 @@ "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==", "dev": true, "requires": { - "ansi-colors": "3.2.4", - "uuid": "3.4.0" + "ansi-colors": "^3.0.0", + "uuid": "^3.3.2" } }, "webpack-merge": { @@ -14482,13 +14781,13 @@ "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==", "dev": true, "requires": { - "lodash": "4.17.20" + "lodash": "^4.17.15" } }, "webpack-node-externals": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-2.5.1.tgz", - "integrity": "sha512-RWxKGibUU5kuJT6JDYmXGa3QsZskqIaiBvZ2wBxHlJzWVJPOyBMnroXf23uxEHnj1rYS8jNdyUfrNAXJ2bANNw==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-2.5.2.tgz", + "integrity": "sha512-aHdl/y2N7PW2Sx7K+r3AxpJO+aDMcYzMQd60Qxefq3+EwhewSbTBqNumOsCE1JsCUNoyfGj5465N0sSf6hc/5w==", "dev": true }, "webpack-sources": { @@ -14497,8 +14796,8 @@ "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", "dev": true, "requires": { - "source-list-map": "2.0.1", - "source-map": "0.6.1" + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" }, "dependencies": { "source-map": { @@ -14515,7 +14814,7 @@ "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=", "dev": true, "requires": { - "websocket-extensions": "0.1.4" + "websocket-extensions": ">=0.1.1" } }, "websocket-extensions": { @@ -14536,7 +14835,7 @@ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -14551,7 +14850,7 @@ "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "requires": { - "string-width": "2.1.1" + "string-width": "^1.0.2 || 2" } }, "word-wrap": { @@ -14566,7 +14865,7 @@ "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", "dev": true, "requires": { - "errno": "0.1.7" + "errno": "~0.1.7" } }, "worker-rpc": { @@ -14575,7 +14874,7 @@ "integrity": "sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==", "dev": true, "requires": { - "microevent.ts": "0.1.1" + "microevent.ts": "~0.1.1" } }, "wrap-ansi": { @@ -14584,19 +14883,18 @@ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "requires": { - "ansi-styles": "4.2.1", - "string-width": "4.2.0", - "strip-ansi": "6.0.0" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "dependencies": { "ansi-styles": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz", - "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "requires": { - "@types/color-name": "1.1.1", - "color-convert": "2.0.1" + "color-convert": "^2.0.1" } }, "color-convert": { @@ -14605,7 +14903,7 @@ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, "requires": { - "color-name": "1.1.4" + "color-name": "~1.1.4" } }, "color-name": { @@ -14626,9 +14924,9 @@ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "emoji-regex": "8.0.0", - "is-fullwidth-code-point": "3.0.0", - "strip-ansi": "6.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } } } @@ -14645,7 +14943,7 @@ "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", "dev": true, "requires": { - "mkdirp": "0.5.5" + "mkdirp": "^0.5.1" } }, "write-file-atomic": { @@ -14654,9 +14952,9 @@ "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==", "dev": true, "requires": { - "graceful-fs": "4.2.4", - "imurmurhash": "0.1.4", - "signal-exit": "3.0.3" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" } }, "write-file-webpack-plugin": { @@ -14665,13 +14963,13 @@ "integrity": "sha512-AZ7qJUvhTCBiOtG21aFJUcNuLVo2FFM6JMGKvaUGAH+QDqQAp2iG0nq3GcuXmJOFQR2JjpjhyYkyPrbFKhdjNQ==", "dev": true, "requires": { - "chalk": "2.4.2", - "debug": "3.1.0", - "filesize": "3.6.1", - "lodash": "4.17.20", - "mkdirp": "0.5.5", - "moment": "2.29.0", - "write-file-atomic": "2.4.3" + "chalk": "^2.4.0", + "debug": "^3.1.0", + "filesize": "^3.6.1", + "lodash": "^4.17.13", + "mkdirp": "^0.5.1", + "moment": "^2.22.1", + "write-file-atomic": "^2.3.0" }, "dependencies": { "chalk": { @@ -14680,9 +14978,9 @@ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } } } @@ -14693,7 +14991,7 @@ "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", "dev": true, "requires": { - "async-limiter": "1.0.1" + "async-limiter": "~1.0.0" } }, "xmlbuilder": { @@ -14732,17 +15030,17 @@ "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dev": true, "requires": { - "cliui": "6.0.0", - "decamelize": "1.2.0", - "find-up": "4.1.0", - "get-caller-file": "2.0.5", - "require-directory": "2.1.1", - "require-main-filename": "2.0.0", - "set-blocking": "2.0.0", - "string-width": "4.2.0", - "which-module": "2.0.0", - "y18n": "4.0.0", - "yargs-parser": "18.1.3" + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" }, "dependencies": { "cliui": { @@ -14751,9 +15049,9 @@ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, "requires": { - "string-width": "4.2.0", - "strip-ansi": "6.0.0", - "wrap-ansi": "6.2.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" } }, "find-up": { @@ -14762,8 +15060,8 @@ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { - "locate-path": "5.0.0", - "path-exists": "4.0.0" + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" } }, "is-fullwidth-code-point": { @@ -14778,7 +15076,7 @@ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "requires": { - "p-locate": "4.1.0" + "p-locate": "^4.1.0" } }, "p-locate": { @@ -14787,7 +15085,7 @@ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "requires": { - "p-limit": "2.3.0" + "p-limit": "^2.2.0" } }, "path-exists": { @@ -14802,9 +15100,9 @@ "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", "dev": true, "requires": { - "emoji-regex": "8.0.0", - "is-fullwidth-code-point": "3.0.0", - "strip-ansi": "6.0.0" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.0" } }, "yargs-parser": { @@ -14813,8 +15111,8 @@ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, "requires": { - "camelcase": "5.3.1", - "decamelize": "1.2.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } @@ -14825,8 +15123,8 @@ "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "dev": true, "requires": { - "camelcase": "5.3.1", - "decamelize": "1.2.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } }, "zip-stream": { @@ -14835,9 +15133,9 @@ "integrity": "sha512-TGxB2g+1ur6MHkvM644DuZr8Uzyz0k0OYWtS3YlpfWBEmK4woaC2t3+pozEL3dBfIPmpgmClR5B2QRcMgGt22g==", "dev": true, "requires": { - "archiver-utils": "2.1.0", - "compress-commons": "4.0.1", - "readable-stream": "3.6.0" + "archiver-utils": "^2.1.0", + "compress-commons": "^4.0.0", + "readable-stream": "^3.6.0" } }, "zlib": { diff --git a/package.json b/package.json index 7b12e13..fb37c23 100644 --- a/package.json +++ b/package.json @@ -10,25 +10,25 @@ "test": "echo \"No test specified\" && exit 0" }, "dependencies": { - "@quasar/extras": "^1.0.0", + "@quasar/extras": "^1.9.10", "@vue/composition-api": "^0.6.4", "axios": "^0.18.1", "core-js": "^3.6.5", - "quasar": "^1.0.0" + "quasar": "^1.14.3" }, "devDependencies": { - "@quasar/app": "^2.0.0", - "@types/node": "^10.17.15", - "@types/webpack": "^4.41.22", + "@quasar/app": "^2.1.6", + "@types/node": "^10.17.44", + "@types/webpack": "^4.41.24", "@types/webpack-env": "^1.15.3", "@typescript-eslint/eslint-plugin": "^3.3.0", "@typescript-eslint/parser": "^3.3.0", "babel-eslint": "^10.0.1", "eslint": "^6.8.0", - "eslint-config-prettier": "^6.9.0", + "eslint-config-prettier": "^6.15.0", "eslint-loader": "^3.0.3", "eslint-plugin-vue": "^6.1.2", - "typescript": "^4.0.3" + "typescript": "^4.0.5" }, "browserslist": [ "last 10 Chrome versions", From bdcf9668b7875f3d0b27400d3e603f5877c2b3c5 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 6 Nov 2020 01:12:03 +0100 Subject: [PATCH 075/448] Sync with backend --- src/boot/filter.ts | 8 ++++++-- src/flaschengeist.d.ts | 2 +- src/pages/Login.vue | 6 ++---- src/plugins/user/models.ts | 6 ++++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/boot/filter.ts b/src/boot/filter.ts index 6ae748e..559600c 100644 --- a/src/boot/filter.ts +++ b/src/boot/filter.ts @@ -16,9 +16,13 @@ export default boot(({ Vue }) => { if (H.length == 1) H = `0${H}`; let M = date.getMinutes().toString(); if (M.length == 1) M = `0${M}`; - let S = '' + let S = ''; if (seconds) { - S = ':' + (date.getSeconds() > 9 ? date.getSeconds().toString() : `0${date.getSeconds().toString()}`); + S = + ':' + + (date.getSeconds() > 9 + ? date.getSeconds().toString() + : `0${date.getSeconds().toString()}`); } return `${H}:${M}${S} ${formatDate(date)}`; }); diff --git a/src/flaschengeist.d.ts b/src/flaschengeist.d.ts index 4203fde..8fc1a92 100644 --- a/src/flaschengeist.d.ts +++ b/src/flaschengeist.d.ts @@ -13,7 +13,7 @@ declare namespace FG { firstname: string; lastname: string; mail: string; - roles: Array; + roles: Array; } type Permission = string; interface Role { diff --git a/src/pages/Login.vue b/src/pages/Login.vue index c67012c..32a7097 100644 --- a/src/pages/Login.vue +++ b/src/pages/Login.vue @@ -38,7 +38,7 @@ import { defineComponent, ref } from '@vue/composition-api'; export default defineComponent({ // name: 'PageName' - setup(_, ctx) { + setup(_, { root }) { const userid = ref(''); const password = ref(''); const rules = [ @@ -46,8 +46,7 @@ export default defineComponent({ ]; function doLogin() { - console.log(userid.value, password.value); - ctx.root.$store + root.$store .dispatch('session/login', { userid: userid.value, password: password.value @@ -55,7 +54,6 @@ export default defineComponent({ .catch(error => { console.warn(error); }); - //ctx.root.$router.push({ name: 'main' }); } return { userid, password, doLogin, rules }; diff --git a/src/plugins/user/models.ts b/src/plugins/user/models.ts index c743f7d..54a1dc4 100644 --- a/src/plugins/user/models.ts +++ b/src/plugins/user/models.ts @@ -6,4 +6,10 @@ export interface LoginData { export interface LoginResponse { user: FG.User; session: FG.Session; + permissions: FG.Permission[]; +} + +//eslint-disable-next-line @typescript-eslint/no-unsafe-member-access +export interface CurrentUserResponse extends FG.User { + permissions: FG.Permission[]; } From 5c11e02b2c4739507e6e90006b3217b91fdf004a Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 6 Nov 2020 01:15:40 +0100 Subject: [PATCH 076/448] Axios: Intercept 401 and logut (session expired or revoked) --- src/boot/axios.ts | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/boot/axios.ts b/src/boot/axios.ts index b6255dc..4de466e 100644 --- a/src/boot/axios.ts +++ b/src/boot/axios.ts @@ -1,4 +1,4 @@ -import axios, { AxiosInstance } from 'axios'; +import axios, { AxiosInstance, AxiosError } from 'axios'; import { boot } from 'quasar/wrappers'; import config from '../config'; import { Store } from 'vuex'; @@ -15,6 +15,9 @@ export default boot>(({ Vue, store }) => { Vue.prototype.$axios = axios; axios.defaults.baseURL = config.baseURL; + /*** + * Intercept requests and insert Token if available + */ axios.interceptors.request.use(config => { const session = store.state.session.currentSession; if (session?.token) { @@ -22,6 +25,22 @@ export default boot>(({ Vue, store }) => { } return config; }); + + /*** + * Intercept responses, filter 401 and logout + */ + axios.interceptors.response.use( + response => response, + error => { + if (error && 'response' in error) { + const e = error; + if (e.response && e.response.status == 401) { + return store.dispatch('session/clearup'); + } + } + return Promise.reject(error); + } + ); }); export { axios }; From 8689e84d47eae7a23e1e3183ca78438b17b45d61 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 6 Nov 2020 01:17:04 +0100 Subject: [PATCH 077/448] Reworked user and session store, added Admin function for user. * Sync Login with backend * Split Main into MainUserSettins and Settings * Added AdminSetting to change other users, added UserSelector Component for selecting users (can be reused for other stuff ;-) ). * Split hasPermission into helper file for code reuse --- src/boot/login.ts | 10 +- src/components/navigation/EssentialLink.vue | 15 +- src/components/navigation/ShortCutLink.vue | 19 +- src/components/permission.ts | 14 ++ src/plugins/user/components/UserSelector.vue | 41 ++++ src/plugins/user/components/settings/Main.vue | 191 ----------------- .../components/settings/MainUserSettings.vue | 194 ++++++++++++++++++ src/plugins/user/pages/AdminSettings.vue | 55 +++++ src/plugins/user/pages/Settings.vue | 62 +++--- src/plugins/user/routes/index.ts | 9 + src/plugins/user/store/session.ts | 34 ++- src/plugins/user/store/user.ts | 91 +++++--- 12 files changed, 435 insertions(+), 300 deletions(-) create mode 100644 src/components/permission.ts create mode 100644 src/plugins/user/components/UserSelector.vue delete mode 100644 src/plugins/user/components/settings/Main.vue create mode 100644 src/plugins/user/components/settings/MainUserSettings.vue create mode 100644 src/plugins/user/pages/AdminSettings.vue diff --git a/src/boot/login.ts b/src/boot/login.ts index a4571eb..553db5b 100644 --- a/src/boot/login.ts +++ b/src/boot/login.ts @@ -5,16 +5,8 @@ import { Store } from 'vuex'; export default boot>(({ router, store }) => { router.beforeEach((to, from, next) => { - const user = store.state.user.currentUser; const session = store.state.session.currentSession; - let permissions: string[] = []; - if (user) { - user.roles.forEach(role => { - permissions = permissions.concat(role.permissions); - }); - } - if (to.name != 'login') { if (!session || session.expires <= new Date()) { store.dispatch('session/logout').catch(error => { @@ -32,7 +24,7 @@ export default boot>(({ router, store }) => { return (<{ permissions: FG.Permission[] }>( record.meta )).permissions.every((permission: string) => { - return permissions.includes(permission); + return store.state.user.currentPermissions.includes(permission); }); } } diff --git a/src/components/navigation/EssentialLink.vue b/src/components/navigation/EssentialLink.vue index 5e13044..f5fcf12 100644 --- a/src/components/navigation/EssentialLink.vue +++ b/src/components/navigation/EssentialLink.vue @@ -23,6 +23,7 @@ import { computed, defineComponent } from '@vue/composition-api'; import { Store } from 'vuex'; import { StateInterface } from 'src/store'; +import { hasPermissions } from 'src/components/permission'; export default defineComponent({ name: 'EssentialLink', @@ -65,17 +66,9 @@ export default defineComponent({ return props.title; }); - const hasPermissions = computed(() => { - let permissions = props.permissions; - if (permissions) { - return (permissions).every(permission => { - return (<{ 'user/permissions': string[] }>( - (>root.$store).getters - ))['user/permissions'].includes(permission); - }); - } - return true; - }); + const isGranted = computed(() => + hasPermissions(props.permissions || [], root.$store) + ); return { realTitle: title, hasPermissions }; } diff --git a/src/components/navigation/ShortCutLink.vue b/src/components/navigation/ShortCutLink.vue index 85e7807..8f26424 100644 --- a/src/components/navigation/ShortCutLink.vue +++ b/src/components/navigation/ShortCutLink.vue @@ -1,11 +1,12 @@ diff --git a/src/components/permission.ts b/src/components/permission.ts new file mode 100644 index 0000000..f005ab7 --- /dev/null +++ b/src/components/permission.ts @@ -0,0 +1,14 @@ +import { Store } from 'vuex'; +import { StateInterface } from 'src/store'; + +export function hasPermission( + permission: string, + store: Store +) { + return store.state.user.currentPermissions.includes(permission); +} + +export function hasPermissions(needed: string[], store: Store) { + const permissions = store.state.user.currentPermissions; + return needed.every(value => permissions.includes(value)); +} diff --git a/src/plugins/user/components/UserSelector.vue b/src/plugins/user/components/UserSelector.vue new file mode 100644 index 0000000..109d508 --- /dev/null +++ b/src/plugins/user/components/UserSelector.vue @@ -0,0 +1,41 @@ + + + diff --git a/src/plugins/user/components/settings/Main.vue b/src/plugins/user/components/settings/Main.vue deleted file mode 100644 index 607aa00..0000000 --- a/src/plugins/user/components/settings/Main.vue +++ /dev/null @@ -1,191 +0,0 @@ - - - diff --git a/src/plugins/user/components/settings/MainUserSettings.vue b/src/plugins/user/components/settings/MainUserSettings.vue new file mode 100644 index 0000000..218dad3 --- /dev/null +++ b/src/plugins/user/components/settings/MainUserSettings.vue @@ -0,0 +1,194 @@ + + + diff --git a/src/plugins/user/pages/AdminSettings.vue b/src/plugins/user/pages/AdminSettings.vue new file mode 100644 index 0000000..95461f2 --- /dev/null +++ b/src/plugins/user/pages/AdminSettings.vue @@ -0,0 +1,55 @@ + + + diff --git a/src/plugins/user/pages/Settings.vue b/src/plugins/user/pages/Settings.vue index 6fc4106..68f9ce2 100644 --- a/src/plugins/user/pages/Settings.vue +++ b/src/plugins/user/pages/Settings.vue @@ -4,41 +4,41 @@ padding class="fit row justify-center content-center items-center q-gutter-sm" > -
    - -
    - Allgemeine Einstellungen: -
    -
    -
    - Aktive Sessions: -
    - -
    -
    - -
    + + + +
    Benutzereinstellungen
    +
    + +
    +
    Aktive Sessions:
    + From d4bc385833f368d613e439fd0fa8d90d3385f8fc Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 6 Nov 2020 01:31:46 +0100 Subject: [PATCH 079/448] Fixed users can set role in frontend without permission --- src/plugins/user/components/settings/MainUserSettings.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/user/components/settings/MainUserSettings.vue b/src/plugins/user/components/settings/MainUserSettings.vue index 218dad3..e429a3e 100644 --- a/src/plugins/user/components/settings/MainUserSettings.vue +++ b/src/plugins/user/components/settings/MainUserSettings.vue @@ -44,7 +44,7 @@ multiple use-chips v-model="props.user.roles" - :readonly="() => canSetRoles()" + :readonly="!canSetRoles" :options="allRoles" option-label="name" option-value="name" From 458cf81a912d2aee8e18732d29be3e09d1e1fa43 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 6 Nov 2020 10:52:13 +0100 Subject: [PATCH 080/448] Fixed order of date and time in datetime filter --- src/boot/filter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/boot/filter.ts b/src/boot/filter.ts index 559600c..902a511 100644 --- a/src/boot/filter.ts +++ b/src/boot/filter.ts @@ -24,6 +24,6 @@ export default boot(({ Vue }) => { ? date.getSeconds().toString() : `0${date.getSeconds().toString()}`); } - return `${H}:${M}${S} ${formatDate(date)}`; + return `${formatDate(date)} ${H}:${M}${S}`; }); }); From e566a89860c6fad02246feacad21400527535291 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 6 Nov 2020 10:52:51 +0100 Subject: [PATCH 081/448] Add warning if backend is offline (implements #416) --- src/boot/axios.ts | 10 +++-- src/components/loading/BackendOffline.vue | 46 +++++++++++++++++++++ src/components/navigation/EssentialLink.vue | 2 - src/components/navigation/ShortCutLink.vue | 2 - src/layouts/MainLayout.vue | 5 ++- src/layouts/OutLayout.vue | 12 ++---- src/plugins/user/store/session.ts | 7 +++- 7 files changed, 67 insertions(+), 17 deletions(-) create mode 100644 src/components/loading/BackendOffline.vue diff --git a/src/boot/axios.ts b/src/boot/axios.ts index 4de466e..0ee01ac 100644 --- a/src/boot/axios.ts +++ b/src/boot/axios.ts @@ -27,14 +27,18 @@ export default boot>(({ Vue, store }) => { }); /*** - * Intercept responses, filter 401 and logout + * Intercept responses + * - filter 401 --> logout + * - filter timeout or 502 --> backendOffline */ axios.interceptors.response.use( response => response, error => { - if (error && 'response' in error) { + if (error) { const e = error; - if (e.response && e.response.status == 401) { + if (e.code === 'ECONNABORTED' || e.response && e.response.status === 502) { + store.commit('session/setOffline', true); + } else if (e.response && e.response.status == 401) { return store.dispatch('session/clearup'); } } diff --git a/src/components/loading/BackendOffline.vue b/src/components/loading/BackendOffline.vue new file mode 100644 index 0000000..8870022 --- /dev/null +++ b/src/components/loading/BackendOffline.vue @@ -0,0 +1,46 @@ + + + diff --git a/src/components/navigation/EssentialLink.vue b/src/components/navigation/EssentialLink.vue index b22f15f..205d384 100644 --- a/src/components/navigation/EssentialLink.vue +++ b/src/components/navigation/EssentialLink.vue @@ -15,8 +15,6 @@ diff --git a/src/plugins/user/store/session.ts b/src/plugins/user/store/session.ts index b2cb1e7..2fabc6d 100644 --- a/src/plugins/user/store/session.ts +++ b/src/plugins/user/store/session.ts @@ -10,6 +10,7 @@ export interface SessionInterface { currentSession?: FG.Session; sessions: FG.Session[]; loading: boolean; + backendOffline: boolean; } function loadFromLocal() { @@ -21,7 +22,8 @@ function loadFromLocal() { const state: SessionInterface = { sessions: [], currentSession: loadFromLocal() || undefined, - loading: false + loading: false, + backendOffline: false }; const mutations: MutationTree = { @@ -38,6 +40,9 @@ const mutations: MutationTree = { }, setLoading(state, value: boolean) { state.loading = value; + }, + setOffline(state, value: boolean) { + state.backendOffline = value; } }; From 8c1dffc003e62e24ecbd6c61df0fbc38f8a40bb8 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Mon, 9 Nov 2020 03:39:31 +0100 Subject: [PATCH 082/448] Added RoleSettings, now users can edit and create roles --- .eslintrc.js | 2 +- .vscode/settings.json | 5 +- src/flaschengeist.d.ts | 1 + src/plugins/user/components/UserSelector.vue | 4 +- .../user/components/settings/RoleSettings.vue | 153 ++++++++++++++++++ src/plugins/user/pages/AdminSettings.vue | 19 ++- src/plugins/user/permissions.ts | 12 ++ src/plugins/user/store/user.ts | 51 +++++- 8 files changed, 233 insertions(+), 14 deletions(-) create mode 100644 src/plugins/user/components/settings/RoleSettings.vue create mode 100644 src/plugins/user/permissions.ts diff --git a/.eslintrc.js b/.eslintrc.js index 7afec26..6224f77 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -16,7 +16,7 @@ module.exports = { parser: '@typescript-eslint/parser', project: resolve(__dirname, './tsconfig.json'), tsconfigRootDir: __dirname, - ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features + ecmaVersion: 2019, // Allows for the parsing of modern ECMAScript features sourceType: 'module' // Allows for the use of imports }, diff --git a/.vscode/settings.json b/.vscode/settings.json index 5fb9ecd..8a8acde 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,5 +11,6 @@ "typescript.format.placeOpenBraceOnNewLineForControlBlocks": false, "typescript.format.placeOpenBraceOnNewLineForFunctions": false, "vetur.format.defaultFormatter.html": "js-beautify-html", - "vetur.format.defaultFormatter.js": "vscode-typescript" -} \ No newline at end of file + "vetur.format.defaultFormatter.js": "esbenp.prettier-vscode", + "typescript.tsdk": "node_modules/typescript/lib" +} diff --git a/src/flaschengeist.d.ts b/src/flaschengeist.d.ts index 8fc1a92..f394753 100644 --- a/src/flaschengeist.d.ts +++ b/src/flaschengeist.d.ts @@ -17,6 +17,7 @@ declare namespace FG { } type Permission = string; interface Role { + id: number; name: string; permissions: Array; } diff --git a/src/plugins/user/components/UserSelector.vue b/src/plugins/user/components/UserSelector.vue index 109d508..1965d0b 100644 --- a/src/plugins/user/components/UserSelector.vue +++ b/src/plugins/user/components/UserSelector.vue @@ -12,7 +12,7 @@ diff --git a/src/plugins/user/pages/AdminSettings.vue b/src/plugins/user/pages/AdminSettings.vue index 95461f2..1dffb96 100644 --- a/src/plugins/user/pages/AdminSettings.vue +++ b/src/plugins/user/pages/AdminSettings.vue @@ -17,20 +17,29 @@ + diff --git a/src/pages/Login.vue b/src/pages/Login.vue index c6e7566..323cdad 100644 --- a/src/pages/Login.vue +++ b/src/pages/Login.vue @@ -40,7 +40,7 @@ import { Loading } from 'quasar'; export default defineComponent({ // name: 'PageName' setup(_, { root }) { - const mainRoute = { name: 'user-main' }; + const mainRoute = { name: 'dashboard' }; /* Stuff for the real login page */ const userid = ref(''); diff --git a/src/plugins.d.ts b/src/plugins.d.ts index 3f92f4a..33f3079 100644 --- a/src/plugins.d.ts +++ b/src/plugins.d.ts @@ -1,6 +1,8 @@ import { RouteConfig } from 'vue-router'; import { Module } from 'vuex'; import { StateInterface } from 'src/store'; +import { AsyncComponentPromise } from 'vue/types/options'; + declare namespace FG_Plugin { interface ShortCutLink { link: string; @@ -21,6 +23,7 @@ declare namespace FG_Plugin { mainRoutes?: PluginRouteConfig[]; outRoutes?: PluginRouteConfig[]; store?: Map>; + widget?: Widget; requiredModules: string[]; version: string; } @@ -42,11 +45,17 @@ declare namespace FG_Plugin { version: string; } + interface Widget { + widget: AsyncComponentPromise; + priority: number; + } + interface LoadedPlugins { plugins: LoadedPlugin[]; routes: RouteConfig[]; mainLinks: PluginMainLink[]; shortcuts: ShortCutLink[]; shortcutsOut: ShortCutLink[]; + widgets: Widget[]; } } diff --git a/src/plugins/balance/components/Widget.vue b/src/plugins/balance/components/Widget.vue new file mode 100644 index 0000000..1485bc9 --- /dev/null +++ b/src/plugins/balance/components/Widget.vue @@ -0,0 +1,34 @@ + + + diff --git a/src/plugins/balance/plugin.ts b/src/plugins/balance/plugin.ts index 7a7a9d1..b90d338 100644 --- a/src/plugins/balance/plugin.ts +++ b/src/plugins/balance/plugin.ts @@ -11,7 +11,11 @@ const plugin: FG_Plugin.Plugin = { version: '0.0.1', store: new Map>([ ['balance', balance] - ]) + ]), + widget: { + widget: () => import('./components/Widget.vue'), + priority: 0 + } }; export default plugin; diff --git a/src/plugins/schedule/components/Widget.vue b/src/plugins/schedule/components/Widget.vue new file mode 100644 index 0000000..5f75ff5 --- /dev/null +++ b/src/plugins/schedule/components/Widget.vue @@ -0,0 +1,26 @@ + + + diff --git a/src/plugins/schedule/plugin.ts b/src/plugins/schedule/plugin.ts new file mode 100644 index 0000000..786a74e --- /dev/null +++ b/src/plugins/schedule/plugin.ts @@ -0,0 +1,13 @@ +import { FG_Plugin } from 'src/plugins'; + +const plugin: FG_Plugin.Plugin = { + name: 'Schedule', + requiredModules: [], + version: '0.0.1', + widget: { + widget: () => import('./components/Widget.vue'), + priority: 0 + } +}; + +export default plugin; diff --git a/src/plugins/user/components/Widget.vue b/src/plugins/user/components/Widget.vue new file mode 100644 index 0000000..4209dc0 --- /dev/null +++ b/src/plugins/user/components/Widget.vue @@ -0,0 +1,38 @@ + + + diff --git a/src/plugins/user/pages/User.vue b/src/plugins/user/pages/User.vue deleted file mode 100644 index fe57f56..0000000 --- a/src/plugins/user/pages/User.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - diff --git a/src/plugins/user/plugin.ts b/src/plugins/user/plugin.ts index 7bf40e3..9d03f5f 100644 --- a/src/plugins/user/plugin.ts +++ b/src/plugins/user/plugin.ts @@ -13,7 +13,11 @@ const plugin: FG_Plugin.Plugin = { store: new Map>([ ['user', userStore], ['session', sessionsStore] - ]) + ]), + widget: { + priority: 1, + widget: () => import('./components/Widget.vue') + } }; export default plugin; diff --git a/src/plugins/user/routes/index.ts b/src/plugins/user/routes/index.ts index bd64eac..0c6d3d3 100644 --- a/src/plugins/user/routes/index.ts +++ b/src/plugins/user/routes/index.ts @@ -8,18 +8,9 @@ const mainRoutes: FG_Plugin.PluginRouteConfig[] = [ component: () => import('../pages/MainPage.vue'), meta: { permissions: ['user'] }, children: [ - { - title: 'Hauptkanal', - icon: 'mdi-account-hard-hat', - path: 'user-main', - name: 'user-main', - shortcut: false, - meta: { permissions: ['user'] }, - component: () => import('../pages/User.vue') - }, { title: 'Einstellungen', - icon: 'mdi-cog', + icon: 'mdi-account-edit', path: 'settings', name: 'user-settings', shortcut: true, diff --git a/src/router/routes.ts b/src/router/routes.ts index 666df2f..47f9882 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -20,9 +20,15 @@ const routes: RouteConfig[] = [ }, { path: '/main', - redirect: 'user', + redirect: 'dashboard', component: () => import('layouts/MainLayout.vue'), children: [ + { + name: 'dashboard', + path: 'dashboard', + meta: { permission: 'user' }, + component: () => import('pages/Dashboard.vue') + }, { name: 'about', path: 'about', From 390e0fc95b95c6a072a0ea18949e0a7401d56f6d Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Tue, 10 Nov 2020 01:40:50 +0100 Subject: [PATCH 087/448] Fixed TS errors and warnings --- src/plugins/schedule/components/Widget.vue | 6 ++---- src/plugins/user/components/Widget.vue | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/schedule/components/Widget.vue b/src/plugins/schedule/components/Widget.vue index 5f75ff5..0269d85 100644 --- a/src/plugins/schedule/components/Widget.vue +++ b/src/plugins/schedule/components/Widget.vue @@ -8,13 +8,11 @@ diff --git a/src/router/routes.ts b/src/router/routes.ts index 47f9882..9d45aac 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -22,17 +22,18 @@ const routes: RouteConfig[] = [ path: '/main', redirect: 'dashboard', component: () => import('layouts/MainLayout.vue'), + meta: { permissions: ['user']}, children: [ { name: 'dashboard', path: 'dashboard', - meta: { permission: 'user' }, + meta: { permissions: ['user'] }, component: () => import('pages/Dashboard.vue') }, { name: 'about', path: 'about', - meta: { permission: 'user' }, + meta: { permissions: ['user'] }, component: () => import('pages/about/About.vue') } ] From 338fbb97b36addb32feb1c7b8b848a2c8e5b128c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Thu, 12 Nov 2020 14:28:02 +0100 Subject: [PATCH 093/448] =?UTF-8?q?[Admin]=20Design=C3=A4nderung=20der=20A?= =?UTF-8?q?dminpage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/logo-dark.svg | 432 ++--------------------- public/logo.svg | 249 ++++++++++--- src/plugins/user/pages/AdminSettings.vue | 99 ++++-- 3 files changed, 304 insertions(+), 476 deletions(-) diff --git a/public/logo-dark.svg b/public/logo-dark.svg index 6110815..378851d 100644 --- a/public/logo-dark.svg +++ b/public/logo-dark.svg @@ -7,27 +7,17 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="525.1181" - height="635.90552" - id="svg3052" version="1.1" - inkscape:version="0.48.5 r10040" - sodipodi:docname="Loewe_dunkelaufhell.svg"> - - - - image/svg+xml - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview4" /> diff --git a/public/logo.svg b/public/logo.svg index 2cd6ae8..3baaf7b 100644 --- a/public/logo.svg +++ b/public/logo.svg @@ -7,27 +7,17 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="560.12598" - height="678.29919" - id="svg3052" version="1.1" - inkscape:version="0.92.4 (5da689c313, 2019-01-14)" - sodipodi:docname="logo-dark.svg" - viewBox="0 0 525.1181 635.90552"> - - - - image/svg+xml - - - - - - image/svg+xml - - + inkscape:window-width="640" + inkscape:window-height="480" + id="namedview4" /> diff --git a/src/plugins/user/pages/AdminSettings.vue b/src/plugins/user/pages/AdminSettings.vue index 1dffb96..e60494d 100644 --- a/src/plugins/user/pages/AdminSettings.vue +++ b/src/plugins/user/pages/AdminSettings.vue @@ -1,23 +1,44 @@ @@ -32,15 +53,16 @@ import { import UserSelector from '../components/UserSelector.vue'; import MainUserSettings from '../components/settings/MainUserSettings.vue'; import RoleSettings from '../components/settings/RoleSettings.vue'; -import { Store } from 'vuex'; -import { StateInterface } from 'src/store'; -import { hasPermission } from 'src/components/permission'; -import { PERMISSIONS } from '../permissions'; +import {Store} from 'vuex'; +import {StateInterface} from 'src/store'; +import {hasPermission} from 'src/components/permission'; +import {PERMISSIONS} from '../permissions'; +import {Screen} from 'quasar'; export default defineComponent({ name: 'AdminSettings', - components: { UserSelector, MainUserSettings, RoleSettings }, - setup(_, { root }) { + components: {UserSelector, MainUserSettings, RoleSettings}, + setup(_, {root}) { const store = >root.$store; onBeforeMount(() => { @@ -58,10 +80,37 @@ export default defineComponent({ console.log(value); }; + interface Tab { + name: string; + label: string; + } + + const tabs: Tab[] = [ + {name: 'user', label: 'Mitglieder'}, + {name: 'newUser', label: 'Neues Mitglied'}, + {name: 'roles', label: 'Rollen'} + ] + + const drawer = ref(false) + + const showDrawer = computed({ + get: () => { + return !Screen.gt.sm && drawer.value + }, + set: (val: boolean) => { + drawer.value = val + } + }) + + const tab = ref('user'); + return { user, userUpdated, - canEditRoles + canEditRoles, + showDrawer, + tab, + tabs }; } }); From 4ea0bce19d27eb41eb27aa5dc0f6960e0c25328d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Thu, 12 Nov 2020 22:48:19 +0100 Subject: [PATCH 094/448] =?UTF-8?q?[Admin]=20neuer=20User=20kann=20hinzuge?= =?UTF-8?q?f=C3=BCgt=20werden?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/user/components/NewUser.vue | 42 ++++++++ src/plugins/user/components/UpdateUser.vue | 50 ++++++++++ .../components/settings/MainUserSettings.vue | 41 ++++++-- src/plugins/user/pages/AdminSettings.vue | 99 ++++++++++--------- src/plugins/user/pages/Settings.vue | 10 +- src/plugins/user/store/user.ts | 17 ++++ 6 files changed, 199 insertions(+), 60 deletions(-) create mode 100644 src/plugins/user/components/NewUser.vue create mode 100644 src/plugins/user/components/UpdateUser.vue diff --git a/src/plugins/user/components/NewUser.vue b/src/plugins/user/components/NewUser.vue new file mode 100644 index 0000000..cd59e2a --- /dev/null +++ b/src/plugins/user/components/NewUser.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/src/plugins/user/components/UpdateUser.vue b/src/plugins/user/components/UpdateUser.vue new file mode 100644 index 0000000..634bc56 --- /dev/null +++ b/src/plugins/user/components/UpdateUser.vue @@ -0,0 +1,50 @@ + + + + + diff --git a/src/plugins/user/components/settings/MainUserSettings.vue b/src/plugins/user/components/settings/MainUserSettings.vue index e429a3e..c2f3376 100644 --- a/src/plugins/user/components/settings/MainUserSettings.vue +++ b/src/plugins/user/components/settings/MainUserSettings.vue @@ -19,8 +19,9 @@ - - + + >root.$store; onBeforeMount(() => { @@ -144,9 +156,9 @@ export default defineComponent({ new_password: new_password.value }); } - store.dispatch('user/updateUser', changed).catch(error => { - console.warn(error); - }); + console.log(changed); + + emit('update:user', changed); } function reset() { @@ -172,6 +184,16 @@ export default defineComponent({ ); } + function isUseridUsed(val: string) { + return ( + !store.state.user.users.find((user: FG.User) => { + return user.userid == val; + }) || + !props.newUser || + 'Benutzername ist schon vergeben' + ); + } + const loading = computed(() => store.state.user.loading > 0); return { @@ -185,6 +207,7 @@ export default defineComponent({ isCurrentUser, isEmail, notEmpty, + isUseridUsed, save, reset, loading diff --git a/src/plugins/user/pages/AdminSettings.vue b/src/plugins/user/pages/AdminSettings.vue index e60494d..8604986 100644 --- a/src/plugins/user/pages/AdminSettings.vue +++ b/src/plugins/user/pages/AdminSettings.vue @@ -1,42 +1,52 @@ diff --git a/src/plugins/user/pages/AdminSettings.vue b/src/plugins/user/pages/AdminSettings.vue index 5bf68bb..e064415 100644 --- a/src/plugins/user/pages/AdminSettings.vue +++ b/src/plugins/user/pages/AdminSettings.vue @@ -1,6 +1,9 @@ @@ -235,8 +183,10 @@ import { defineComponent, onBeforeMount, ref, computed } from '@vue/composition-api'; import store, { calc_min_prices } from '../store/altStore'; import { v4 } from 'uuid'; +import PriceTable from 'src/plugins/pricelist/components/CalculationTable/PriceTable.vue'; export default defineComponent({ name: 'CalculationTable', + components: { PriceTable }, setup(_, { root }) { onBeforeMount(() => { store.actions.getDrinks(); @@ -246,82 +196,82 @@ export default defineComponent({ { name: 'name', label: 'Getränkename', - field: 'name', + field: 'name' }, { name: 'article_id', label: 'Artikelnummer', - field: 'article_id', + field: 'article_id' }, { name: 'drink_type', label: 'Kategorie', field: 'type', - format: (val: FG.DrinkType) => `${val.name}`, + format: (val: FG.DrinkType) => `${val.name}` }, { name: 'volume_package', label: 'Inhalt in l des Gebinde', - field: 'volume', + field: 'volume' }, { name: 'package_size', label: 'Gebindegröße', - field: 'package_size', + field: 'package_size' }, { name: 'cost_price_package_netto', label: 'Preis Netto/Gebinde', field: 'cost_price_package_netto', - format: (val: number | null) => (val ? `${val.toFixed(3)}€` : ''), + format: (val: number | null) => (val ? `${val.toFixed(3)}€` : '') }, { name: 'cost_price_pro_volume', label: 'Preis mit 19%/Liter', field: 'cost_price_pro_volume', - format: (val: number | null) => (val ? `${val.toFixed(3)}€` : ''), + format: (val: number | null) => (val ? `${val.toFixed(3)}€` : '') }, { name: 'volumes', label: 'Preiskalkulation', - field: 'volumes', - }, + field: 'volumes' + } ]; const column_calc = [ { name: 'volume', label: 'Abgabe in l', field: 'volume', - format: (val: number) => `${val} L`, + format: (val: number) => `${val} L` }, { name: 'min_prices', label: 'Minimal Preise', - field: 'min_prices', + field: 'min_prices' }, { name: 'prices', label: 'Preise', - field: 'prices', - }, + field: 'prices' + } ]; const column_prices = [ { name: 'price', label: 'Preis', field: 'price', - format: (val: number) => `${val.toFixed(2)}€`, + format: (val: number) => `${val.toFixed(2)}€` }, { name: 'description', label: 'Beschreibung', - field: 'description', + field: 'description' }, { name: 'public', label: 'Öffentlich', - field: 'public', - }, + field: 'public' + } ]; const visibleColumn = ref([ 'name', @@ -333,56 +283,32 @@ export default defineComponent({ 'prices', 'price', 'description', - 'public', + 'public' ]); - - function deletePrice(row: FG.DrinkPrice) { - console.log(row); - } - const emptyPrice = { - price: 0, - description: '', - public: true, + const emptyVolume = { + id: -1, + volume: 0, + min_prices: [ + { percentage: 100, price: 0 }, + { percentage: 250, price: 0 }, + { percentage: 300, price: 0 } + ], + prices: [], + ingredients: [] }; - const newPrice = ref(emptyPrice); - function addPrice(volume: FG.DrinkPriceVolume) { - store.actions.setPrice({ ...newPrice.value }, volume); - cancelAddPrice(); + const newVolume = ref(emptyVolume); + function addVolume(drink: FG.Drink) { + store.actions.setVolume(newVolume.value, drink); + cancelAddVolume(); } - function cancelAddPrice() { + function cancelAddVolume() { setTimeout(() => { - addPrice.value = emptyPrice; + newVolume.value = emptyVolume; }, 200); } - function updatePrice(price: FG.DrinkPrice, volume: FG.DrinkPriceVolume) { - store.actions.updatePrice(price, volume); - } - function deletePrice(price: FG.DrinkPrice, volume: FG.DrinkPriceVolume) { - console.log(price, volume); - store.actions.deletePrice(price, volume); - } - - function addVolume(table: FG.DrinkPriceVolume[]) { - table.push({ - id: v4(), - volume: null, - min_prices: [ - { - percentage: 100, - price: 0, - }, - { - percentage: 250, - price: 0, - }, - { - percentage: 300, - price: 0, - }, - ], - prices: [], - ingredients: [], - }); + function updateVolume(volume: FG.DrinkPriceVolume, drink: FG.Drink) { + console.log(volume); + store.actions.updateVolume(volume, drink); } function addIngredient(ingredients: FG.Ingredient[]) { @@ -390,23 +316,20 @@ export default defineComponent({ } return { - drinks: computed({ get: () => store.state.drinks, set: (val) => console.log(val) }), + drinks: computed(() => store.state.drinks), columns, column_calc, column_prices, visibleColumn, - deletePrice, - newPrice, - addPrice, - updatePrice, - deletePrice, - cancelAddPrice, addVolume, + cancelAddVolume, + newVolume, + updateVolume, addIngredient, calc_min_prices, - console, + console }; - }, + } }); diff --git a/src/plugins/pricelist/components/CalculationTable/PriceTable.vue b/src/plugins/pricelist/components/CalculationTable/PriceTable.vue new file mode 100644 index 0000000..531af12 --- /dev/null +++ b/src/plugins/pricelist/components/CalculationTable/PriceTable.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/src/plugins/pricelist/store/altStore.ts b/src/plugins/pricelist/store/altStore.ts index 5430a8a..d8e7726 100644 --- a/src/plugins/pricelist/store/altStore.ts +++ b/src/plugins/pricelist/store/altStore.ts @@ -6,7 +6,7 @@ import ExtraIngredient = FG.ExtraIngredient; const state = reactive<{ drinks: FG.Drink[]; tags: FG.Tag[]; drinkTypes: FG.DrinkType[] }>({ drinks: [], tags: [], - drinkTypes: [], + drinkTypes: [] }); const actions = { @@ -21,7 +21,7 @@ const actions = { volume.min_prices = [ { percentage: 100, price: (drink.cost_price_pro_volume || 0) * volume.volume * 1 }, { percentage: 250, price: (drink.cost_price_pro_volume || 0) * volume.volume * 2.5 }, - { percentage: 300, price: (drink.cost_price_pro_volume || 0) * volume.volume * 3 }, + { percentage: 300, price: (drink.cost_price_pro_volume || 0) * volume.volume * 3 } ]; if (volume.ingredients.length > 0) { calc_min_prices(volume); @@ -30,16 +30,16 @@ const actions = { }); }); }) - .catch((err) => console.warn(err)); + .catch(err => console.warn(err)); }, setPrice(price: FG.DrinkPrice, volume: FG.DrinkPriceVolume) { axios - .post(`pricelist/prices/volumes/${volume.id}`, price) + .post(`pricelist/volumes/${volume.id}/prices`, price) .then((response: AxiosResponse) => { volume.prices.push(response.data); this.sortPrices(volume); }) - .catch((err) => console.warn(err)); + .catch(err => console.warn(err)); }, sortPrices(volume: FG.DrinkPriceVolume) { volume.prices.sort((a, b) => { @@ -52,29 +52,52 @@ const actions = { axios .delete(`pricelist/prices/${price.id}`) .then(() => { - const index = volume.prices.findIndex((a) => a.id == price.id); + const index = volume.prices.findIndex(a => a.id == price.id); if (index > -1) { volume.prices.splice(index, 1); } }) - .catch((err) => console.warn(err)); + .catch(err => console.warn(err)); }, updatePrice(price: FG.DrinkPrice, volume: FG.DrinkPriceVolume) { axios .put(`pricelist/prices/${price.id}`, price) .then((response: AxiosResponse) => { - const index = volume.prices.findIndex((a) => a.id === price.id); + const index = volume.prices.findIndex(a => a.id === price.id); if (index > -1) { - volume.prices[index] = response.data; + //volume.prices[index] = response.data; this.sortPrices(volume); } }) - .catch((err) => console.log(err)); + .catch(err => console.log(err)); }, + setVolume(volume: FG.DrinkPriceVolume, drink: FG.Drink) { + axios + .post(`pricelist/drinks/${drink.id}/volumes`, volume) + .then((response: AxiosResponse) => { + drink.volumes.push(response.data); + }) + .catch(err => console.warn(err)); + }, + updateVolume(volume: FG.DrinkPriceVolume, drink: FG.Drink) { + axios + .put(`pricelist/volumes/${volume.id}`, volume) + .then(() => { + //calc_min_prices_by_drink(volume, drink); + }) + .catch(err => console.warn(err)); + } }; const getters = {}; +function calc_min_prices_by_drink(volume: FG.DrinkPriceVolume, drink: FG.Drink) { + volume.min_prices.forEach(min_price => { + min_price.price = + ((drink.cost_price_pro_volume || 0) * volume.volume * min_price.percentage) / 100; + }); +} + function calc_min_prices(row: FG.DrinkPriceVolume) { row.volume = 0; let cost_price = 0; @@ -87,7 +110,7 @@ function calc_min_prices(row: FG.DrinkPriceVolume) { cost_price += ingredient.price; } }); - row.min_prices.forEach((min_price) => { + row.min_prices.forEach(min_price => { min_price.price = (cost_price * min_price.percentage) / 100; }); } @@ -96,5 +119,5 @@ export { calc_min_prices }; export default { state, actions, - getters, + getters }; From 7e01ffc507592219f7373b96a5181855432c062c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Tue, 16 Mar 2021 18:10:37 +0100 Subject: [PATCH 183/448] [pricelist] fixed some computed values, new interfaces --- src/flaschengeist.d.ts | 2 + .../pricelist/components/CalculationTable.vue | 60 ++++-- .../CalculationTable/PriceTable.vue | 8 +- src/plugins/pricelist/store/altStore.ts | 193 ++++++++++++++---- 4 files changed, 197 insertions(+), 66 deletions(-) diff --git a/src/flaschengeist.d.ts b/src/flaschengeist.d.ts index a69c5f1..3fe8aaa 100644 --- a/src/flaschengeist.d.ts +++ b/src/flaschengeist.d.ts @@ -61,11 +61,13 @@ declare namespace FG { } interface DrinkMinPrice { percentage: number; + //price: ComputedRef; price: number; } interface DrinkPriceVolume { id: number; volume: number; + //computed_volume: ComputedRef; min_prices: DrinkMinPrice[]; prices: Array; ingredients: Array; diff --git a/src/plugins/pricelist/components/CalculationTable.vue b/src/plugins/pricelist/components/CalculationTable.vue index 99e196e..108c8ea 100644 --- a/src/plugins/pricelist/components/CalculationTable.vue +++ b/src/plugins/pricelist/components/CalculationTable.vue @@ -55,20 +55,32 @@ :icon="props.expand ? 'mdi-chevron-up' : 'mdi-chevron-down'" v-if="volumes.row.cost_price_pro_volume == null" /> + - {{ props.row.volume }}L + {{ parseFloat(props.row.volume.value).toFixed(3) }}L + @@ -84,7 +96,8 @@ {{ min_price.percentage }}%
    - {{ parseFloat(min_price.price).toFixed(3) }}€ + + {{ min_price.price.value.toFixed(3) }}€
    @@ -116,7 +129,6 @@ :options="drinks" option-label="name" v-model="ingredient.drink_ingredient" - @input="calc_min_prices(props.row)" /> @@ -141,7 +152,6 @@ color="positive" label="Zutat hinzufügen" @click="addIngredient(props.row.ingredients, props.row.id)" - @change="calc_min_prices(props.row)" /> @@ -180,9 +190,15 @@ + + diff --git a/src/plugins/pricelist/store/altStore.ts b/src/plugins/pricelist/store/altStore.ts index 1124713..3d1922e 100644 --- a/src/plugins/pricelist/store/altStore.ts +++ b/src/plugins/pricelist/store/altStore.ts @@ -2,10 +2,16 @@ import { reactive, computed, ComputedRef, WritableComputedRef } from '@vue/compo import { axios } from 'src/boot/axios'; import { AxiosResponse } from 'axios'; -const state = reactive<{ drinks: Drink[]; tags: FG.Tag[]; drinkTypes: FG.DrinkType[] }>({ +const state = reactive<{ + drinks: Drink[]; + tags: FG.Tag[]; + drinkTypes: FG.DrinkType[]; + extraIngredients: FG.ExtraIngredient[]; +}>({ drinks: [], tags: [], - drinkTypes: [] + drinkTypes: [], + extraIngredients: [] }); interface MinPrice extends Omit { @@ -165,6 +171,44 @@ const actions = { } }) .catch(err => console.warn(err)); + }, + getExtraIngredients() { + axios + .get('pricelist/ingredients/extraIngredients') + .then((response: AxiosResponse) => { + state.extraIngredients = response.data; + }) + .catch(err => console.log(err)); + }, + setIngredient(ingredient: FG.Ingredient, volume: DrinkPriceVolume) { + axios + .post(`pricelist/volumes/${volume.id}/ingredients`, ingredient) + .then((response: AxiosResponse) => { + volume.ingredients.push(response.data); + }) + .catch(err => console.warn(err)); + }, + updateIngredient(ingredient: FG.Ingredient, volume: DrinkPriceVolume) { + axios + .put(`pricelist/ingredients/${ingredient.id}`, ingredient) + .then((response: AxiosResponse) => { + const index = volume.ingredients.findIndex(a => a.id === response.data.id); + if (index > -1) { + volume.ingredients[index] = response.data; + } + }) + .catch(err => console.warn(err)); + }, + deleteIngredient(ingredient: FG.Ingredient, volume: DrinkPriceVolume) { + axios + .delete(`pricelist/ingredients/${ingredient.id}`) + .then(() => { + const index = volume.ingredients.findIndex(a => a.id === ingredient.id); + if (index > -1) { + volume.ingredients.splice(index, 1); + } + }) + .catch(err => console.warn(err)); } }; @@ -176,8 +220,8 @@ function create_volume(drink: Drink, volume: DrinkPriceVolume) { if (volume.ingredients.some(ingredient => !!ingredient.drink_ingredient)) { let retVal = 0; volume.ingredients.forEach(ingredient => { - if (ingredient.volume) { - retVal += ingredient.volume; + if (ingredient.drink_ingredient?.volume) { + retVal += ingredient.drink_ingredient.volume; } }); volume._volume = retVal; @@ -195,8 +239,10 @@ function create_min_prices(drink: Drink, volume: DrinkPriceVolume, percentage: n if (volume.ingredients.every(ingredient => !!ingredient.drink_ingredient)) { return computed(() => { let retVal = (drink.cost_price_pro_volume || 0) * (volume.volume?.value || 0); - volume.ingredients.forEach((ingredient: FG.ExtraIngredient) => { - retVal += ingredient.price; + volume.ingredients.forEach(ingredient => { + if (ingredient.extra_ingredient) { + retVal += ingredient.extra_ingredient.price; + } }); retVal = (retVal * percentage) / 100; return retVal; @@ -211,10 +257,12 @@ function create_min_prices(drink: Drink, volume: DrinkPriceVolume, percentage: n let retVal = 0; volume.ingredients.forEach(ingredient => { if (ingredient.drink_ingredient) { - retVal += ingredient.volume * (ingredient.drink_ingredient.cost_price_pro_volume || 0); + retVal += + ingredient.drink_ingredient.volume * + (ingredient.drink_ingredient.drink_ingredient?.cost_price_pro_volume || 0); } - if (ingredient.name) { - retVal += ingredient.price; + if (ingredient.extra_ingredient) { + retVal += ingredient.extra_ingredient.price; } }); console.log(volume); From 57f21936c063e21d3a58ae6c3580fc336b6fb723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= Date: Wed, 17 Mar 2021 21:36:26 +0100 Subject: [PATCH 185/448] [pricelist] finish drinks, can add, modify and delete --- src/flaschengeist.d.ts | 2 +- .../pricelist/components/CalculationTable.vue | 795 ++++++++++++++---- .../CalculationTable/Ingredients.vue | 6 +- .../CalculationTable/PriceTable.vue | 14 +- src/plugins/pricelist/store/altStore.ts | 237 +++--- 5 files changed, 804 insertions(+), 250 deletions(-) diff --git a/src/flaschengeist.d.ts b/src/flaschengeist.d.ts index 8325379..42c3a56 100644 --- a/src/flaschengeist.d.ts +++ b/src/flaschengeist.d.ts @@ -43,7 +43,7 @@ declare namespace FG { cost_price_pro_volume?: number; cost_price_package_netto?: number; tags: Array; - type: DrinkType; + type?: DrinkType; volumes: DrinkPriceVolume[]; } interface DrinkIngredient { diff --git a/src/plugins/pricelist/components/CalculationTable.vue b/src/plugins/pricelist/components/CalculationTable.vue index 32e9694..20ce327 100644 --- a/src/plugins/pricelist/components/CalculationTable.vue +++ b/src/plugins/pricelist/components/CalculationTable.vue @@ -1,13 +1,88 @@ + + - - diff --git a/src/plugins/pricelist/components/ExtraIngredients.vue b/src/plugins/pricelist/components/ExtraIngredients.vue new file mode 100644 index 0000000..c214feb --- /dev/null +++ b/src/plugins/pricelist/components/ExtraIngredients.vue @@ -0,0 +1,146 @@ + + + + + diff --git a/src/plugins/pricelist/pages/MainPage.vue b/src/plugins/pricelist/pages/MainPage.vue index 861457b..369903b 100644 --- a/src/plugins/pricelist/pages/MainPage.vue +++ b/src/plugins/pricelist/pages/MainPage.vue @@ -21,9 +21,10 @@ diff --git a/src/boot/axios.ts b/src/boot/axios.ts index 940b45a..6ffca27 100644 --- a/src/boot/axios.ts +++ b/src/boot/axios.ts @@ -19,7 +19,7 @@ export const setBaseUrl = (url: string) => { message: 'Serveraddresse gespeichert', position: 'bottom', caption: `${url}`, - color: 'positive' + color: 'positive', }); setTimeout(() => { window.location.reload(); @@ -38,7 +38,7 @@ export default boot>(({ Vue, store, router }) => { /*** * Intercept requests and insert Token if available */ - axios.interceptors.request.use(config => { + axios.interceptors.request.use((config) => { const session = store.state.session.currentSession; if (session?.token) { config.headers = { Authorization: 'Bearer ' + session.token }; @@ -52,8 +52,8 @@ export default boot>(({ Vue, store, router }) => { * - filter timeout or 502-504 --> backendOffline */ axios.interceptors.response.use( - response => response, - error => { + (response) => response, + (error) => { if (error) { const e = error; if ( @@ -62,7 +62,7 @@ export default boot>(({ Vue, store, router }) => { ) { return router.push({ name: 'offline', - query: { redirect: router.currentRoute.fullPath } + query: { redirect: router.currentRoute.fullPath }, }); } else if (e.response && e.response.status == 401) { if (router.currentRoute.name !== 'login') return store.dispatch('session/clearCurrent'); diff --git a/src/boot/loading.ts b/src/boot/loading.ts index c56b27c..53f6d46 100644 --- a/src/boot/loading.ts +++ b/src/boot/loading.ts @@ -8,6 +8,6 @@ export default boot((/* { app, router, Vue ... } */) => { Loading.setDefaults({ // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore - spinner: DarkCircularProgress + spinner: DarkCircularProgress, }); }); diff --git a/src/boot/login.ts b/src/boot/login.ts index f9c8d61..cc33679 100644 --- a/src/boot/login.ts +++ b/src/boot/login.ts @@ -15,7 +15,7 @@ export default boot>(({ router, store }) => { // Secured area (LOGIN REQUIRED) // Check login is ok if (!session || session.expires <= new Date()) { - store.dispatch('session/logout').catch(error => { + store.dispatch('session/logout').catch((error) => { console.warn(error); }); return; diff --git a/src/boot/notify.ts b/src/boot/notify.ts index 513290d..8dfc333 100644 --- a/src/boot/notify.ts +++ b/src/boot/notify.ts @@ -9,6 +9,6 @@ export default boot((/* { app, router, Vue ... } */) => { icon: 'mdi-alert-circle', progress: true, position: 'bottom', - actions: [{ icon: 'mdi-close', color: 'white' }] + actions: [{ icon: 'mdi-close', color: 'white' }], }); }); diff --git a/src/boot/plugins.ts b/src/boot/plugins.ts index 7807578..c2c3336 100644 --- a/src/boot/plugins.ts +++ b/src/boot/plugins.ts @@ -12,7 +12,7 @@ const config = { // Do not change required Modules !! requiredModules: ['User'], // here you can import plugins. - loadModules: ['Balance', 'Schedule', 'Pricelist'] + loadModules: ['Balance', 'Schedule', 'Pricelist'], }; // do not change anything here !! @@ -40,7 +40,7 @@ function combineRoutes( source: FG_Plugin.PluginRouteConfig[], mainPath: '/' | '/main' = '/' ): RouteConfig[] { - target.forEach(target => { + target.forEach((target) => { if (target.path === mainPath) { source.forEach((sourceMainConfig: FG_Plugin.PluginRouteConfig) => { const targetMainConfig = target.children?.find((targetMainConfig: RouteConfig) => { @@ -48,7 +48,7 @@ function combineRoutes( }); if (targetMainConfig) { const sourceChildren: RouteConfig[] = []; - sourceMainConfig.children?.forEach(child => { + sourceMainConfig.children?.forEach((child) => { sourceChildren.push(child); }); if (targetMainConfig.children) { @@ -92,7 +92,7 @@ function combineMainLinks( icon: sourcePluginChildLink.icon, link: sourcePluginChildLink.name, name: sourcePluginChildLink.name, - permissions: sourcePluginChildLink.meta?.permissions + permissions: sourcePluginChildLink.meta?.permissions, }); }); } else { @@ -101,9 +101,9 @@ function combineMainLinks( icon: source.icon, link: source.name, name: source.name, - permissions: source.meta?.permissions + permissions: source.meta?.permissions, }; - source.children?.forEach(child => { + source.children?.forEach((child) => { if (mainLink.children === undefined) { mainLink.children = []; } @@ -112,7 +112,7 @@ function combineMainLinks( icon: child.icon, link: child.name, name: child.name, - permissions: child.meta?.permissions + permissions: child.meta?.permissions, }); }); target.push(mainLink); @@ -124,12 +124,12 @@ function loadShortCuts( target: FG_Plugin.ShortCutLink[], source: FG_Plugin.PluginRouteConfig[] ): FG_Plugin.ShortCutLink[] { - source.forEach(route => { + source.forEach((route) => { if (route.shortcut) { target.push({ link: route.name, icon: route.icon, - permissions: route.meta?.permissions + permissions: route.meta?.permissions, }); } if (route.children) { @@ -148,14 +148,14 @@ function loadPlugin( store: Store, router: VueRouter ): FG_Plugin.LoadedPlugins { - modules.forEach(requiredModule => { - const plugin = plugins.find(plugin => { + modules.forEach((requiredModule) => { + const plugin = plugins.find((plugin) => { return plugin.name == requiredModule; }); if (plugin) { if (plugin.mainRoutes) { loadedPlugins.routes = combineRoutes(loadedPlugins.routes, plugin.mainRoutes, '/main'); - plugin.mainRoutes.forEach(route => { + plugin.mainRoutes.forEach((route) => { loadedPlugins.mainLinks = combineMainLinks(loadedPlugins.mainLinks, route); }); loadedPlugins.shortcuts = loadShortCuts(loadedPlugins.shortcuts, plugin.mainRoutes); @@ -165,7 +165,7 @@ function loadPlugin( loadedPlugins.shortcutsOut = loadShortCuts(loadedPlugins.shortcutsOut, plugin.outRoutes); } if (plugin.widgets.length > 0) { - plugin.widgets.forEach(widget => (widget.name = plugin.name + '_' + widget.name)); + plugin.widgets.forEach((widget) => (widget.name = plugin.name + '_' + widget.name)); Array.prototype.push.apply(loadedPlugins.widgets, plugin.widgets); } if (plugin.store) { @@ -175,11 +175,11 @@ function loadPlugin( } loadedPlugins.plugins.push({ name: plugin.name, - version: plugin.version + version: plugin.version, }); } else { console.exception(`Could not find required Plugin ${requiredModule}`); - router.push({ name: 'error' }).catch(e => { + router.push({ name: 'error' }).catch((e) => { console.warn(e); }); } @@ -213,7 +213,7 @@ export default boot>(({ Vue, router, store }) => { mainLinks: [], shortcuts: [], shortcutsOut: [], - widgets: [] + widgets: [], }; // get all plugins @@ -225,7 +225,7 @@ export default boot>(({ Vue, router, store }) => { // check dependencies backendPromise - .then(backend => { + .then((backend) => { console.log(backend); if (backend) { plugins.forEach((plugin: FG_Plugin.Plugin) => { @@ -237,7 +237,7 @@ export default boot>(({ Vue, router, store }) => { ) ) { console.error(`Plugin ${plugin.name} need Plugin ${requiredModule}`); - router.push({ name: 'error' }).catch(e => { + router.push({ name: 'error' }).catch((e) => { console.warn(e); }); } @@ -247,7 +247,7 @@ export default boot>(({ Vue, router, store }) => { console.error( `Plugin ${plugin.name} need Plugin ${requiredBackendModule} in backend.` ); - router.push({ name: 'error' }).catch(err => { + router.push({ name: 'error' }).catch((err) => { console.warn(err); }); } @@ -255,7 +255,7 @@ export default boot>(({ Vue, router, store }) => { }); } }) - .catch(e => { + .catch((e) => { console.error(e); }); diff --git a/src/components/about/Developer.vue b/src/components/about/Developer.vue index 70cd302..96f67a0 100644 --- a/src/components/about/Developer.vue +++ b/src/components/about/Developer.vue @@ -27,26 +27,26 @@ export default defineComponent({ name: 'Developer', props: { pic: { - default: 'logo-dark.svg' + default: 'logo-dark.svg', }, firstname: { //required: true, - default: 'firstname' + default: 'firstname', }, lastname: { //required: true, - default: 'lastname' + default: 'lastname', }, job: { - default: 'student' + default: 'student', }, club: { - default: 'Studentenclub Wu5 e.V.' + default: 'Studentenclub Wu5 e.V.', }, description: { default: - 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ' - } - } + 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. ', + }, + }, }); diff --git a/src/components/loading/CircularProgress.vue b/src/components/loading/CircularProgress.vue index 3f3f113..33b5815 100644 --- a/src/components/loading/CircularProgress.vue +++ b/src/components/loading/CircularProgress.vue @@ -18,6 +18,6 @@ diff --git a/src/components/loading/DarkCircularProgress.vue b/src/components/loading/DarkCircularProgress.vue index 6eec95d..8304601 100644 --- a/src/components/loading/DarkCircularProgress.vue +++ b/src/components/loading/DarkCircularProgress.vue @@ -18,6 +18,6 @@ diff --git a/src/components/navigation/EmptyParent.vue b/src/components/navigation/EmptyParent.vue index f9817a4..4dc75e8 100644 --- a/src/components/navigation/EmptyParent.vue +++ b/src/components/navigation/EmptyParent.vue @@ -9,6 +9,6 @@ export default defineComponent({ name: 'EmptyParent', setup() { return {}; - } + }, }); diff --git a/src/components/navigation/EssentialLink.vue b/src/components/navigation/EssentialLink.vue index bb03bf4..2065ea3 100644 --- a/src/components/navigation/EssentialLink.vue +++ b/src/components/navigation/EssentialLink.vue @@ -22,26 +22,26 @@ export default defineComponent({ props: { title: { type: String, - required: true + required: true, }, caption: { type: String, - default: '' + default: '', }, link: { type: String, - default: 'home' + default: 'home', }, icon: { type: String, - default: '' + default: '', }, permissions: { - default: undefined - } + default: undefined, + }, }, setup(props, { root }) { @@ -59,6 +59,6 @@ export default defineComponent({ const isGranted = computed(() => hasPermissions(props.permissions || [], root.$store)); return { realTitle: title, isGranted }; - } + }, }); diff --git a/src/components/navigation/ShortCutLink.vue b/src/components/navigation/ShortCutLink.vue index 1a09398..69d6de1 100644 --- a/src/components/navigation/ShortCutLink.vue +++ b/src/components/navigation/ShortCutLink.vue @@ -11,19 +11,19 @@ export default defineComponent({ props: { link: { required: true, - type: String + type: String, }, icon: { required: true, - type: String + type: String, }, permissions: { - default: undefined - } + default: undefined, + }, }, setup(props, { root }) { const isGranted = computed(() => hasPermissions(props.permissions || [], root.$store)); return { isGranted }; - } + }, }); diff --git a/src/components/utils/IsoDateInput.vue b/src/components/utils/IsoDateInput.vue index fcf2cd2..cb9da1e 100644 --- a/src/components/utils/IsoDateInput.vue +++ b/src/components/utils/IsoDateInput.vue @@ -50,21 +50,23 @@ export default defineComponent({ name: 'IsoDateInput', props: { value: { - required: true + required: true, }, label: {}, readonly: { - default: false + default: false, }, type: { default: 'date', - validator: function(value: string) { + validator: function (value: string) { return ['date', 'time', 'datetime'].indexOf(value) !== -1; - } + }, }, rules: { - default: () => { return [] } - } + default: () => { + return []; + }, + }, }, setup(props: Props, { emit }: { emit: any }) { function getDateTime() { @@ -185,7 +187,7 @@ export default defineComponent({ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment const customRules = [ props.type == 'date' ? isDate : props.type == 'time' ? isTime : isDateTime, - ...props.rules + ...props.rules, ]; return { @@ -196,8 +198,8 @@ export default defineComponent({ customRules, timeChanged, placeholder, - dateTimeChanged + dateTimeChanged, }; - } + }, }); diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss index dd1fb01..dff10be 100644 --- a/src/css/quasar.variables.scss +++ b/src/css/quasar.variables.scss @@ -12,13 +12,13 @@ // to match your app's branding. // Tip: Use the "Theme Builder" on Quasar's documentation website. -$primary : #1976D2; -$secondary : #26A69A; -$accent : #9C27B0; +$primary: #1976d2; +$secondary: #26a69a; +$accent: #9c27b0; -$dark : #1D1D1D; +$dark: #1d1d1d; -$positive : #21BA45; -$negative : #C10015; -$info : #31CCEC; -$warning : #F2C037; +$positive: #21ba45; +$negative: #c10015; +$info: #31ccec; +$warning: #f2c037; diff --git a/src/flaschengeist.d.ts b/src/flaschengeist.d.ts index b930d82..92c5fc4 100644 --- a/src/flaschengeist.d.ts +++ b/src/flaschengeist.d.ts @@ -42,27 +42,27 @@ declare namespace FG { volume?: number; cost_price_pro_volume?: number; cost_price_package_netto?: number; - tags: Array; - type: DrinkType; + tags?: Array; + type?: DrinkType; volumes: Array; } interface DrinkIngredient { id: number; volume: number; drink_ingredient_id: number; - price: number; } interface DrinkPrice { id: number; price: number; - public: bool; + public: boolean; description?: string; } interface DrinkPriceVolume { id: number; volume: number; - ingredients: Array; + min_prices: Array; prices: Array; + ingredients: Array; } interface DrinkType { id: number; @@ -75,9 +75,12 @@ declare namespace FG { } interface Ingredient { id: number; - volume_id: number; - drink_ingredient: DrinkIngredient; - extra_ingredient: ExtraIngredient; + drink_ingredient?: DrinkIngredient; + extra_ingredient?: ExtraIngredient; + } + interface MinPrices { + percentage: number; + price: number; } interface Tag { id: number; diff --git a/src/index.template.html b/src/index.template.html index aa31bff..ed23541 100644 --- a/src/index.template.html +++ b/src/index.template.html @@ -12,20 +12,10 @@ content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>" /> - + - - + + diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index b74cc1a..64cdf33 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -112,23 +112,23 @@ const links = [ name: 'about', title: 'Über Flaschengeist', link: 'about', - icon: 'mdi-information' - } + icon: 'mdi-information', + }, ]; const shortcuts = [ { link: 'about', - icon: 'mdi-information' + icon: 'mdi-information', }, { link: 'user', - icon: 'mdi-account' + icon: 'mdi-account', }, { link: 'user-plugin1', - icon: 'mdi-account-plus' - } + icon: 'mdi-account-plus', + }, ]; declare module 'vue/types/vue' { @@ -146,7 +146,7 @@ export default defineComponent({ const leftDrawerOpen = ref( computed({ get: () => (leftDrawer.value || Screen.gt.sm ? true : false), - set: (val: boolean) => (leftDrawer.value = val) + set: (val: boolean) => (leftDrawer.value = val), }) ); const leftDrawerMini = ref(false); @@ -189,8 +189,8 @@ export default defineComponent({ links, pluginChildLinks, shortcuts, - logout + logout, }; - } + }, }); diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue index 708733c..b14bbac 100644 --- a/src/layouts/OutLayout.vue +++ b/src/layouts/OutLayout.vue @@ -6,9 +6,7 @@ - - Flaschengeist - + Flaschengeist
    diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue index 4040ac7..cf1c61d 100644 --- a/src/pages/Dashboard.vue +++ b/src/pages/Dashboard.vue @@ -1,7 +1,7 @@