liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: sidebar item permissions + admin nav edit

Browse Source
This commit is contained in:
NGPixel 2020-04-18 18:25:16 -04:00 committed by Nicolas Giard
parent 9a93ac28f2
commit 8aba5305d8
14 changed files with 287 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/client-app.js
View File

@ -215,6 +215,7 @@ let bootstrap = () => {
// Load theme-specific code // Load theme-specific code
// ==================================== // ====================================
// eslint-disable-next-line no-unused-expressions
import(/* webpackChunkName: "theme-page" */ './themes/' + process.env.CURRENT_THEME + '/js/app.js') import(/* webpackChunkName: "theme-page" */ './themes/' + process.env.CURRENT_THEME + '/js/app.js')
} }

22
client/components/admin/admin-groups-edit-rules.vue
View File

@ -118,6 +118,8 @@
:items='locales' :items='locales'
v-model='rule.locales' v-model='rule.locales'
placeholder='Any Locale' placeholder='Any Locale'
item-value='code'
item-text='name'
multiple multiple
hide-details hide-details
height='48px' height='48px'
@ -126,7 +128,7 @@
style='flex: 0 1 150px;' style='flex: 0 1 150px;'
) )
template(slot='selection', slot-scope='{ item, index }') template(slot='selection', slot-scope='{ item, index }')
v-chip.white--text.ml-0(v-if='rule.locales.length === 1', small, label, :color='rule.deny ? `red` : `green`').caption {{ item.value.toUpperCase() }} v-chip.white--text.ml-0(v-if='rule.locales.length === 1', small, label, :color='rule.deny ? `red` : `green`').caption {{ item.code.toUpperCase() }}
v-chip.white--text.ml-0(v-else-if='index === 0', small, label, :color='rule.deny ? `red` : `green`').caption {{ rule.locales.length }} locales v-chip.white--text.ml-0(v-else-if='index === 0', small, label, :color='rule.deny ? `red` : `green`').caption {{ rule.locales.length }} locales
v-list-item(slot='prepend-item', @click='rule.locales = []') v-list-item(slot='prepend-item', @click='rule.locales = []')
v-list-item-action(style='min-width: 30px;') v-list-item-action(style='min-width: 30px;')
@ -149,8 +151,8 @@
) )
v-icon.mr-2(:color='rule.deny ? `red` : `green`') mdi-web v-icon.mr-2(:color='rule.deny ? `red` : `green`') mdi-web
v-list-item-content v-list-item-content
v-list-item-title.body-2 {{props.item.text}} v-list-item-title.body-2 {{props.item.name}}
v-chip.mr-2.grey--text(label, small, :color='$vuetify.theme.dark ? `grey darken-4` : `grey lighten-4`').caption {{props.item.value.toUpperCase()}} v-chip.mr-2.grey--text(label, small, :color='$vuetify.theme.dark ? `grey darken-4` : `grey lighten-4`').caption {{props.item.code.toUpperCase()}}
//- Path //- Path
v-text-field( v-text-field(
@ -197,6 +199,8 @@
import _ from 'lodash' import _ from 'lodash'
import { customAlphabet } from 'nanoid/non-secure' import { customAlphabet } from 'nanoid/non-secure'
/* global siteLangs */
const nanoid = customAlphabet('1234567890abcdef', 10) const nanoid = customAlphabet('1234567890abcdef', 10)
export default { export default {
@ -209,10 +213,10 @@ export default {
data() { data() {
return { return {
roles: [ roles: [
{ text: 'Read Pages', value: 'read:pages', icon: 'mdi-file-document-box-search-outline' }, { text: 'Read Pages', value: 'read:pages', icon: 'mdi-file-eye-outline' },
{ text: 'Create Pages', value: 'write:pages', icon: 'mdi-file-document-box-plus-outline' }, { text: 'Create Pages', value: 'write:pages', icon: 'mdi-file-plus-outline' },
{ text: 'Edit + Move Pages', value: 'manage:pages', icon: 'mdi-file-document-edit-outline' }, { text: 'Edit + Move Pages', value: 'manage:pages', icon: 'mdi-file-document-edit-outline' },
{ text: 'Delete Pages', value: 'delete:pages', icon: 'mdi-file-document-box-remove-outline' }, { text: 'Delete Pages', value: 'delete:pages', icon: 'mdi-file-remove-outline' },
{ text: 'View Pages Source', value: 'read:source', icon: 'mdi-code-tags' }, { text: 'View Pages Source', value: 'read:source', icon: 'mdi-code-tags' },
{ text: 'View Pages History', value: 'read:history', icon: 'mdi-history' }, { text: 'View Pages History', value: 'read:history', icon: 'mdi-history' },
{ text: 'Read / Use Assets', value: 'read:assets', icon: 'mdi-image-search-outline' }, { text: 'Read / Use Assets', value: 'read:assets', icon: 'mdi-image-search-outline' },
@ -228,9 +232,6 @@ export default {
{ text: 'Path Ends With...', value: 'END', icon: '.../' }, { text: 'Path Ends With...', value: 'END', icon: '.../' },
{ text: 'Path Matches Regex...', value: 'REGEX', icon: '$.*' }, { text: 'Path Matches Regex...', value: 'REGEX', icon: '$.*' },
{ text: 'Tag Matches...', value: 'TAG', icon: 'T' } { text: 'Tag Matches...', value: 'TAG', icon: 'T' }
],
locales: [
{ text: 'English', value: 'en' }
] ]
} }
}, },
@ -238,7 +239,8 @@ export default {
group: { group: {
get() { return this.value }, get() { return this.value },
set(val) { this.$set('input', val) } set(val) { this.$set('input', val) }
} },
locales() { return siteLangs }
}, },
methods: { methods: {
addRule(group) { addRule(group) {

54
client/components/admin/admin-navigation.vue
View File

@ -69,12 +69,12 @@
item-value='code' item-value='code'
) )
v-list.py-2(dense, nav, dark, class='blue darken-2', style='border-radius: 0;') v-list.py-2(dense, nav, dark, class='blue darken-2', style='border-radius: 0;')
v-list-item(v-if='navTree.length < 1') v-list-item(v-if='currentTree.length < 1')
v-list-item-avatar(size='24'): v-icon(color='blue lighten-3') mdi-alert v-list-item-avatar(size='24'): v-icon(color='blue lighten-3') mdi-alert
v-list-item-content v-list-item-content
em.caption.blue--text.text--lighten-4 {{$t('navigation.emptyList')}} em.caption.blue--text.text--lighten-4 {{$t('navigation.emptyList')}}
draggable(v-model='navTree') draggable(v-model='currentTree')
template(v-for='navItem in navTree') template(v-for='navItem in currentTree')
v-list-item( v-list-item(
v-if='navItem.kind === "link"' v-if='navItem.kind === "link"'
:key='navItem.id' :key='navItem.id'
@ -223,7 +223,7 @@
) )
template(v-else) template(v-else)
v-toolbar(height='56', color='teal lighten-1', flat, dark) v-toolbar(height='56', color='teal lighten-1', flat, dark)
v-card-text.grey--text(v-if='navTree.length > 0') {{$t('navigation.noSelectionText')}} v-card-text.grey--text(v-if='currentTree.length > 0') {{$t('navigation.noSelectionText')}}
v-card-text.grey--text(v-else) {{$t('navigation.noItemsText')}} v-card-text.grey--text(v-else) {{$t('navigation.noItemsText')}}
page-selector(mode='select', v-model='selectPageModal', :open-handler='selectPageHandle', path='home', :locale='currentLang') page-selector(mode='select', v-model='selectPageModal', :open-handler='selectPageHandle', path='home', :locale='currentLang')
@ -247,9 +247,9 @@ export default {
data() { data() {
return { return {
selectPageModal: false, selectPageModal: false,
navTree: [], trees: [],
current: {}, current: {},
currentLang: 'en', currentLang: siteConfig.lang,
groups: [], groups: [],
config: { config: {
mode: 'NONE' mode: 'NONE'
@ -267,6 +267,33 @@ export default {
}, },
locales () { locales () {
return siteLangs return siteLangs
},
currentTree: {
get () {
return _.get(_.find(this.trees, ['locale', this.currentLang]), 'items', null) || []
},
set (val) {
const tree = _.find(this.trees, ['locale', this.currentLang])
if (tree) {
tree.items = val
} else {
this.trees = [...this.trees, {
locale: this.currentLang,
items: val
}]
}
}
}
},
watch: {
currentLang (newValue, oldValue) {
this.$nextTick(() => {
if (this.currentTree.length > 0) {
this.current = this.currentTree[0]
} else {
this.current = {}
}
})
} }
}, },
methods: { methods: {
@ -291,11 +318,11 @@ export default {
newItem.label = this.$t('navigation.untitled', { kind: this.$t(`navigation.header`) }) newItem.label = this.$t('navigation.untitled', { kind: this.$t(`navigation.header`) })
break break
} }
this.navTree.push(newItem) this.currentTree = [...this.currentTree, newItem]
this.current = newItem this.current = newItem
}, },
deleteItem(item) { deleteItem(item) {
this.navTree = _.pull(this.navTree, item) this.currentTree = _.pull(this.currentTree, item)
this.current = {} this.current = {}
}, },
selectItem(item) { selectItem(item) {
@ -326,7 +353,7 @@ export default {
} }
`, `,
variables: { variables: {
tree: this.navTree tree: this.trees
} }
}) })
if (_.get(resp, 'data.navigation.updateTree.responseResult.succeeded', false)) { if (_.get(resp, 'data.navigation.updateTree.responseResult.succeeded', false)) {
@ -344,7 +371,7 @@ export default {
this.$store.commit(`loadingStop`, 'admin-navigation-save') this.$store.commit(`loadingStop`, 'admin-navigation-save')
}, },
async refresh() { async refresh() {
await this.$apollo.queries.navTree.refetch() await this.$apollo.queries.trees.refetch()
this.current = {} this.current = {}
this.$store.commit('showNotification', { this.$store.commit('showNotification', {
message: 'Navigation has been refreshed.', message: 'Navigation has been refreshed.',
@ -353,9 +380,6 @@ export default {
}) })
} }
}, },
mounted () {
this.currentLang = siteConfig.lang
},
apollo: { apollo: {
config: { config: {
query: gql` query: gql`
@ -373,7 +397,7 @@ export default {
this.$store.commit(`loading${isLoading ? 'Start' : 'Stop'}`, 'admin-navigation-config') this.$store.commit(`loading${isLoading ? 'Start' : 'Stop'}`, 'admin-navigation-config')
} }
}, },
navTree: { trees: {
query: gql` query: gql`
{ {
navigation { navigation {
@ -386,6 +410,8 @@ export default {
icon icon
targetType targetType
target target
visibilityMode
visibilityGroups
} }
} }
} }

21
client/themes/default/components/nav-sidebar.vue
View File

@ -1,14 +1,14 @@
<template lang="pug"> <template lang="pug">
div div
.blue.darken-3.pa-3.d-flex(v-if='navMode === `MIXED`') .blue.darken-3.pa-3.d-flex(v-if='navMode === `MIXED`')
v-btn(depressed, color='blue darken-2', style='min-width:0;', href='/') v-btn(depressed, color='blue darken-2', style='min-width:0;', @click='goHome')
v-icon(size='20') mdi-home v-icon(size='20') mdi-home
v-btn.ml-3(v-if='currentMode === `custom`', depressed, color='blue darken-2', style='flex: 1 1 100%;', @click='switchMode(`browse`)') v-btn.ml-3(v-if='currentMode === `custom`', depressed, color='blue darken-2', style='flex: 1 1 100%;', @click='switchMode(`browse`)')
v-icon(left) mdi-file-tree v-icon(left) mdi-file-tree
.body-2.text-none Browse .body-2.text-none {{$t('common:sidebar.browse')}}
v-btn.ml-3(v-else-if='currentMode === `browse`', depressed, color='blue darken-2', style='flex: 1 1 100%;', @click='switchMode(`custom`)') v-btn.ml-3(v-else-if='currentMode === `browse`', depressed, color='blue darken-2', style='flex: 1 1 100%;', @click='switchMode(`custom`)')
v-icon(left) mdi-navigation v-icon(left) mdi-navigation
.body-2.text-none Main Menu .body-2.text-none {{$t('common:sidebar.mainMenu')}}
v-divider v-divider
//-> Custom Navigation //-> Custom Navigation
v-list.py-2(v-if='currentMode === `custom`', dense, :class='color', :dark='dark') v-list.py-2(v-if='currentMode === `custom`', dense, :class='color', :dark='dark')
@ -30,7 +30,7 @@
v-icon(small) mdi-folder-open v-icon(small) mdi-folder-open
v-list-item-title {{ item.title }} v-list-item-title {{ item.title }}
v-divider.mt-2 v-divider.mt-2
v-subheader.pl-4 Current Directory v-subheader.pl-4 {{$t('common:sidebar.currentDirectory')}}
template(v-for='item of currentItems') template(v-for='item of currentItems')
v-list-item(v-if='item.isFolder', :key='`childfolder-` + item.id', @click='fetchBrowseItems(item)') v-list-item(v-if='item.isFolder', :key='`childfolder-` + item.id', @click='fetchBrowseItems(item)')
v-list-item-avatar(size='24') v-list-item-avatar(size='24')
@ -47,6 +47,8 @@ import _ from 'lodash'
import gql from 'graphql-tag' import gql from 'graphql-tag'
import { get } from 'vuex-pathify' import { get } from 'vuex-pathify'
/* global siteLangs */
export default { export default {
props: { props: {
color: { color: {
@ -85,6 +87,7 @@ export default {
methods: { methods: {
switchMode (mode) { switchMode (mode) {
this.currentMode = mode this.currentMode = mode
window.localStorage.setItem('navPref', mode)
if (mode === `browse` && this.loadedCache.length < 1) { if (mode === `browse` && this.loadedCache.length < 1) {
this.loadFromCurrentPath() this.loadFromCurrentPath()
} }
@ -186,14 +189,20 @@ export default {
this.loadedCache = [curPage.parent] this.loadedCache = [curPage.parent]
this.currentItems = _.filter(items, ['parent', curPage.parent]) this.currentItems = _.filter(items, ['parent', curPage.parent])
this.$store.commit(`loadingStop`, 'browse-load') this.$store.commit(`loadingStop`, 'browse-load')
},
goHome () {
window.location.assign(siteLangs.length > 0 ? `/${this.locale}/home` : '/')
} }
}, },
mounted () { mounted () {
this.currentParent.title = `/ ${this.$t('common:sidebar.root')}`
if (this.navMode === 'TREE') { if (this.navMode === 'TREE') {
this.currentMode = 'browse' this.currentMode = 'browse'
this.loadFromCurrentPath()
} else { } else {
this.currentMode = 'custom' this.currentMode = window.localStorage.getItem('navPref') || 'custom'
}
if (this.currentMode === 'browse') {
this.loadFromCurrentPath()
} }
} }
} }

28
package.json
View File

@ -37,7 +37,7 @@
"dependencies": { "dependencies": {
"@aoberoi/passport-slack": "1.0.5", "@aoberoi/passport-slack": "1.0.5",
"@azure/storage-blob": "12.1.1", "@azure/storage-blob": "12.1.1",
"@bugsnag/js": "6.5.2", "@bugsnag/js": "7.0.0",
"@exlinc/keycloak-passport": "1.0.2", "@exlinc/keycloak-passport": "1.0.2",
"@root/csr": "0.8.1", "@root/csr": "0.8.1",
"@root/keypairs": "0.9.0", "@root/keypairs": "0.9.0",
@ -48,7 +48,7 @@
"apollo-server": "2.12.0", "apollo-server": "2.12.0",
"apollo-server-express": "2.12.0", "apollo-server-express": "2.12.0",
"auto-load": "3.0.4", "auto-load": "3.0.4",
"aws-sdk": "2.656.0", "aws-sdk": "2.658.0",
"azure-search-client": "3.1.5", "azure-search-client": "3.1.5",
"bcryptjs-then": "1.0.1", "bcryptjs-then": "1.0.1",
"bluebird": "3.7.2", "bluebird": "3.7.2",
@ -72,7 +72,7 @@
"emoji-regex": "9.0.0", "emoji-regex": "9.0.0",
"express": "4.17.1", "express": "4.17.1",
"express-brute": "1.0.1", "express-brute": "1.0.1",
"express-session": "1.17.0", "express-session": "1.17.1",
"file-type": "14.1.4", "file-type": "14.1.4",
"filesize": "6.1.0", "filesize": "6.1.0",
"fs-extra": "9.0.0", "fs-extra": "9.0.0",
@ -84,7 +84,7 @@
"graphql-tools": "4.0.7", "graphql-tools": "4.0.7",
"he": "1.2.0", "he": "1.2.0",
"highlight.js": "9.18.1", "highlight.js": "9.18.1",
"i18next": "19.4.1", "i18next": "19.4.2",
"i18next-express-middleware": "1.9.1", "i18next-express-middleware": "1.9.1",
"i18next-node-fs-backend": "2.1.3", "i18next-node-fs-backend": "2.1.3",
"image-size": "0.8.3", "image-size": "0.8.3",
@ -94,7 +94,7 @@
"jsonwebtoken": "8.5.1", "jsonwebtoken": "8.5.1",
"katex": "0.11.1", "katex": "0.11.1",
"klaw": "3.0.0", "klaw": "3.0.0",
"knex": "0.20.13", "knex": "0.20.15",
"lodash": "4.17.15", "lodash": "4.17.15",
"markdown-it": "10.0.0", "markdown-it": "10.0.0",
"markdown-it-abbr": "1.0.4", "markdown-it-abbr": "1.0.4",
@ -113,7 +113,7 @@
"mime-types": "2.1.26", "mime-types": "2.1.26",
"moment": "2.24.0", "moment": "2.24.0",
"moment-timezone": "0.5.28", "moment-timezone": "0.5.28",
"mongodb": "3.5.5", "mongodb": "3.5.6",
"ms": "2.1.2", "ms": "2.1.2",
"mssql": "6.2.0", "mssql": "6.2.0",
"multer": "1.4.2", "multer": "1.4.2",
@ -157,7 +157,7 @@
"safe-regex": "2.1.1", "safe-regex": "2.1.1",
"sanitize-filename": "1.6.3", "sanitize-filename": "1.6.3",
"scim-query-filter-parser": "2.0.4", "scim-query-filter-parser": "2.0.4",
"semver": "7.2.2", "semver": "7.3.2",
"serve-favicon": "2.5.0", "serve-favicon": "2.5.0",
"simple-git": "1.132.0", "simple-git": "1.132.0",
"solr-node": "1.2.1", "solr-node": "1.2.1",
@ -189,7 +189,7 @@
"@babel/plugin-syntax-import-meta": "^7.8.3", "@babel/plugin-syntax-import-meta": "^7.8.3",
"@babel/polyfill": "^7.8.7", "@babel/polyfill": "^7.8.7",
"@babel/preset-env": "^7.9.5", "@babel/preset-env": "^7.9.5",
"@mdi/font": "5.0.45", "@mdi/font": "5.1.45",
"@panter/vue-i18next": "0.15.2", "@panter/vue-i18next": "0.15.2",
"@requarks/ckeditor5": "12.4.0-wiki.16", "@requarks/ckeditor5": "12.4.0-wiki.16",
"@vue/babel-preset-app": "4.3.1", "@vue/babel-preset-app": "4.3.1",
@ -234,7 +234,7 @@
"eslint-plugin-vue": "6.2.2", "eslint-plugin-vue": "6.2.2",
"fibers": "4.0.2", "fibers": "4.0.2",
"file-loader": "6.0.0", "file-loader": "6.0.0",
"filepond": "4.13.1", "filepond": "4.13.4",
"filepond-plugin-file-validate-type": "1.2.5", "filepond-plugin-file-validate-type": "1.2.5",
"filesize.js": "2.0.0", "filesize.js": "2.0.0",
"graphql-persisted-document-loader": "2.0.0", "graphql-persisted-document-loader": "2.0.0",
@ -264,14 +264,14 @@
"pug-lint": "2.6.0", "pug-lint": "2.6.0",
"pug-loader": "2.4.0", "pug-loader": "2.4.0",
"pug-plain-loader": "1.0.0", "pug-plain-loader": "1.0.0",
"raw-loader": "4.0.0", "raw-loader": "4.0.1",
"resolve-url-loader": "3.1.1", "resolve-url-loader": "3.1.1",
"sass": "1.26.3", "sass": "1.26.3",
"sass-loader": "8.0.2", "sass-loader": "8.0.2",
"sass-resources-loader": "2.0.1", "sass-resources-loader": "2.0.3",
"script-ext-html-webpack-plugin": "2.1.4", "script-ext-html-webpack-plugin": "2.1.4",
"simple-progress-webpack-plugin": "1.1.2", "simple-progress-webpack-plugin": "1.1.2",
"style-loader": "1.1.3", "style-loader": "1.1.4",
"terser": "4.6.11", "terser": "4.6.11",
"twemoji-awesome": "1.0.6", "twemoji-awesome": "1.0.6",
"url-loader": "4.1.0", "url-loader": "4.1.0",
@ -291,13 +291,13 @@
"vue2-animate": "2.1.3", "vue2-animate": "2.1.3",
"vuedraggable": "2.23.2", "vuedraggable": "2.23.2",
"vuescroll": "4.15.0", "vuescroll": "4.15.0",
"vuetify": "2.2.21", "vuetify": "2.2.22",
"vuetify-loader": "1.4.3", "vuetify-loader": "1.4.3",
"vuex": "3.1.3", "vuex": "3.1.3",
"vuex-pathify": "1.4.1", "vuex-pathify": "1.4.1",
"vuex-persistedstate": "3.0.1", "vuex-persistedstate": "3.0.1",
"webpack": "4.42.1", "webpack": "4.42.1",
"webpack-bundle-analyzer": "3.6.1", "webpack-bundle-analyzer": "3.7.0",
"webpack-cli": "3.3.11", "webpack-cli": "3.3.11",
"webpack-dev-middleware": "3.7.2", "webpack-dev-middleware": "3.7.2",
"webpack-hot-middleware": "2.25.0", "webpack-hot-middleware": "2.25.0",

2
server/controllers/auth.js
View File

@ -25,7 +25,7 @@ const bruteforce = new ExpressBrute(new BruteKnex({
router.get('/login', async (req, res, next) => { router.get('/login', async (req, res, next) => {
_.set(res.locals, 'pageMeta.title', 'Login') _.set(res.locals, 'pageMeta.title', 'Login')
if (req.query.legacy || req.get('user-agent').indexOf('Trident') >= 0) { if (req.query.legacy || (req.get('user-agent') && req.get('user-agent').indexOf('Trident') >= 0)) {
const { formStrategies, socialStrategies } = await WIKI.models.authentication.getStrategiesForLegacyClient() const { formStrategies, socialStrategies } = await WIKI.models.authentication.getStrategiesForLegacyClient()
res.render('legacy/login', { res.render('legacy/login', {
err: false, err: false,

2
server/controllers/common.js
View File

@ -395,7 +395,7 @@ router.get('/*', async (req, res, next) => {
if (page) { if (page) {
_.set(res.locals, 'pageMeta.title', page.title) _.set(res.locals, 'pageMeta.title', page.title)
_.set(res.locals, 'pageMeta.description', page.description) _.set(res.locals, 'pageMeta.description', page.description)
const sidebar = await WIKI.models.navigation.getTree({ cache: true, locale: pageArgs.locale }) const sidebar = await WIKI.models.navigation.getTree({ cache: true, locale: pageArgs.locale, groups: req.user.groups })
const injectCode = { const injectCode = {
css: WIKI.config.theming.injectCSS, css: WIKI.config.theming.injectCSS,
head: WIKI.config.theming.injectHead, head: WIKI.config.theming.injectHead,

1
server/core/db.js
View File

@ -105,6 +105,7 @@ module.exports = {
connection: dbConfig, connection: dbConfig,
pool: { pool: {
...WIKI.config.pool, ...WIKI.config.pool,
propagateCreateError: false,
async afterCreate(conn, done) { async afterCreate(conn, done) {
// -> Set Connection App Name // -> Set Connection App Name
switch (WIKI.config.db.type) { switch (WIKI.config.db.type) {

15
server/core/telemetry.js
View File

@ -1,6 +1,6 @@
const _ = require('lodash') const _ = require('lodash')
const { createApolloFetch } = require('apollo-fetch') const { createApolloFetch } = require('apollo-fetch')
const bugsnag = require('@bugsnag/node') const Bugsnag = require('@bugsnag/js')
const { v4: uuid } = require('uuid') const { v4: uuid } = require('uuid')
const os = require('os') const os = require('os')
const fs = require('fs-extra') const fs = require('fs-extra')
@ -8,21 +8,20 @@ const fs = require('fs-extra')
/* global WIKI */ /* global WIKI */
module.exports = { module.exports = {
client: null,
enabled: false, enabled: false,
init() { init() {
this.client = bugsnag({ Bugsnag.start({
apiKey: WIKI.data.telemetry.BUGSNAG_ID, apiKey: WIKI.data.telemetry.BUGSNAG_ID,
appType: 'server', appType: 'server',
appVersion: WIKI.version, appVersion: WIKI.version,
autoNotify: false, autoDetectErrors: false,
collectUserIp: false, autoTrackSessions: false,
hostname: _.get(WIKI.config, 'telemetry.clientId', uuid()), hostname: _.get(WIKI.config, 'telemetry.clientId', uuid()),
notifyReleaseStages: ['production'], enabledReleaseStages: ['production'],
releaseStage: WIKI.IS_DEBUG ? 'development' : 'production', releaseStage: WIKI.IS_DEBUG ? 'development' : 'production',
projectRoot: WIKI.ROOTPATH, projectRoot: WIKI.ROOTPATH,
logger: null, logger: null,
beforeSend: (report) => { onError: (report) => {
if (!WIKI.telemetry.enabled) { return false } if (!WIKI.telemetry.enabled) { return false }
} }
}) })
@ -34,7 +33,7 @@ module.exports = {
} }
}, },
sendError(err) { sendError(err) {
this.client.notify(err) Bugsnag.notify(err)
}, },
sendEvent(eventCategory, eventAction, eventLabel) { sendEvent(eventCategory, eventAction, eventLabel) {
// TODO // TODO

6
server/graph/resolvers/navigation.js
View File

@ -11,7 +11,7 @@ module.exports = {
}, },
NavigationQuery: { NavigationQuery: {
async tree (obj, args, context, info) { async tree (obj, args, context, info) {
return WIKI.models.navigation.getTree({ cache: false, locale: 'all' }) return WIKI.models.navigation.getTree({ cache: false, locale: 'all', bypassAuth: true })
}, },
config (obj, args, context, info) { config (obj, args, context, info) {
return WIKI.config.nav return WIKI.config.nav
@ -23,7 +23,9 @@ module.exports = {
await WIKI.models.navigation.query().patch({ await WIKI.models.navigation.query().patch({
config: args.tree config: args.tree
}).where('key', 'site') }).where('key', 'site')
await WIKI.cache.set('nav:sidebar', args.tree, 300) for (const tree of args.tree) {
await WIKI.cache.set(`nav:sidebar:${tree.locale}`, tree.items, 300)
}
return { return {
responseResult: graphHelper.generateSuccess('Navigation updated successfully') responseResult: graphHelper.generateSuccess('Navigation updated successfully')

4
server/graph/schemas/navigation.graphql
View File

@ -53,6 +53,8 @@ type NavigationItem {
icon: String icon: String
targetType: String targetType: String
target: String target: String
visibilityMode: String
visibilityGroups: [Int]
} }
input NavigationItemInput { input NavigationItemInput {
@ -62,6 +64,8 @@ input NavigationItemInput {
icon: String icon: String
targetType: String targetType: String
target: String target: String
visibilityMode: String
visibilityGroups: [Int]
} }
type NavigationConfig { type NavigationConfig {

26
server/models/navigation.js
View File

@ -22,20 +22,24 @@ module.exports = class Navigation extends Model {
} }
} }
static async getTree({ cache = false, locale = 'en' } = {}) { static async getTree({ cache = false, locale = 'en', groups = [], bypassAuth = false } = {}) {
if (cache) { if (cache) {
const navTreeCached = await WIKI.cache.get(`nav:sidebar:${locale}`) const navTreeCached = await WIKI.cache.get(`nav:sidebar:${locale}`)
if (navTreeCached) { if (navTreeCached) {
return navTreeCached return bypassAuth ? navTreeCached : WIKI.models.navigation.getAuthorizedItems(navTreeCached, groups)
} }
} }
const navTree = await WIKI.models.navigation.query().findOne('key', 'site') const navTree = await WIKI.models.navigation.query().findOne('key', `site`)
if (navTree) { if (navTree) {
// Check for pre-2.1 format // Check for pre-2.3 format
if (_.has(navTree.config[0], 'kind')) { if (_.has(navTree.config[0], 'kind')) {
navTree.config = [{ navTree.config = [{
locale: 'en', locale: 'en',
items: navTree.config items: navTree.config.map(item => ({
...item,
visibilityMode: 'all',
visibilityGroups: []
}))
}] }]
} }
@ -44,10 +48,20 @@ module.exports = class Navigation extends Model {
await WIKI.cache.set(`nav:sidebar:${tree.locale}`, tree.items, 300) await WIKI.cache.set(`nav:sidebar:${tree.locale}`, tree.items, 300)
} }
} }
return locale === 'all' ? navTree.config : WIKI.cache.get(`nav:sidebar:${locale}`) if (bypassAuth) {
return locale === 'all' ? navTree.config : WIKI.cache.get(`nav:sidebar:${locale}`)
} else {
return locale === 'all' ? WIKI.models.navigation.getAuthorizedItems(navTree.config, groups) : WIKI.models.navigation.getAuthorizedItems(WIKI.cache.get(`nav:sidebar:${locale}`), groups)
}
} else { } else {
WIKI.logger.warn('Site Navigation is missing or corrupted.') WIKI.logger.warn('Site Navigation is missing or corrupted.')
return [] return []
} }
} }
static getAuthorizedItems(tree = [], groups = []) {
return _.filter(tree, leaf => {
return leaf.visibilityMode === 'all' || _.intersection(leaf.visibilityGroups, groups).length > 0
})
}
} }

17
server/setup.js
View File

@ -315,12 +315,17 @@ module.exports = () => {
key: 'site', key: 'site',
config: [ config: [
{ {
id: uuid(), locale: 'en',
icon: 'mdi-home', items: [
kind: 'link', {
label: 'Home', id: uuid(),
target: '/', icon: 'mdi-home',
targetType: 'home' kind: 'link',
label: 'Home',
target: '/',
targetType: 'home'
}
]
} }
] ]
}) })

340
yarn.lock
View File

@ -290,7 +290,7 @@
events "^3.0.0" events "^3.0.0"
tslib "^1.10.0" tslib "^1.10.0"
"@babel/cli@^7.8.4": "@babel/cli@^7.4.4", "@babel/cli@^7.8.4":
version "7.8.4" version "7.8.4"
resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.8.4.tgz#505fb053721a98777b2b175323ea4f090b7d3c1c" resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.8.4.tgz#505fb053721a98777b2b175323ea4f090b7d3c1c"
integrity sha512-XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag== integrity sha512-XXLgAm6LBbaNxaGhMAznXXaxtCWfuv6PIDJ9Alsy9JYTOh+j2jJz+L/162kkfU1j/pTSxK1xGmlwI4pdIMkoag==
@ -1375,6 +1375,72 @@
core-js "^2.6.5" core-js "^2.6.5"
regenerator-runtime "^0.13.4" regenerator-runtime "^0.13.4"
"@babel/preset-env@^7.4.5", "@babel/preset-env@^7.9.5":
version "7.9.5"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f"
integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==
dependencies:
"@babel/compat-data" "^7.9.0"
"@babel/helper-compilation-targets" "^7.8.7"
"@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.5"
"@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.0"
"@babel/plugin-transform-modules-commonjs" "^7.9.0"
"@babel/plugin-transform-modules-systemjs" "^7.9.0"
"@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.5"
browserslist "^4.9.1"
core-js-compat "^3.6.2"
invariant "^2.2.2"
levenary "^1.1.1"
semver "^5.5.0"
"@babel/preset-env@^7.9.0": "@babel/preset-env@^7.9.0":
version "7.9.0" version "7.9.0"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8" resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.0.tgz#a5fc42480e950ae8f5d9f8f2bbc03f52722df3a8"
@ -1441,72 +1507,6 @@
levenary "^1.1.1" levenary "^1.1.1"
semver "^5.5.0" semver "^5.5.0"
"@babel/preset-env@^7.9.5":
version "7.9.5"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.9.5.tgz#8ddc76039bc45b774b19e2fc548f6807d8a8919f"
integrity sha512-eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ==
dependencies:
"@babel/compat-data" "^7.9.0"
"@babel/helper-compilation-targets" "^7.8.7"
"@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.5"
"@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.0"
"@babel/plugin-transform-modules-commonjs" "^7.9.0"
"@babel/plugin-transform-modules-systemjs" "^7.9.0"
"@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.5"
browserslist "^4.9.1"
core-js-compat "^3.6.2"
invariant "^2.2.2"
levenary "^1.1.1"
semver "^5.5.0"
"@babel/preset-modules@^0.1.3": "@babel/preset-modules@^0.1.3":
version "0.1.3" version "0.1.3"
resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72" resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
@ -1714,23 +1714,23 @@
resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz#8ff71d51053cd5ee4981e5a501d80a536244f7fd" resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz#8ff71d51053cd5ee4981e5a501d80a536244f7fd"
integrity sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg== integrity sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg==
"@bugsnag/browser@^6.5.2": "@bugsnag/browser@^7.0.0":
version "6.5.2" version "7.0.0"
resolved "https://registry.yarnpkg.com/@bugsnag/browser/-/browser-6.5.2.tgz#3f8f911dd739d2ace056fd5a38d5d25283ca4bfc" resolved "https://registry.yarnpkg.com/@bugsnag/browser/-/browser-7.0.0.tgz#c0897815fcd440d3556c0586ac5d1a60db341cef"
integrity sha512-XFKKorJc92ivLnlHHhLiPvkP03tZ5y7n0Z2xO6lOU7t+jWF5YapgwqQAda/TWvyYO38B/baWdnOpWMB3QmjhkA== integrity sha512-EElLeBuWNRCRsLibyvYZaVJUdseNiRLP8UBp6vBr6tsug3MEtKfQgG4kkA+NIfZnStC10tzPfThJz2o76Qbj+Q==
"@bugsnag/js@6.5.2": "@bugsnag/js@7.0.0":
version "6.5.2" version "7.0.0"
resolved "https://registry.yarnpkg.com/@bugsnag/js/-/js-6.5.2.tgz#810383aa7a2246639041bb9031ab316432959527" resolved "https://registry.yarnpkg.com/@bugsnag/js/-/js-7.0.0.tgz#fe9ce205b9f571df1a31ccc7a713ccfe87947e86"
integrity sha512-4ibw624fM5+Y/WSuo3T/MsJVtslsPV8X0MxFuRxdvpKVUXX216d8hN8E/bG4hr7aipqQOGhBYDqSzeL2wgmh0Q== integrity sha512-gwDCsYL8ROh3ZdQxsoHgFG6LiGzZ3SbXrC1P7pQIl3SDxBH4SQSBFIPMgrHxPG+8xZJPaC+08eFCA4dKkywMwQ==
dependencies: dependencies:
"@bugsnag/browser" "^6.5.2" "@bugsnag/browser" "^7.0.0"
"@bugsnag/node" "^6.5.2" "@bugsnag/node" "^7.0.0"
"@bugsnag/node@^6.5.2": "@bugsnag/node@^7.0.0":
version "6.5.2" version "7.0.0"
resolved "https://registry.yarnpkg.com/@bugsnag/node/-/node-6.5.2.tgz#7bc2d0d1c7a682784be388404ab728a80b7ae2b9" resolved "https://registry.yarnpkg.com/@bugsnag/node/-/node-7.0.0.tgz#99102cf4092c27aae5ed0b771293f5089540ebc6"
integrity sha512-KQ1twKoOttMCYsHv7OXUVsommVcrk6RGQ5YoZGlTbREhccbzsvjbiXPKiY31Qc7OXKvaJwSXhnOKrQTpRleFUg== integrity sha512-YmedKskqv9yfxf3FH8P8UPQncyg0YCWbhcvPVAIw/g/Bbl/5EJjMjcFt5TNZWg94p1IRnXyll5vBL+KErCvOVA==
dependencies: dependencies:
byline "^5.0.0" byline "^5.0.0"
error-stack-parser "^2.0.2" error-stack-parser "^2.0.2"
@ -1941,10 +1941,10 @@
resolved "https://registry.yarnpkg.com/@log4js-node/log4js-api/-/log4js-api-1.0.2.tgz#7a8143fb33f077df3e579dca7f18fea74a02ec8b" resolved "https://registry.yarnpkg.com/@log4js-node/log4js-api/-/log4js-api-1.0.2.tgz#7a8143fb33f077df3e579dca7f18fea74a02ec8b"
integrity sha512-6SJfx949YEWooh/CUPpJ+F491y4BYJmknz4hUN1+RHvKoUEynKbRmhnwbk/VLmh4OthLLDNCyWXfbh4DG1cTXA== integrity sha512-6SJfx949YEWooh/CUPpJ+F491y4BYJmknz4hUN1+RHvKoUEynKbRmhnwbk/VLmh4OthLLDNCyWXfbh4DG1cTXA==
"@mdi/font@5.0.45": "@mdi/font@5.1.45":
version "5.0.45" version "5.1.45"
resolved "https://registry.yarnpkg.com/@mdi/font/-/font-5.0.45.tgz#8eda40c41dc7ee9e7a51dbe9191c5c38b8482422" resolved "https://registry.yarnpkg.com/@mdi/font/-/font-5.1.45.tgz#58edff65985cc5a350eb95ff2974273a285ea9ad"
integrity sha512-3sOO/UMyQqrmizW5zjvhKJP4FZFO7LblRw4G0alDxK1ekUwNxNXI7hYv8ACAv8H44riBuqlVJ7u39XDqv/Xwuw== integrity sha512-7H1UMwUpEp8mthdPlpAi7bhEyvTbvtK1TlA89scc0cXMpQy0UFygdkaf+6fveIxpBcRNgw0gnGSEonlsfYocXg==
"@opencensus/web-types@0.0.7": "@opencensus/web-types@0.0.7":
version "0.0.7" version "0.0.7"
@ -3037,11 +3037,6 @@ ansi-regex@^5.0.0:
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
ansi-styles@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
ansi-styles@^3.2.0, ansi-styles@^3.2.1: ansi-styles@^3.2.0, ansi-styles@^3.2.1:
version "3.2.1" version "3.2.1"
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@ -3630,13 +3625,18 @@ async@>=0.6.0:
resolved "https://registry.yarnpkg.com/async/-/async-3.1.0.tgz#42b3b12ae1b74927b5217d8c0016baaf62463772" resolved "https://registry.yarnpkg.com/async/-/async-3.1.0.tgz#42b3b12ae1b74927b5217d8c0016baaf62463772"
integrity sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ== integrity sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==
async@^2.1.4, async@^2.6.1: async@^2.6.1:
version "2.6.3" version "2.6.3"
resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff" resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg== integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
dependencies: dependencies:
lodash "^4.17.14" lodash "^4.17.14"
async@^3.0.1:
version "3.2.0"
resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720"
integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==
async@^3.1.0: async@^3.1.0:
version "3.1.1" version "3.1.1"
resolved "https://registry.yarnpkg.com/async/-/async-3.1.1.tgz#dd3542db03de837979c9ebbca64ca01b06dc98df" resolved "https://registry.yarnpkg.com/async/-/async-3.1.1.tgz#dd3542db03de837979c9ebbca64ca01b06dc98df"
@ -3700,10 +3700,10 @@ autoprefixer@^9.6.1:
postcss "^7.0.17" postcss "^7.0.17"
postcss-value-parser "^4.0.0" postcss-value-parser "^4.0.0"
aws-sdk@2.656.0: aws-sdk@2.658.0:
version "2.656.0" version "2.658.0"
resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.656.0.tgz#0d74664ddbf30701073be9f9913ee7266afef3b4" resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.658.0.tgz#dd0b1225d2b42eebdf9c4347a9568f317c0b90b1"
integrity sha512-UzqDvvt6i7gpuzEdK0GT/JOfBJcsCPranzZWdQ9HR4+5E0m5kf5gybZ6OX+UseIAE2/WND6Dv0aHgiI21AKenw== integrity sha512-vb+CorOG2lod4ZztrVaE3hcSjTwnB9HhTOnD/2R9YJtIUGTJqL0CIDTwo0Q384GFROtDhp7j6SX7oKFwdzDEuA==
dependencies: dependencies:
buffer "4.9.1" buffer "4.9.1"
events "1.1.1" events "1.1.1"
@ -3749,7 +3749,7 @@ azure-search-types@^1.0.10:
dependencies: dependencies:
"@types/geojson" "^7946.0.4" "@types/geojson" "^7946.0.4"
babel-eslint@10.1.0: babel-eslint@10.1.0, babel-eslint@^10.0.2:
version "10.1.0" version "10.1.0"
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232" resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg== integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
@ -4235,10 +4235,10 @@ bser@^2.0.0:
dependencies: dependencies:
node-int64 "^0.4.0" node-int64 "^0.4.0"
bson@^1.1.1: bson@^1.1.4:
version "1.1.1" version "1.1.4"
resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.1.tgz#4330f5e99104c4e751e7351859e2d408279f2f13" resolved "https://registry.yarnpkg.com/bson/-/bson-1.1.4.tgz#f76870d799f15b854dffb7ee32f0a874797f7e89"
integrity sha512-jCGVYLoYMHDkOsbwJZBCqwMHyH4c+wzgI9hG7Z6SZJRXWr+x58pdIbm2i9a/jFGCkRJqRUr8eoI7lDWa0hTkxg== integrity sha512-S/yKGU1syOMzO86+dGpg2qGoDL0zvzcb262G+gqEy6TgP6rt6z6qxSFX/8X6vLC91P7G7C3nLs0+bvDzmvBA3Q==
buffer-equal-constant-time@1.0.1: buffer-equal-constant-time@1.0.1:
version "1.0.1" version "1.0.1"
@ -4539,17 +4539,6 @@ chalk@4.0.0:
ansi-styles "^4.1.0" ansi-styles "^4.1.0"
supports-color "^7.1.0" supports-color "^7.1.0"
chalk@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
dependencies:
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"
chalk@^3.0.0: chalk@^3.0.0:
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
@ -6625,7 +6614,7 @@ escape-html@^1.0.3, escape-html@~1.0.3:
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: escape-string-regexp@^1.0.5:
version "1.0.5" version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@ -6975,10 +6964,10 @@ express-brute@1.0.1, express-brute@^1.0.1:
long-timeout "~0.1.1" long-timeout "~0.1.1"
underscore "~1.8.3" underscore "~1.8.3"
express-session@1.17.0: express-session@1.17.1:
version "1.17.0" version "1.17.1"
resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.0.tgz#9b50dbb5e8a03c3537368138f072736150b7f9b3" resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.1.tgz#36ecbc7034566d38c8509885c044d461c11bf357"
integrity sha512-t4oX2z7uoSqATbMfsxWMbNjAL0T5zpvcJCk3Z9wnPPN7ibddhnmDZXHfEcoBMG2ojKXZoCyPMc5FbtK+G7SoDg== integrity sha512-UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q==
dependencies: dependencies:
cookie "0.4.0" cookie "0.4.0"
cookie-signature "1.0.6" cookie-signature "1.0.6"
@ -7176,10 +7165,10 @@ filepond-plugin-file-validate-type@1.2.5:
resolved "https://registry.yarnpkg.com/filepond-plugin-file-validate-type/-/filepond-plugin-file-validate-type-1.2.5.tgz#b3588088d2b0d5dbdf706d068c0ecdf28140a8e3" resolved "https://registry.yarnpkg.com/filepond-plugin-file-validate-type/-/filepond-plugin-file-validate-type-1.2.5.tgz#b3588088d2b0d5dbdf706d068c0ecdf28140a8e3"
integrity sha512-SsdYD6N+PDnetrPrBHfl13ZC9jRv5BuGdai5cORfANhuE/N32OwU/IclCNQ4qlpIa88hzqBg9dj6IINkiW+4HA== integrity sha512-SsdYD6N+PDnetrPrBHfl13ZC9jRv5BuGdai5cORfANhuE/N32OwU/IclCNQ4qlpIa88hzqBg9dj6IINkiW+4HA==
filepond@4.13.1: filepond@4.13.4:
version "4.13.1" version "4.13.4"
resolved "https://registry.yarnpkg.com/filepond/-/filepond-4.13.1.tgz#be3ebb9b55d2d0e812ead3f7c849182c1c0d351b" resolved "https://registry.yarnpkg.com/filepond/-/filepond-4.13.4.tgz#6b44dbbac8c5b5ce9515a28f776f2e9a19357c01"
integrity sha512-ReduH/kiYIB9pma9jZdvaWudVx68Sj3MdtzAGQGKUpMyfVeVtYGQvK0TJ8cugvfAcXBa+4CSAQDz89F/j3ZU0A== integrity sha512-nmS7n89Y7FbP6mIYHVzr3kxuqym15n6o/I/zUKomanWM+3zCg6uIr+mJ5yDUDa7fXoiHBXMKea3Ku2l1zcGCJg==
filesize.js@2.0.0: filesize.js@2.0.0:
version "2.0.0" version "2.0.0"
@ -7859,13 +7848,6 @@ har-validator@~5.1.0, har-validator@~5.1.3:
ajv "^6.5.5" ajv "^6.5.5"
har-schema "^2.0.0" har-schema "^2.0.0"
has-ansi@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
dependencies:
ansi-regex "^2.0.0"
has-flag@^3.0.0: has-flag@^3.0.0:
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@ -8176,10 +8158,10 @@ i18next-xhr-backend@3.2.2:
dependencies: dependencies:
"@babel/runtime" "^7.5.5" "@babel/runtime" "^7.5.5"
i18next@19.4.1: i18next@19.4.2:
version "19.4.1" version "19.4.2"
resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.4.1.tgz#4929d15d3d01e4712350a368d005cefa50ff5455" resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.4.2.tgz#5be6ebbef9cfa44a2691ab47b8ccd8cf7179cff5"
integrity sha512-dC3ue15jkLebN2je4xEjfjVYd/fSAo+UVK9f+JxvceCJRowkI+S0lGohgKejqU+FYLfvw9IAPylIIEWwR8Djrg== integrity sha512-gDctWhIgACc92Uub7vb0GTdtLKZTgiDIiBkGExOSPgqhCSyyPOb8svLxixzzSS3yMjC3fduK/BbkRt95JHwvDw==
dependencies: dependencies:
"@babel/runtime" "^7.3.1" "@babel/runtime" "^7.3.1"
@ -9523,10 +9505,10 @@ kleur@^3.0.3:
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
knex@0.20.13: knex@0.20.15:
version "0.20.13" version "0.20.15"
resolved "https://registry.yarnpkg.com/knex/-/knex-0.20.13.tgz#056c310d963f7efce1b3c7397576add1323f1146" resolved "https://registry.yarnpkg.com/knex/-/knex-0.20.15.tgz#b7e9e1efd9cf35d214440d9439ed21153574679d"
integrity sha512-YVl//Te0G5suc+d9KyeI6WuhtgVlxu6HXYQB+WqrccFkSZAbHqlqZlUMogYG3UoVq69c3kiFbbxgUNkrO0PVfg== integrity sha512-WHmvgfQfxA5v8pyb9zbskxCS1L1WmYgUbwBhHojlkmdouUOazvroUWlCr6KIKMQ8anXZh1NXOOtIUMnxENZG5Q==
dependencies: dependencies:
colorette "1.1.0" colorette "1.1.0"
commander "^4.1.1" commander "^4.1.1"
@ -10430,13 +10412,13 @@ moment@2.24.0, "moment@>= 2.9.0", moment@^2.10.2, moment@^2.10.6, moment@^2.19.2
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
mongodb@3.5.5: mongodb@3.5.6:
version "3.5.5" version "3.5.6"
resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.5.5.tgz#1334c3e5a384469ac7ef0dea69d59acc829a496a" resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-3.5.6.tgz#a1be2d9796c8a8a5b0e6bcbc6baaaa406bd5c0d5"
integrity sha512-GCjDxR3UOltDq00Zcpzql6dQo1sVry60OXJY3TDmFc2SWFY6c8Gn1Ardidc5jDirvJrx2GC3knGOImKphbSL3A== integrity sha512-sh3q3GLDLT4QmoDLamxtAECwC3RGjq+oNuK1ENV8+tnipIavss6sMYt77hpygqlMOCt0Sla5cl7H4SKCVBCGEg==
dependencies: dependencies:
bl "^2.2.0" bl "^2.2.0"
bson "^1.1.1" bson "^1.1.4"
denque "^1.4.1" denque "^1.4.1"
require_optional "^1.0.1" require_optional "^1.0.1"
safe-buffer "^5.1.2" safe-buffer "^5.1.2"
@ -13301,13 +13283,13 @@ raw-body@2.4.0:
iconv-lite "0.4.24" iconv-lite "0.4.24"
unpipe "1.0.0" unpipe "1.0.0"
raw-loader@4.0.0: raw-loader@4.0.1:
version "4.0.0" version "4.0.1"
resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.0.tgz#d639c40fb9d72b5c7f8abc1fb2ddb25b29d3d540" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.1.tgz#14e1f726a359b68437e183d5a5b7d33a3eba6933"
integrity sha512-iINUOYvl1cGEmfoaLjnZXt4bKfT2LJnZZib5N/LLyAphC+Dd11vNP9CNVb38j+SAJpFI1uo8j9frmih53ASy7Q== integrity sha512-baolhQBSi3iNh1cglJjA0mYzga+wePk7vdEX//1dTFd+v4TsQlQE0jitJSNF1OIP82rdYulH7otaVmdlDaJ64A==
dependencies: dependencies:
loader-utils "^1.2.3" loader-utils "^2.0.0"
schema-utils "^2.5.0" schema-utils "^2.6.5"
rc@^1.2.7: rc@^1.2.7:
version "1.2.8" version "1.2.8"
@ -14066,13 +14048,16 @@ sass-loader@8.0.2:
schema-utils "^2.6.1" schema-utils "^2.6.1"
semver "^6.3.0" semver "^6.3.0"
sass-resources-loader@2.0.1: sass-resources-loader@2.0.3:
version "2.0.1" version "2.0.3"
resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.0.1.tgz#c8427f3760bf7992f24f27d3889a1c797e971d3a" resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.0.3.tgz#585636b357d9c27d02fa359c175fafe3e3d66ce4"
integrity sha512-UsjQWm01xglINC1kPidYwKOBBzOElVupm9RwtOkRlY0hPA4GKi2KFsn4BZypRD1kudaXgUnGnfbiVOE7c+ybAg== integrity sha512-kYujKXFPZvh5QUT+0DO35P93G6GeIRMP4c941Ilbvey5lo+iICFs2H4hP2CFHl68Llg7h2iXqe0RQpDoUzjUSw==
dependencies: dependencies:
async "^2.1.4" "@babel/cli" "^7.4.4"
chalk "^1.1.3" "@babel/preset-env" "^7.4.5"
async "^3.0.1"
babel-eslint "^10.0.2"
chalk "^2.4.2"
glob "^7.1.1" glob "^7.1.1"
loader-utils "^1.0.4" loader-utils "^1.0.4"
@ -14122,15 +14107,7 @@ schema-utils@^2.0.0:
ajv "^6.10.2" ajv "^6.10.2"
ajv-keywords "^3.4.1" ajv-keywords "^3.4.1"
schema-utils@^2.5.0: schema-utils@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f"
integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==
dependencies:
ajv "^6.10.2"
ajv-keywords "^3.4.1"
schema-utils@^2.6.1, schema-utils@^2.6.4:
version "2.6.4" version "2.6.4"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"
integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ== integrity sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==
@ -14194,10 +14171,10 @@ semver@7.0.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
semver@7.2.2: semver@7.3.2:
version "7.2.2" version "7.3.2"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.2.2.tgz#d01432d74ed3010a20ffaf909d63a691520521cd" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
integrity sha512-Zo84u6o2PebMSK3zjJ6Zp5wi8VnQZnEaCP13Ul/lt1ANsLACxnJxq4EEm1PY94/por1Hm9+7xpIswdS5AkieMA== integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0: semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0:
version "6.3.0" version "6.3.0"
@ -14896,13 +14873,13 @@ strtok3@^6.0.0:
debug "^4.1.1" debug "^4.1.1"
peek-readable "^3.1.0" peek-readable "^3.1.0"
style-loader@1.1.3: style-loader@1.1.4:
version "1.1.3" version "1.1.4"
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.3.tgz#9e826e69c683c4d9bf9db924f85e9abb30d5e200" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.1.4.tgz#1ad81283cefe51096756fd62697258edad933230"
integrity sha512-rlkH7X/22yuwFYK357fMN/BxYOorfnfq0eD7+vqlemSK4wEcejFF1dg4zxP0euBW8NrYx2WZzZ8PPFevr7D+Kw== integrity sha512-SbBHRD8fwK3pX+4UDF4ETxUF0+rCvk29LWTTI7Rt0cgsDjAj3SWM76ByTe6u2+4IlJ/WwluB7wuslWETCoPQdg==
dependencies: dependencies:
loader-utils "^1.2.3" loader-utils "^2.0.0"
schema-utils "^2.6.4" schema-utils "^2.6.5"
stylehacks@^4.0.0: stylehacks@^4.0.0:
version "4.0.3" version "4.0.3"
@ -14947,11 +14924,6 @@ supports-color@6.1.0, supports-color@^6.1.0:
dependencies: dependencies:
has-flag "^3.0.0" has-flag "^3.0.0"
supports-color@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
supports-color@^5.3.0, supports-color@^5.4.0: supports-color@^5.3.0, supports-color@^5.4.0:
version "5.5.0" version "5.5.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@ -15990,10 +15962,10 @@ vuetify-loader@1.4.3:
dependencies: dependencies:
loader-utils "^1.2.0" loader-utils "^1.2.0"
vuetify@2.2.21: vuetify@2.2.22:
version "2.2.21" version "2.2.22"
resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.2.21.tgz#f89d0d7e439470ab9138bca8a2034ce8e84a6e50" resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.2.22.tgz#a5bc5814a16472d719acb45d2cb5fb5605d2e12e"
integrity sha512-xUgU7Cxpm6qZd1xY3I0NsJbdEErSPgb1iT4qeGOLD8uTGyXXc3IwYEpXqb2nH577RdeT0cTNpzM/NyNf2Fmpvw== integrity sha512-3RFKqLS81xoNdDUldOCpxFhYaqiYVCMpTmovAmyPhidmqC9PaMNuM5aCKkKnOgG/xIN/0SgZg3wJfe0o72RhlQ==
vuex-pathify@1.4.1: vuex-pathify@1.4.1:
version "1.4.1" version "1.4.1"
@ -16060,10 +16032,10 @@ webidl-conversions@^4.0.2:
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
webpack-bundle-analyzer@3.6.1: webpack-bundle-analyzer@3.7.0:
version "3.6.1" version "3.7.0"
resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.1.tgz#bdb637c2304424f2fbff9a950c7be42a839ae73b" resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.7.0.tgz#84da434e89442899b884d9ad38e466d0db02a56f"
integrity sha512-Nfd8HDwfSx1xBwC+P8QMGvHAOITxNBSvu/J/mCJvOwv+G4VWkU7zir9SSenTtyCi0LnVtmsc7G5SZo1uV+bxRw== integrity sha512-mETdjZ30a3Yf+NTB/wqTgACK7rAYQl5uxKK0WVTNmF0sM3Uv8s3R58YZMW7Rhu0Lk2Rmuhdj5dcH5Q76zCDVdA==
dependencies: dependencies:
acorn "^7.1.1" acorn "^7.1.1"
acorn-walk "^7.1.1" acorn-walk "^7.1.1"