From 52f36e0483e7cb031280bdb9d9ae00feb8da3f09 Mon Sep 17 00:00:00 2001
From: mmcardle <mmcardle@users.noreply.github.com>
Date: Mon, 14 Nov 2022 20:49:51 +0000
Subject: [PATCH] Cli rendering (#170)

* WIP with dummy data

* Vite/Node loading static files

* CLI with dummy data

* Project json parsing

* Github action test

* Update Tests

* Wait for curl

* Update readme

Co-authored-by: mmcardle <m.mcardle@axial3d.com>
---
 .github/workflows/ci.yml         |   9 +
 .gitignore                       |   4 +-
 README.md                        |  22 ++
 bin/django-builder               |   4 +
 example-project.json             |  35 ++
 package.json                     |   6 +-
 script/run.sh                    |  24 ++
 src/cli.js                       | 133 +++++++
 src/components/DirectoryView.vue |   6 +-
 src/components/Project.vue       |   5 +-
 src/django/python/urls.py        |   3 +-
 src/django/rendering.js          | 330 +++++++++++-----
 src/store.js                     |   2 +-
 src/tar/index.js                 |   4 +
 yarn.lock                        | 655 +++++++++++++++----------------
 15 files changed, 797 insertions(+), 445 deletions(-)
 create mode 100755 bin/django-builder
 create mode 100644 example-project.json
 create mode 100755 script/run.sh
 create mode 100644 src/cli.js

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index baae687..1cd1c4a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,6 +41,15 @@ jobs:
       - run: yarn
       - run: yarn test:unit
  
+  cli_tests:
+    name: CLI Tests
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: yarn
+      - run: script/run.sh
+
   e2e_tests:
     name: E2E Tests
     needs: [build]
diff --git a/.gitignore b/.gitignore
index 2e6ebb7..97b13c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,4 +40,6 @@ coverage/
 # Build if changed
 .bic_cache
 
-**/.venv
\ No newline at end of file
+**/.venv
+DjangoProject/
+output.tar
\ No newline at end of file
diff --git a/README.md b/README.md
index 5206153..0cc5c2d 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,28 @@ http://mmcardle.github.io/django_builder/
 yarn install
 ```
 
+### CLI interface
+
+You can create and run a basic Django project from the command line
+
+See [example-project.json](example-project.json)
+
+```
+./bin/django-builder example-project.json DjangoProject.tar
+
+tar -xvf DjangoProject.tar
+
+cd DjangoProject
+python3 -m venv .venv
+source .venv/bin/activate
+pip install -r requirements.txt
+python manage.py makemigrations
+python manage.py migrate
+python manage.py runserver
+```
+
+Head to http://127.0.0.1:8000
+
 #### Firebase
 ```
 npm install -g firebase-tools
diff --git a/bin/django-builder b/bin/django-builder
new file mode 100755
index 0000000..329027e
--- /dev/null
+++ b/bin/django-builder
@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+
+require = require('esm')(module /*, options*/);
+require('../src/cli').cli(process.argv);
diff --git a/example-project.json b/example-project.json
new file mode 100644
index 0000000..e7a8b56
--- /dev/null
+++ b/example-project.json
@@ -0,0 +1,35 @@
+{
+  "name": "DjangoProject",
+  "description": "A Django Project with great potential",
+  "htmx": false,
+  "apps": [
+    {
+      "name": "DjangoApp1",
+      "models": [
+        {
+          "name":"DjangoModel1",
+          "fields": [
+            {
+              "name": "field1",
+              "type": "CharField",
+              "args": "max_length=30"
+            },
+            {
+              "name": "field2",
+              "type": "TextField",
+              "args": "max_length=100"
+            }
+          ],
+          "relationships": [
+            {
+              "name": "relationship1",
+              "type": "django.db.models.ForeignKey",
+              "to": "django.contrib.auth.models.User",
+              "args": "on_delete=models.CASCADE"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index f2ebf15..a33e63a 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,9 @@
   "name": "djangobuilder",
   "version": "0.1.0",
   "private": true,
+  "bin": {
+    "django-builder": "bin/django-builder"
+  },
   "scripts": {
     "dev": "vite --port 8080",
     "build": "vite build",
@@ -18,6 +21,7 @@
     "ci": "start-server-and-test test:e2e_serve http://localhost:8082 test:e2e"
   },
   "dependencies": {
+    "esm": "^3.2.25",
     "firebase": "^9.1.0",
     "firebase-tools": "^9.19.0",
     "highlight.js": "^11.2.0",
@@ -81,7 +85,7 @@
       "no-console": "off",
       "no-empty-pattern": "error",
       "no-unused-vars": [
-        "error",
+        "off",
         {
           "vars": "all",
           "args": "after-used",
diff --git a/script/run.sh b/script/run.sh
new file mode 100755
index 0000000..48b1bd8
--- /dev/null
+++ b/script/run.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -ex
+
+./bin/django-builder example-project.json output.tar
+
+tar -xvf output.tar
+
+cd DjangoProject
+python3 -m venv .venv
+source .venv/bin/activate
+pip install -r requirements.txt
+python manage.py makemigrations
+python manage.py migrate
+python manage.py runserver &
+ID=$!
+curl --connect-timeout 5 \
+    --retry-connrefused \
+    --max-time 5 \
+    --retry 5 \
+    --retry-delay 2 \
+    --retry-max-time 60 \
+    'http://127.0.0.1:8000'
+kill ${ID}
\ No newline at end of file
diff --git a/src/cli.js b/src/cli.js
new file mode 100644
index 0000000..0b37093
--- /dev/null
+++ b/src/cli.js
@@ -0,0 +1,133 @@
+import Renderer from "./django/rendering"
+import fs from 'fs';
+import { logger } from "firebase-tools";
+
+class Colors {
+  static Reset = "\x1b[0m";
+  static Bright = "\x1b[1m"
+  static Dim = "\x1b[2m"
+  static Underscore = "\x1b[4m"
+  static Blink = "\x1b[5m"
+  static Reverse = "\x1b[7m"
+  static Hidden = "\x1b[8m"
+
+  static FgBlack = "\x1b[30m"
+  static FgRed = "\x1b[31m"
+  static FgGreen = "\x1b[32m"
+  static FgYellow = "\x1b[33m"
+  static FgBlue = "\x1b[34m"
+  static FgMagenta = "\x1b[35m"
+  static FgCyan = "\x1b[36m"
+  static FgWhite = "\x1b[37m"
+
+  static BgBlack = "\x1b[40m"
+  static BgRed = "\x1b[41m"
+  static BgGreen = "\x1b[42m"
+  static BgYellow = "\x1b[43m"
+  static BgBlue = "\x1b[44m"
+  static BgMagenta = "\x1b[45m"
+  static BgCyan = "\x1b[46m"
+  static BgWhite = "\x1b[47m"
+}
+
+
+function project_data_to_store(project_data) {
+
+  const apps = project_data.apps;
+
+  const appData = {};
+  const modelData = {};
+  const fields = {};
+  const relationships = {};
+  
+  apps.forEach((app, i) => {
+    const singleAppData = {
+      name: app.name,
+      models: {}
+    }
+    Object.assign(appData, { [`${i}`]: singleAppData});
+    
+    app.models.forEach((model, i) => {
+      const singleModelData = {
+        ...model,
+        parents: model.parents || [],
+        fields: {},
+        relationships: {},
+      }
+      singleAppData.models[`${model.name}`] = true
+      
+      Object.assign(modelData, { [`${model.name}`]: singleModelData});
+
+      model.fields.forEach((field, i) => {
+        const singleFieldData = {
+          data: () => {
+            return {
+              ...field,
+              args: field.args || "",
+            }
+          },
+        }
+        Object.assign(fields, { [`${field.name}`]: singleFieldData});
+        singleModelData.fields[`${field.name}`] = true
+      })
+
+      model.relationships.forEach((relationship, i) => {
+        const singleRelationshipData = {
+          data: () => {
+            return {
+              ...relationship,
+              to: relationship.to,
+            }
+          },
+        }
+        Object.assign(relationships, { [`${relationship.name}`]: singleRelationshipData});
+        singleModelData.relationships[`${relationship.name}`] = true
+      })
+
+    })
+  
+  })
+
+  const projectData = {
+    ...project_data,
+    apps: apps.map((_, i) => { return {  [`${i}`]: true} }),
+  }
+  
+  return {
+    getters: {
+      projectData: () => projectData,
+      appData: (app_id) => appData[app_id],
+      modelData: (model_id) => modelData[model_id],
+      fields: () => fields,
+      relationships: () => relationships,
+      ordered_models: () => {
+        return Object.values(modelData)
+      }
+    }
+  }
+}
+
+export function cli(args) {
+  if (args.length != 4){
+    console.error(`${Colors.FgRed}Please supply an input json file and output tar file.${Colors.Reset}`)
+    console.error(`${Colors.FgRed}Usage: ./bin/django-builder example-project.json output.tar.${Colors.Reset}`)
+    return
+  }
+
+  const input_file = args[2];
+  const output_file = args[3];
+
+  let rawdata = fs.readFileSync(input_file);
+  let project_json = JSON.parse(rawdata);
+
+  const store = project_data_to_store(project_json)
+  const renderer = new Renderer(store);
+  const tar_content = renderer.tarball_content()
+
+  try {
+    fs.writeFileSync(output_file, tar_content);
+    console.log(`${Colors.FgGreen}File written to ${output_file} ${Colors.Reset}`);  //cyan
+  } catch (err) {
+    console.error(err);
+  }
+}
\ No newline at end of file
diff --git a/src/components/DirectoryView.vue b/src/components/DirectoryView.vue
index a0e52b4..6e247b6 100644
--- a/src/components/DirectoryView.vue
+++ b/src/components/DirectoryView.vue
@@ -97,10 +97,10 @@
 </template>
 
 <script>
+import store from "../store";
+import Renderer from '@/django/rendering';
 
-import Renderer from '@/django/rendering'
-
-const renderer = new Renderer()
+const renderer = new Renderer(store)
 
   export default {
     props: ['id'],
diff --git a/src/components/Project.vue b/src/components/Project.vue
index 17affd7..186d1f1 100644
--- a/src/components/Project.vue
+++ b/src/components/Project.vue
@@ -151,8 +151,9 @@ import { DEFAULT_DJANGO_VERSION } from '@/django'
 import {schemas} from '@/schemas'
 import {showDeleteDialog, showFormDialog} from '@/dialogs/'
 import 'highlight.js/styles/a11y-light.css'
+import store from "../store";
 
-const renderer = new Renderer()
+const renderer = new Renderer(store)
 
 export default {
   props: ['id'],
@@ -205,7 +206,7 @@ export default {
         event_label: this.name,
         value: 1
       })
-      const url = renderer.as_tarball(this.id)
+      const url = renderer.tarball_url(this.id)
       const link = document.createElement("a")
       link.download = this.name + '.tar'
       link.href = url
diff --git a/src/django/python/urls.py b/src/django/python/urls.py
index f124b92..c83a27f 100644
--- a/src/django/python/urls.py
+++ b/src/django/python/urls.py
@@ -1,4 +1,5 @@
-"""XXX_PROJECT_NAME_XXX URL Configuration
+"""
+XXX_PROJECT_NAME_XXX URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:
     https://docs.djangoproject.com/en/2.1/topics/http/urls/
diff --git a/src/django/rendering.js b/src/django/rendering.js
index c0c2cad..fbb286e 100644
--- a/src/django/rendering.js
+++ b/src/django/rendering.js
@@ -1,39 +1,96 @@
-import store from '@/store'
-import Django from '@/django/'
-import Tarball from '@/tar/'
-
-import settings from '@/django/python/settings.py?raw'
-import manage from '@/django/python/manage.py?raw'
-import wsgi from '@/django/python/wsgi.py?raw'
-import urls from '@/django/python/urls.py?raw'
-import views  from '@/django/python/views.py?raw'
-
-import asgi from '@/django/python/asgi.py?raw'
-import routing from '@/django/python/routing.py?raw'
-import consumers from '@/django/python/consumers.py?raw'
-import app_consumers from '@/django/python/app_consumers.py?raw'
-import htmx from '@/django/python/htmx.py?raw'
-
-import requirements_txt from '@/django/requirements/requirements.txt?raw'
-
-import test_settings from '@/django/tests/test_settings.py?raw'
-import test_requirements_txt from '@/django/tests/test_requirements.txt?raw'
-import _pytest_ini from '@/django/tests/pytest.ini?raw'
-
-import _base_html from '@/django/templates/base.html.tmpl?raw'
-import _channels_websocket_html from '@/django/templates/channels_websocket.html.tmpl?raw'
-import _htmx_html from '@/django/templates/htmx.html.tmpl?raw'
-
-import htmx_create from '@/django/templates/htmx/create.html?raw'
-import htmx_delete_button from '@/django/templates/htmx/delete_button.html?raw'
-import htmx_form from '@/django/templates/htmx/form.html?raw'
-import htmx_list from '@/django/templates/htmx/list.html?raw'
+import Django from '../django/'
+import Tarball from '../tar/'
+import fs from "fs"
+
+var testIsNode = new Function("try {return this===global;}catch(e){return false;}");
+const isNode = testIsNode();
+
+let settings;
+let manage;
+let wsgi;
+let urls;
+let asgi;
+let htmx;
+let views;
+let routing;
+let consumers;
+let app_consumers;
+let requirements_txt;
+let test_settings;
+let test_requirements_txt;
+let _pytest_ini;
+let _base_html;
+let _channels_websocket_html;
+let _htmx_html;
+let htmx_create;
+let htmx_delete_button;
+let htmx_form;
+let htmx_list;
+
+
+if (isNode) { 
+  var path = require('path');
+  const cwd = process.cwd();
+  
+  function readSrcFile(relpath) {
+    return fs.readFileSync(path.join(cwd, "src", relpath), 'utf-8');
+  }
+  
+  settings = readSrcFile('django/python/settings.py');
+  manage = readSrcFile('django/python/manage.py');
+  wsgi = readSrcFile('django/python/wsgi.py');
+  urls = readSrcFile('django/python/urls.py');
+  views = readSrcFile('/django/python/views.py');
+  htmx = readSrcFile('/django/python/htmx.py');
+  asgi = readSrcFile('django/python/asgi.py');
+  routing = readSrcFile('django/python/routing.py');
+  consumers = readSrcFile('django/python/consumers.py');
+  app_consumers = readSrcFile('django/python/app_consumers.py');
+  requirements_txt = readSrcFile('django/requirements/requirements.txt');
+  test_settings = readSrcFile('django/tests/test_settings.py');
+  test_requirements_txt = readSrcFile('django/tests/test_requirements.txt');
+  _pytest_ini = readSrcFile('django/tests/pytest.ini');
+  _base_html = readSrcFile('django/templates/base.html.tmpl');
+  _channels_websocket_html = readSrcFile('django/templates/channels_websocket.html.tmpl');
+  _htmx_html = readSrcFile('django/templates/htmx.html.tmpl')
+  htmx_create = readSrcFile('django/templates/htmx/create.html')
+  htmx_delete_button = readSrcFile('django/templates/htmx/delete_button.html')
+  htmx_form = readSrcFile('django/templates/htmx/form.html')
+  htmx_list = readSrcFile('django/templates/htmx/list.html')
+} else {
+  import('../django/python/settings.py?raw').then((module)=> settings = module.default)
+  import('../django/python/manage.py?raw').then((module)=> manage = module.default)
+  import('../django/python/manage.py?raw').then((module) => manage = module.default);
+  import('../django/python/wsgi.py?raw').then((module) => wsgi = module.default);
+  import('../django/python/urls.py?raw').then((module) => urls = module.default);
+  import('../django/python/views.py?raw').then((module) => views = module.default);
+  import('../django/python/asgi.py?raw').then((module) => asgi = module.default);
+  import('../django/python/htmx.py?raw').then((module) => htmx = module.default);
+  import('../django/python/routing.py?raw').then((module) => routing = module.default);
+  import('../django/python/consumers.py?raw').then((module) => consumers = module.default);
+  import('../django/python/app_consumers.py?raw').then((module) => app_consumers = module.default);
+  import('../django/requirements/requirements.txt?raw').then((module) => requirements_txt = module.default);
+  import('../django/tests/test_settings.py?raw').then((module) => test_settings = module.default);
+  import('../django/tests/test_requirements.txt?raw').then((module) => test_requirements_txt = module.default);
+  import('../django/tests/pytest.ini?raw').then((module) => _pytest_ini = module.default );
+  import('../django/templates/base.html.tmpl?raw').then((module) => _base_html = module.default );
+  import('../django/templates/channels_websocket.html.tmpl?raw').then((module) => _channels_websocket_html = module.default );
+  import('../django/templates/htmx.html.tmpl?raw').then((module) => _htmx_html = module.default)
+  import('../django/templates/htmx/create.html?raw').then((module) => htmx_create = module.default)
+  import('../django/templates/htmx/delete_button.html?raw').then((module) => htmx_delete_button = module.default)
+  import('../django/templates/htmx/form.html?raw').then((module) => htmx_form = module.default)
+  import('../django/templates/htmx/list.html?raw').then((module) => htmx_list = module.default)
+}
 
 const django = new Django()
 const keys = Object.keys
 
 class Renderer {
 
+  constructor(store) {
+    this.store = store
+  }
+
   _app_renderers = {
     'models.py': {function: this.models_py},
     'views.py': {function: this.views_py},
@@ -129,7 +186,7 @@ class Renderer {
   }
 
   project_tree(projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
 
     let project_children = this.project_renderers().map(render_name => {
       return {
@@ -156,10 +213,10 @@ class Renderer {
       children: project_children
     }
 
-    const apps = keys(store.getters.projectData(projectid).apps).filter(
-      app_id => store.getters.appData(app_id) !== undefined
+    const apps = keys(this.store.getters.projectData(projectid).apps).filter(
+      app_id => this.store.getters.appData(app_id) !== undefined
     ).map(app_id =>{
-      const app = store.getters.appData(app_id)
+      const app = this.store.getters.appData(app_id)
 
       if (app == undefined) return
 
@@ -239,8 +296,8 @@ class Renderer {
         path: "tests",
         name: "tests",
         folder: true,
-        children: keys(store.getters.projectData(projectid).apps).map((app_id) => {
-          const app = store.getters.appData(app_id)
+        children: keys(this.store.getters.projectData(projectid).apps).map((app_id) => {
+          const app = this.store.getters.appData(app_id)
 
           if (app == undefined) return
           return {
@@ -339,6 +396,14 @@ class Renderer {
     return this._channels_app_renderers[render_name].function.apply(this, [appid])
   }
 
+  root_template_render(render_name, projectid) {
+    if (!this._root_template_renderers[render_name]) {
+      console.error('Unknown root template render name', render_name)
+      return ''
+    }
+    return this._root_template_renderers[render_name].function.apply(this, [projectid])
+  }
+
   project_render(render_name, projectid) {
     if (!this._project_renderers[render_name]) {
       console.error('Unknown project render name', render_name)
@@ -380,19 +445,19 @@ class Renderer {
   }
 
   get_apps(projectid) {
-    const project = store.getters.projectData(projectid)
-    return keys(project.apps).filter(app => store.getters.appData(app)).map((app) => {
-      return Object.assign(store.getters.appData(app), {id: app})
+    const project = this.store.getters.projectData(projectid)
+    return keys(project.apps).filter(app => this.store.getters.appData(app)).map((app) => {
+      return Object.assign(this.store.getters.appData(app), {id: app})
     })
   }
 
   get_models(appid) {
-    return store.getters.ordered_models(appid)
+    return this.store.getters.ordered_models(appid)
   }
 
   get_fields(model) {
     return keys(model.fields).map((field) => {
-      return store.getters.fields()[field] ? store.getters.fields()[field].data() : [];
+      return this.store.getters.fields()[field] ? this.store.getters.fields()[field].data() : [];
     })
   }
 
@@ -431,12 +496,12 @@ class Renderer {
 
   get_relationships(model) {
     return keys(model.relationships).map((relationship) => {
-      return store.getters.relationships()[relationship].data()
+      return this.store.getters.relationships()[relationship].data()
     })
   }
 
   requirements (projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
     let requirements = requirements_txt
 
     let DJANGO_VERSION = 'Django>=4'
@@ -466,7 +531,7 @@ class Renderer {
   }
 
   project_settings (projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
     const apps = this.get_apps(projectid)
     let app_names = project.channels ? "'channels',\n    " : ''
     if (project.htmx) {
@@ -527,7 +592,7 @@ CHANNEL_LAYERS = {
   }
 
   base_html (projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
     let html = _base_html.replace(/XXX_PROJECT_NAME_XXX/g, project.name)
     let extra_body = "";
     let extra_head = "";
@@ -541,7 +606,7 @@ CHANNEL_LAYERS = {
 
   index_html (projectid) {
 
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
 
     var output = `{% extends "base.html" %}`
     output += `\n{% block content %}`
@@ -590,8 +655,8 @@ CHANNEL_LAYERS = {
   }
 
   list_html (appid, modelid) {
-    const appData = store.getters.appData(appid)
-    const modelData = store.getters.modelData(modelid)
+    const appData = this.store.getters.appData(appid)
+    const modelData = this.store.getters.modelData(modelid)
 
     var list_html = `
 {% extends "base.html" %}
@@ -624,8 +689,8 @@ CHANNEL_LAYERS = {
 {% block content %}
     `
 
-    const appData = store.getters.appData(appid)
-    const modelData = store.getters.modelData(modelid)
+    const appData = this.store.getters.appData(appid)
+    const modelData = this.store.getters.modelData(modelid)
 
     detail_html += `
 <p>
@@ -652,7 +717,7 @@ CHANNEL_LAYERS = {
   }
 
   confirm_delete_html (appid, modelid) {
-    const modelData = store.getters.modelData(modelid)
+    const modelData = this.store.getters.modelData(modelid)
 
     var confirm_delete_html = `
 {% extends "base.html" %}
@@ -675,8 +740,9 @@ CHANNEL_LAYERS = {
 {% load static %}
 {% block content %}
     `
-    const appData = store.getters.appData(appid)
-    const modelData = store.getters.modelData(modelid)
+
+    const appData = this.store.getters.appData(appid)
+    const modelData = this.store.getters.modelData(modelid)
 
     detail_html += `
 <p>
@@ -690,7 +756,6 @@ CHANNEL_LAYERS = {
     detail_html += `\n  {{form.errors}}`
 
     this.get_fields(modelData).forEach((field) => {
-
       var html_field_type = "text"
       switch (field.type) {
         case 'django.db.models.DateTimeField':
@@ -712,7 +777,6 @@ CHANNEL_LAYERS = {
           html_field_type = "file"
           break
       }
-
       const disabled = field.args.indexOf('editable=False') !== -1
 
       detail_html += `\n  <div class="form-group row">`
@@ -745,17 +809,17 @@ CHANNEL_LAYERS = {
   }
 
   channels_asgi_py (projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
     return asgi.replace(/XXX_PROJECT_NAME_XXX/g, project.name)
   }
 
   consumers_py (projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
     return consumers.replace(/XXX_PROJECT_NAME_XXX/g, project.name)
   }
 
   channels_routing_py (projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
     let consumer_imports = '# Consumer Imports\n'
     let consumers = ''
 
@@ -776,17 +840,17 @@ CHANNEL_LAYERS = {
   }
 
   project_manage (projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid);
     return manage.replace(/XXX_PROJECT_NAME_XXX/g, project.name)
   }
 
   pytest_ini (projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
     return _pytest_ini.replace(/XXX_PROJECT_NAME_XXX/g, project.name)
   }
 
   project_views (projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
     if (project.htmx) {
       return views
     }
@@ -794,18 +858,19 @@ CHANNEL_LAYERS = {
   }
 
   test_settings_py (projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
     return test_settings.replace(/XXX_PROJECT_NAME_XXX/g, project.name)
   }
 
   project_wsgi (projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
     return wsgi.replace(/XXX_PROJECT_NAME_XXX/g, project.name)
   }
 
   project_urls (projectid) {
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
     const apps = this.get_apps(projectid)
+    let app_names = '';
     let project_urls = ''
     let project_urls_imports = '';
     
@@ -813,6 +878,7 @@ CHANNEL_LAYERS = {
       if (i !== 0){
         project_urls += "    "
       }
+      app_names += "path('" + app.name + "/', include('" + app.name + ".urls')),"
       project_urls += "path('" + app.name + "/', include('" + app.name + ".urls')),"
       if (i !== keys(apps).length - 1){
         project_urls += "\n"
@@ -824,12 +890,12 @@ CHANNEL_LAYERS = {
     }
     return urls.replace("'XXX_PROJECT_URLS_XXX',", project_urls)
       .replace("XXX_PROJECT_URLS_IMPORTS_XXX", project_urls_imports)
+      .replace("'XXX_PROJECT_URLS_XXX',", app_names).replace(/XXX_PROJECT_NAME_XXX/g, project.name)
   }
 
   urls_py(projectid, appid) {
-    const project = store.getters.projectData(projectid)
-    const appData = store.getters.appData(appid)
-    console.log(appData)
+    const project = this.store.getters.projectData(projectid)
+    const appData = this.store.getters.appData(appid)
     let urls = 'from django.urls import path, include\n'
     urls += 'from rest_framework import routers\n'
     urls += '\n'
@@ -981,13 +1047,14 @@ CHANNEL_LAYERS = {
   }
 
   channels_app_consumers_py(appid) {
-    const appData = store.getters.appData(appid)
+    const appData = this.store.getters.appData(appid)
     return app_consumers
       .replace(/XXX_APP_NAME_XXX/g, appData.name)
   }
 
   models_py(projectid, appid) {
-    const appData = store.getters.appData(appid)
+    const project = this.store.getters.projectData(projectid)
+    const appData = this.store.getters.appData(appid);
     const models = this.get_models(appid)
 
     var imports = 'from django.db import models\n'
@@ -1004,7 +1071,7 @@ CHANNEL_LAYERS = {
       if (model.parents && model.parents.length > 0) {
         const parents = model.parents.map(((parent) => {
           if (parent.type == 'user') {
-            const model = store.getters.modelData(parent.model)
+            const model = this.store.getters.modelData(parent.model)
             return model.name
           } else if (parent.type == 'django') {
             return parent.class.split(".").pop()
@@ -1019,7 +1086,7 @@ CHANNEL_LAYERS = {
       if (model.relationships && keys(model.relationships).length > 0) {
         models_py += '    # Relationships\n'
         for ( var relationship in model.relationships ) {
-          const rData = store.getters.relationships()[relationship].data()
+          const rData = this.store.getters.relationships()[relationship].data()
           // e.g. If a built in model, convert django.contrib.auth.models.User to auth.User else just use app.Model
           const builtIn = django.builtInModel(rData.to)
           if (builtIn !== undefined) {
@@ -1038,7 +1105,7 @@ CHANNEL_LAYERS = {
       if (model.fields && keys(model.fields).length > 0) {
         models_py += '    # Fields\n'
         for( var field in model.fields ) {
-          const f = store.getters.fields()[field]
+          const f = this.store.getters.fields()[field]
           if (f) {
             const fData = f.data()
             var model_import = "models";
@@ -1084,14 +1151,16 @@ CHANNEL_LAYERS = {
 
       models_py += '\n'
       
-      models_py += '    @staticmethod\n'
-      models_py += '    def get_htmx_create_url():\n'
-      models_py += '        return reverse("' + appData.name + '_' + model.name + '_htmx_create")\n'
-
-      models_py += '\n'
-
-      models_py += '    def get_htmx_delete_url(self):\n'
-      models_py += '        return reverse("' + appData.name + '_' + model.name + '_htmx_delete", args=(self.' + identifier + ',))\n'
+      if (project.htmx) {
+        models_py += '    @staticmethod\n'
+        models_py += '    def get_htmx_create_url():\n'
+        models_py += '        return reverse("' + appData.name + '_' + model.name + '_htmx_create")\n'
+        
+        models_py += '\n'
+        
+        models_py += '    def get_htmx_delete_url(self):\n'
+        models_py += '        return reverse("' + appData.name + '_' + model.name + '_htmx_delete", args=(self.' + identifier + ',))\n'
+      }
 
     })
 
@@ -1115,7 +1184,7 @@ CHANNEL_LAYERS = {
       return !modelData.abstract
     })
 
-    const appData = store.getters.appData(appid)
+    const appData = this.store.getters.appData(appid)
 
     let views = 'from django.views import generic\n'
     views += 'from django.urls import reverse_lazy\n'
@@ -1300,7 +1369,7 @@ CHANNEL_LAYERS = {
 
         model.parents.forEach((parent) => {
           if (parent.type == 'user') {
-            const model = store.getters.modelData(parent.model)
+            const model = this.store.getters.modelData(parent.model)
             parent_user_models.push(model)
           } else if (parent.type == 'django') {
             parent_django_models.push(parent.class)
@@ -1362,7 +1431,7 @@ CHANNEL_LAYERS = {
   }
 
   test_views_py(appid) {
-    const appData = store.getters.appData(appid)
+    const appData = this.store.getters.appData(appid)
 
     var tests = ''
     tests += 'import pytest\n'
@@ -1450,12 +1519,86 @@ CHANNEL_LAYERS = {
     return tests
   }
 
+  as_string(projectid) {
+    let allContent = "";
+    const project = this.store.getters.projectData(projectid)
+    keys(project.apps).forEach((app) => {
+      const appData = this.store.getters.appData(app)
+      this.app_renderers().forEach((renderer) => {
+        const content = this.app_render(renderer, projectid, app)
+        const path = project.name + '/' + appData.name + '/' + renderer
+        allContent += "=== " + path + " ===\n";
+        allContent += content + "\n\n";
+      })
+      this.test_renderers().forEach((renderer) => {
+        const content = this.test_render(renderer, app)
+        const path = project.name + '/tests/' + appData.name + '/' + renderer
+        allContent += "=== " + path + " ===\n";
+        allContent += content + "\n\n";
+      })
+
+      if (project.channels === true) {
+        this.channels_app_renderers().forEach((renderer) => {
+          const content = this.channels_app_render(renderer, app)
+          const path = project.name + '/' + appData.name + '/' + renderer
+          allContent += "=== " + path + " ===\n";
+          allContent += content + "\n\n";
+        })
+      }
+
+      this.template_renderers().forEach((renderer) => {
+        keys(project.apps).map((app) => {
+          const appData = this.store.getters.appData(app)
+          keys(appData.models).map((modelid) => {
+            const modelData = this.store.getters.modelData(modelid)
+            const content = this.template_render(renderer, app, modelid)
+            const path = project.name + '/' + appData.name + '/templates/' + appData.name + '/' + modelData.name.toLowerCase() + '_' + renderer
+            allContent += "=== " + path + " ===\n";
+            allContent += content + "\n\n";
+          })
+        })
+      })
+    })
+
+    if (project.channels === true) {
+      this.channels_renderers().forEach((renderer) => {
+        const content = this.channels_render(renderer, projectid)
+        const path = project.name + '/' + project.name + '/' + renderer
+        allContent += "=== " + path + " ===\n";
+        allContent += content + "\n\n";
+      })
+    }
+
+    this.project_renderers().forEach((renderer) => {
+      const content = this.project_render(renderer, projectid)
+      const path = project.name + '/' + project.name + '/' + renderer
+      allContent += "=== " + path + " ===\n";
+      allContent += content + "\n\n";
+    })
+
+    this.root_template_renderers().forEach(([renderer, _]) => {
+      const content = this.root_template_render(renderer, projectid)
+      const path = project.name + '/templates/' + renderer
+      allContent += "=== " + path + " ===\n";
+      allContent += content + "\n\n";
+    })
+
+    this.root_renderers().forEach((renderer) => {
+      const content = this.root_render(renderer, projectid)
+      const path = project.name + '/' + renderer
+      allContent += "=== " + path + " ===\n";
+      allContent += content + "\n\n";
+    })
+
+    return allContent;
+  }
+
   as_tarball(projectid) {
     const tarball = new Tarball()
-    const project = store.getters.projectData(projectid)
+    const project = this.store.getters.projectData(projectid)
 
     keys(project.apps).forEach((app) => {
-      const appData = store.getters.appData(app)
+      const appData = this.store.getters.appData(app)
       this.app_renderers().forEach((renderer) => {
         const content = this.app_render(renderer, projectid, app)
         const path = project.name + '/' + appData.name + '/' + renderer
@@ -1479,11 +1622,11 @@ CHANNEL_LAYERS = {
         })
       }
 
-      this.template_renderers().forEach((renderer) => {
+      this.template_renderers().forEach(([renderer, render_details]) => {
         keys(project.apps).map((app) => {
-          const appData = store.getters.appData(app)
+          const appData = this.store.getters.appData(app)
           keys(appData.models).map((modelid) => {
-            const modelData = store.getters.modelData(modelid)
+            const modelData = this.store.getters.modelData(modelid)
             const content = this.template_render(renderer, app, modelid)
             const path = project.name + '/' + appData.name + '/templates/' + appData.name + '/' + modelData.name.toLowerCase() + '_' + renderer
             tarball.append(path, content)
@@ -1539,8 +1682,17 @@ CHANNEL_LAYERS = {
       tarball.append(path, content)
     })
 
-    return tarball.get_url()
+    return tarball;
   }
+
+  tarball_url(projectid) {
+    return this.as_tarball(projectid).get_url();
+  }
+
+  tarball_content(projectid) {
+    return this.as_tarball(projectid).get_content();
+  }
+
 }
 
 export default Renderer
diff --git a/src/store.js b/src/store.js
index bf7fe83..3d3bbb6 100644
--- a/src/store.js
+++ b/src/store.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import firebase from 'firebase/compat/app';
 import 'firebase/compat/firestore';
-import {keyByValue} from '@/utils'
+import {keyByValue} from './utils'
 import { event } from 'vue-gtag'
 
 Vue.use(Vuex)
diff --git a/src/tar/index.js b/src/tar/index.js
index 0c4226e..242bd2e 100644
--- a/src/tar/index.js
+++ b/src/tar/index.js
@@ -21,6 +21,10 @@ class Tarball {
     this.tarfile.append(file_name, content, opts)
   }
 
+  get_content () {
+    return this.tarfile.out;
+  }
+
   get_url () {
     var base64 = btoa(this.uInt8ToString(this.tarfile.out));
     return "data:application/tar;base64," + base64;
diff --git a/yarn.lock b/yarn.lock
index 6ecccce..a4e6eb6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10,10 +10,10 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@antfu/utils@^0.5.2":
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-0.5.2.tgz#8c2d931ff927be0ebe740169874a3d4004ab414b"
-  integrity sha512-CQkeV+oJxUazwjlHD0/3ZD08QWKuGQkhnrKo3e6ly5pd48VUpXbb77q0xMU4+vc2CkJnDS02Eq/M9ugyX20XZA==
+"@antfu/utils@^0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-0.6.0.tgz#c555b859843127853ffbe1adde25f6a365daa820"
+  integrity sha512-VauUKmo22NYo3y6fIjGjVU7LJyhaedYL9kyabdvIIIl7P+qbNPbQiaLwwk4UOU4McFfA2eg+aIWpEYhkHzsE9Q==
 
 "@apidevtools/json-schema-ref-parser@^9.0.3":
   version "9.0.9"
@@ -33,9 +33,9 @@
     "@babel/highlight" "^7.18.6"
 
 "@babel/compat-data@^7.19.3":
-  version "7.19.3"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.3.tgz#707b939793f867f5a73b2666e6d9a3396eb03151"
-  integrity sha512-prBHMK4JYYK+wDjJF1q99KK4JLL+egWS4nmNqdlMUgCExMZ+iZW0hGhyC3VEbsPjvaN0TBhW//VIFwBrk8sEiw==
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.4.tgz#95c86de137bf0317f3a570e1b6e996b427299747"
+  integrity sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==
 
 "@babel/core@^7.15.8":
   version "7.19.6"
@@ -58,15 +58,6 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.19.3":
-  version "7.19.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.3.tgz#d7f4d1300485b4547cb6f94b27d10d237b42bf59"
-  integrity sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ==
-  dependencies:
-    "@babel/types" "^7.19.3"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
-
 "@babel/generator@^7.19.6":
   version "7.19.6"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.6.tgz#9e481a3fe9ca6261c972645ae3904ec0f9b34a1d"
@@ -191,11 +182,6 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-string-parser@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
-  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
-
 "@babel/helper-string-parser@^7.19.4":
   version "7.19.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
@@ -229,16 +215,11 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.15.8", "@babel/parser@^7.16.4", "@babel/parser@^7.19.6":
+"@babel/parser@^7.15.8", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.18.4", "@babel/parser@^7.19.6":
   version "7.19.6"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.6.tgz#b923430cb94f58a7eae8facbffa9efd19130e7f8"
   integrity sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA==
 
-"@babel/parser@^7.18.10", "@babel/parser@^7.18.4", "@babel/parser@^7.19.3":
-  version "7.19.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.3.tgz#8dd36d17c53ff347f9e55c328710321b49479a9a"
-  integrity sha512-pJ9xOlNWHiy9+FuFP09DEAFbAn4JskgRsVcc169w2xRBC3FRGuQEwjeIMMND9L2zc0iEhO/tGv4Zq+km+hxNpQ==
-
 "@babel/plugin-proposal-class-properties@^7.14.5":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
@@ -297,23 +278,7 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.19.1":
-  version "7.19.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.3.tgz#3a3c5348d4988ba60884e8494b0592b2f15a04b4"
-  integrity sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.19.3"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.19.3"
-    "@babel/types" "^7.19.3"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.19.4", "@babel/traverse@^7.19.6":
+"@babel/traverse@^7.19.1", "@babel/traverse@^7.19.4", "@babel/traverse@^7.19.6":
   version "7.19.6"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.6.tgz#7b4c865611df6d99cb131eec2e8ac71656a490dc"
   integrity sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ==
@@ -329,16 +294,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.3":
-  version "7.19.3"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.3.tgz#fc420e6bbe54880bce6779ffaf315f5e43ec9624"
-  integrity sha512-hGCaQzIY22DJlDh9CH7NOxgKkFjBk0Cw9xDO1Xmh2151ti7wiGfQ3LauXzL4HP1fmFlTX6XjpRETTpUcv7wQLw==
-  dependencies:
-    "@babel/helper-string-parser" "^7.18.10"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.19.4":
+"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.4":
   version "7.19.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.4.tgz#0dd5c91c573a202d600490a35b33246fed8a41c7"
   integrity sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==
@@ -396,15 +352,15 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@firebase/analytics-compat@0.1.14":
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.1.14.tgz#af89d37796891a9fa0ad787c4ede2a1d235d8dab"
-  integrity sha512-HNuXTm+EYSf0T9N69UMmy9eVUipxxV8BhkCDPOdmUaa4syO4CtYk5qZt2k1qLygJI9wVFdiZeTU00FAgWK1/6A==
+"@firebase/analytics-compat@0.1.16":
+  version "0.1.16"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics-compat/-/analytics-compat-0.1.16.tgz#7a2c57c37a39efe52c476fa8878dd5a6b93b2155"
+  integrity sha512-mDAhE33WiyCrqSQZvzyZtQCCdf4ipn5tsEpTbIUruk7MbThQ1EbNAbPBiEk9NDLD3sUyLABZGFctvym/hc8H+w==
   dependencies:
-    "@firebase/analytics" "0.8.1"
+    "@firebase/analytics" "0.8.3"
     "@firebase/analytics-types" "0.7.0"
-    "@firebase/component" "0.5.18"
-    "@firebase/util" "1.7.0"
+    "@firebase/component" "0.5.20"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/analytics-types@0.7.0":
@@ -412,27 +368,27 @@
   resolved "https://registry.yarnpkg.com/@firebase/analytics-types/-/analytics-types-0.7.0.tgz#91960e7c87ce8bf18cf8dd9e55ccbf5dc3989b5d"
   integrity sha512-DNE2Waiwy5+zZnCfintkDtBfaW6MjIG883474v6Z0K1XZIvl76cLND4iv0YUb48leyF+PJK1KO2XrgHb/KpmhQ==
 
-"@firebase/analytics@0.8.1":
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.8.1.tgz#ed268d1799779d6ca4e77df4972a5590d46d191f"
-  integrity sha512-br/PBwPAuVdmuxt6k9S6Wtyvgh5YC4vPsY4zv/AtzrgIiXhlJKi28If9Pfh0z9W0dLuqTLSVI0MNzUV/hH5oTA==
+"@firebase/analytics@0.8.3":
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/@firebase/analytics/-/analytics-0.8.3.tgz#d8c6d71c3aa09d2ae5041db5b3778e4f66a832cb"
+  integrity sha512-viGhc57JW9zHp/0JKpLBUthdpOrEjbPETQFz8oNfaNma+cHA6FtIrtg4Sla52DgqatbATcE9aIDBiPCGrCtNjw==
   dependencies:
-    "@firebase/component" "0.5.18"
-    "@firebase/installations" "0.5.13"
+    "@firebase/component" "0.5.20"
+    "@firebase/installations" "0.5.15"
     "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/app-check-compat@0.2.13":
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.2.13.tgz#b07a2eb870ea6dca3954be94e8d09c2c838e109a"
-  integrity sha512-vVj6hcdwAOyR4GWrASyki9HhC8mIDN4hta7k/WC0k4UeWCjthfSgR+8Ce7HHp8h4fB5LhVFgFC8QI07sZ2O7jA==
+"@firebase/app-check-compat@0.2.15":
+  version "0.2.15"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check-compat/-/app-check-compat-0.2.15.tgz#d61255996b23f3e91ffd8eab7391877a3a993dca"
+  integrity sha512-EgD1WEFwwq7aP7DxPSYuUpMt8eAhClA57976D3BaHDbH/IXEuw0DfaeT0LtBb+xJD7J8uxy+YKpudCC8gzUu8g==
   dependencies:
-    "@firebase/app-check" "0.5.13"
+    "@firebase/app-check" "0.5.15"
     "@firebase/app-check-types" "0.4.0"
-    "@firebase/component" "0.5.18"
+    "@firebase/component" "0.5.20"
     "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/app-check-interop-types@0.1.0":
@@ -445,25 +401,25 @@
   resolved "https://registry.yarnpkg.com/@firebase/app-check-types/-/app-check-types-0.4.0.tgz#7007a9d1d720db20bcf466fe6785c96feaa0a82d"
   integrity sha512-SsWafqMABIOu7zLgWbmwvHGOeQQVQlwm42kwwubsmfLmL4Sf5uGpBfDhQ0CAkpi7bkJ/NwNFKafNDL9prRNP0Q==
 
-"@firebase/app-check@0.5.13":
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.5.13.tgz#4ffaf6bcaafee5edfe49f95bafea51749a9647cf"
-  integrity sha512-+1E2aDvd7vo4QidEyQFZaHur4r8oaHXZZ/SqykK2bcHBF3ihimJgrGBbtvOdUzrR0MOCZx9a18nXAJqevi/+Ow==
+"@firebase/app-check@0.5.15":
+  version "0.5.15"
+  resolved "https://registry.yarnpkg.com/@firebase/app-check/-/app-check-0.5.15.tgz#a57830b00864f792eddf45d581d256b1513643ab"
+  integrity sha512-ifQalGXkXMwGR3F8Glmo1XtDg0UjkwCmI/ff05mxnKGMfs5ZDyw8DikQfna//a/KdYuOBqxlBwS2BhHiobqUUg==
   dependencies:
-    "@firebase/component" "0.5.18"
+    "@firebase/component" "0.5.20"
     "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/app-compat@0.1.35":
-  version "0.1.35"
-  resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.1.35.tgz#e9c0b28e1749f475ba25272c46d7bf4a40581e6c"
-  integrity sha512-6ax9yXCPEBSREHxo+nCpSgSg01mGTvR4I7u/EHqVNNqG8uEWog7sUan3Y3vr3q3zH8t5BkXDGejOH9atF+XnAQ==
+"@firebase/app-compat@0.1.37":
+  version "0.1.37"
+  resolved "https://registry.yarnpkg.com/@firebase/app-compat/-/app-compat-0.1.37.tgz#338fead261344529ad7fcedd5ca014d463d6679b"
+  integrity sha512-doTKYGlVc8ZiQNOl66rpkU/YItRyOxCgMp4YWThXkPM4T/pTi4a9IMCe8K88gVNeYWd8sKW4vSnxjcOG5hQXEA==
   dependencies:
-    "@firebase/app" "0.8.0"
-    "@firebase/component" "0.5.18"
+    "@firebase/app" "0.8.2"
+    "@firebase/component" "0.5.20"
     "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/app-types@0.8.0":
@@ -471,26 +427,26 @@
   resolved "https://registry.yarnpkg.com/@firebase/app-types/-/app-types-0.8.0.tgz#50a539a0a20bef8c50494d0615592fe2a384851f"
   integrity sha512-Lec3VVquUwXPn2UReGSsfTxuMBVRmzGIwA/CJnF0LQuPgv9kOmXk9mVqsDMfHxHtqjai0n6wWHR2TqjdVV/bYA==
 
-"@firebase/app@0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.8.0.tgz#d4427e5e681db62822669f68b8991ff57e5e9be4"
-  integrity sha512-9kZjhIDv4u4PlrCgcQVBA2u8BZHrP8rUWDltmCUi9BLHv0tltfxLMZODV5LeuAfCJKVp2dbIrpGHPxAaLLl/ww==
+"@firebase/app@0.8.2":
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/@firebase/app/-/app-0.8.2.tgz#705fcbdd82d4720038a2eb9af7277c73ebd9e9d5"
+  integrity sha512-ByNDCe8h9O/szO3XVTrS484MtqBOKriVaNCQC7Y7KgZSaiA0OOWmIY5vwi63mBTYetqMNN5VGiG/6ZSmGIZyoQ==
   dependencies:
-    "@firebase/component" "0.5.18"
+    "@firebase/component" "0.5.20"
     "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     idb "7.0.1"
     tslib "^2.1.0"
 
-"@firebase/auth-compat@0.2.21":
-  version "0.2.21"
-  resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.2.21.tgz#b8abeeba1ec2d482526dd8a0cf6d4d90830717fa"
-  integrity sha512-etu40X/AdVWys/RvTZ0lHCmglGT3vEos+LS3O5u+L7vLOJ0LsiV8i9bFBPCv9aZcqK/R7cs9bGLQdZB9QwimVQ==
+"@firebase/auth-compat@0.2.23":
+  version "0.2.23"
+  resolved "https://registry.yarnpkg.com/@firebase/auth-compat/-/auth-compat-0.2.23.tgz#72a2d5163f4688bd85b0db58ded13db68f34b0a2"
+  integrity sha512-r9YEXaL7YKoFOWHRvVoQ6d5klP+hkSsAtt21UIvP3/BxDDU+yLXN5vVvFHr38apuUeMGN34M7zkY6SihnLutIQ==
   dependencies:
-    "@firebase/auth" "0.20.8"
+    "@firebase/auth" "0.20.10"
     "@firebase/auth-types" "0.11.0"
-    "@firebase/component" "0.5.18"
-    "@firebase/util" "1.7.0"
+    "@firebase/component" "0.5.20"
+    "@firebase/util" "1.7.2"
     node-fetch "2.6.7"
     selenium-webdriver "4.1.2"
     tslib "^2.1.0"
@@ -505,67 +461,67 @@
   resolved "https://registry.yarnpkg.com/@firebase/auth-types/-/auth-types-0.11.0.tgz#b9c73c60ca07945b3bbd7a097633e5f78fa9e886"
   integrity sha512-q7Bt6cx+ySj9elQHTsKulwk3+qDezhzRBFC9zlQ1BjgMueUOnGMcvqmU0zuKlQ4RhLSH7MNAdBV2znVaoN3Vxw==
 
-"@firebase/auth@0.20.8":
-  version "0.20.8"
-  resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.20.8.tgz#d7e1ac41a262ae91316eb14686d10e45d746a9e5"
-  integrity sha512-ss0Uyp5sLrGRR/8bbkZTod5gmdgltqvcxQySAKYGbsyBq4j+RTjZzVqUHZHFY7f8NLm2Bz4hO1dZRaIUYW8zLw==
+"@firebase/auth@0.20.10":
+  version "0.20.10"
+  resolved "https://registry.yarnpkg.com/@firebase/auth/-/auth-0.20.10.tgz#4dbd6cb24906e11f78bf65100a71b45b028b607b"
+  integrity sha512-uAZypmVv/4nijaPVtR/ipjKBmSDPLQ7sNScLHs2DVhdvCklgUUF5+zsEdPlMfKDIfmVQHFwHbUgeKyXDYSRMwQ==
   dependencies:
-    "@firebase/component" "0.5.18"
+    "@firebase/component" "0.5.20"
     "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     node-fetch "2.6.7"
     selenium-webdriver "4.1.2"
     tslib "^2.1.0"
 
-"@firebase/component@0.5.18":
-  version "0.5.18"
-  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.5.18.tgz#123d9bb025140fc3dacd042a0e356e1639b97d7b"
-  integrity sha512-worbz6idNWud/Sfpp3Lf9BE9tM8GRHhuQ4Hsqnva6ECdSRKYt8RRPg3UUSwDGa4iFpPo+gF/jKfydYN676+JmQ==
+"@firebase/component@0.5.20":
+  version "0.5.20"
+  resolved "https://registry.yarnpkg.com/@firebase/component/-/component-0.5.20.tgz#52165b5f7d25c4ac9c679e4e48d6f7fa7bf722cf"
+  integrity sha512-wP51tQBlPFprfAWxWjzC/56hG4APhl43jFsgwuqCl3bhVbiKcr278QbrbGNmIXDeGKo4sGZLAnH9whl2apeCmA==
   dependencies:
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/database-compat@0.2.7":
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.2.7.tgz#f04d45193f0a4d6655c1fd4c258af6e0e5f9861e"
-  integrity sha512-D9nTb8RNb3RbsKtwUFDykIeUbuBgVSDKE+b6dCgVi9PS7sNATdZPpKGjxLIAxCggyRTgfMj5pr0S5fhrMedRNw==
+"@firebase/database-compat@0.2.9":
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/@firebase/database-compat/-/database-compat-0.2.9.tgz#a1b4ecf94e11eadfc21aa48121b3ba7ea18a57ae"
+  integrity sha512-zzyFM3+jW/qYtHojiQirHXGXYyElbqVngEEn/i2gXoSzcK0Y2AL5oHAqGYXLaaW0+t4Zwnssh3HnQJM8C1D0fw==
   dependencies:
-    "@firebase/component" "0.5.18"
-    "@firebase/database" "0.13.7"
-    "@firebase/database-types" "0.9.14"
+    "@firebase/component" "0.5.20"
+    "@firebase/database" "0.13.9"
+    "@firebase/database-types" "0.9.16"
     "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/database-types@0.9.14":
-  version "0.9.14"
-  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.9.14.tgz#cb9bdc53047d555548c30d92cbc8d031e8ed369c"
-  integrity sha512-utMsusFMr5HuyiKxFyeOXU4hvC7hdJFTiyUWTQpLFODRwhtoPE539Y1I3r/LJhSPyt8dtds2GSjnvIbCvDezLQ==
+"@firebase/database-types@0.9.16":
+  version "0.9.16"
+  resolved "https://registry.yarnpkg.com/@firebase/database-types/-/database-types-0.9.16.tgz#4f7f612c00346641a641ac689005857190e91ebc"
+  integrity sha512-dK/uFgHisrVijSoHf9RLJ7NwvlOul2rO/z9ufOSbGd8/TqFVASXz+19mynhDIoSEnyQtJC/NTyBzSPfjz0w61w==
   dependencies:
     "@firebase/app-types" "0.8.0"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
 
-"@firebase/database@0.13.7":
-  version "0.13.7"
-  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.13.7.tgz#cf2093df85ba80890abcaf1cc46ea38249a5d846"
-  integrity sha512-j72yRxwGMcRnB+KwmyQYpPJHb5oNgbTS17ecAm8cX1GEyRohbZiE9GljbMaoOxSz/r8XuVfe748gEk5HFSEtSA==
+"@firebase/database@0.13.9":
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/@firebase/database/-/database-0.13.9.tgz#8cf8c77fb837ed1a6fa85565ac8c28864b0957fb"
+  integrity sha512-raQEBgQQybaEoMloJL8wWHQywGQ9mF2VbitvHydsbSNn+KL/xRDjXeQZPuuSbRjkYV6mR8jvQB7gpnzQQNE8Qg==
   dependencies:
     "@firebase/auth-interop-types" "0.1.6"
-    "@firebase/component" "0.5.18"
+    "@firebase/component" "0.5.20"
     "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     faye-websocket "0.11.4"
     tslib "^2.1.0"
 
-"@firebase/firestore-compat@0.1.26":
-  version "0.1.26"
-  resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.1.26.tgz#216466afd425ec7352a9d22a8a30bf136a3b6987"
-  integrity sha512-e0cIToek3tmbzd1UK7fFii6Fo+s2QoJt4Q9ZKxP6cBaMowZoWxZs8/cE7TPsnpgrx5BNc1DjLdpUh0vAuk+q4Q==
+"@firebase/firestore-compat@0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore-compat/-/firestore-compat-0.2.1.tgz#15fac47547e2c2fe2c4d3ddd8af63591009436af"
+  integrity sha512-XiiTpmUfyZ6QU3Dw9BCT4T+KPvqzada1GsUNX49HmriWHpIn3jTAjsagkigRAnmNDlxS3ki6Yzg9Cs60tpD0tw==
   dependencies:
-    "@firebase/component" "0.5.18"
-    "@firebase/firestore" "3.6.0"
+    "@firebase/component" "0.5.20"
+    "@firebase/firestore" "3.7.1"
     "@firebase/firestore-types" "2.5.0"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/firestore-types@2.5.0":
@@ -573,29 +529,29 @@
   resolved "https://registry.yarnpkg.com/@firebase/firestore-types/-/firestore-types-2.5.0.tgz#16fca40b6980fdb000de86042d7a96635f2bcdd7"
   integrity sha512-I6c2m1zUhZ5SH0cWPmINabDyH5w0PPFHk2UHsjBpKdZllzJZ2TwTkXbDtpHUZNmnc/zAa0WNMNMvcvbb/xJLKA==
 
-"@firebase/firestore@3.6.0":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-3.6.0.tgz#2a9e72d12d2245913500ace9a9e059abf4f6f711"
-  integrity sha512-vGeC2nXx/Ca+HsFhBLzz3jX1v571AZtNGf7AX0lMXeL+t0awWsAdq0ahkNRMjejhK5zVa68H/zg2RCO7fg8JiA==
+"@firebase/firestore@3.7.1":
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/@firebase/firestore/-/firestore-3.7.1.tgz#68d6c35ba16702942577afe4607a5acf6d62d912"
+  integrity sha512-sDZ79cUf4cwCyRzN74zODgaeUvyt0lGA8YwaasVVqojgznwMG/bIz+/Tny4ZEnLZFrlniCqt2tStWsiC6s3u7g==
   dependencies:
-    "@firebase/component" "0.5.18"
+    "@firebase/component" "0.5.20"
     "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.0"
-    "@firebase/webchannel-wrapper" "0.7.0"
+    "@firebase/util" "1.7.2"
+    "@firebase/webchannel-wrapper" "0.8.0"
     "@grpc/grpc-js" "^1.3.2"
     "@grpc/proto-loader" "^0.6.13"
     node-fetch "2.6.7"
     tslib "^2.1.0"
 
-"@firebase/functions-compat@0.2.5":
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.2.5.tgz#773a592be165953e8006c0b2010d2f49e988089c"
-  integrity sha512-r9lUxkBNmfulLfujdO7W2AAyH1I3QQBvrRlNoub8TNU+2UbqAfFde7yV0DhOCGhr75zp4ZVv71Zw6wIgwC0G1Q==
+"@firebase/functions-compat@0.2.7":
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/@firebase/functions-compat/-/functions-compat-0.2.7.tgz#fc43b1ab79f2c63209ea69db87b121f18b63a973"
+  integrity sha512-bcUst8ZDJHeVy2Wox4KEM5EizsrrqLzbwFIwJD7KkuSYP8XrlV2gaqJnCvIXXc0Nc4JRGvbXcvFFMXDjhsEp4Q==
   dependencies:
-    "@firebase/component" "0.5.18"
-    "@firebase/functions" "0.8.5"
+    "@firebase/component" "0.5.20"
+    "@firebase/functions" "0.8.7"
     "@firebase/functions-types" "0.5.0"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/functions-types@0.5.0":
@@ -603,28 +559,28 @@
   resolved "https://registry.yarnpkg.com/@firebase/functions-types/-/functions-types-0.5.0.tgz#b50ba95ccce9e96f7cda453228ffe1684645625b"
   integrity sha512-qza0M5EwX+Ocrl1cYI14zoipUX4gI/Shwqv0C1nB864INAD42Dgv4v94BCyxGHBg2kzlWy8PNafdP7zPO8aJQA==
 
-"@firebase/functions@0.8.5":
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.8.5.tgz#942f77d892c1eadf809385b06105b17fcce2e345"
-  integrity sha512-oI4ipogH6x+2euHGs+l+cZmRwg8psYxblbO5YebB7nh+x2UcFE4+4uDUXQc7XQrT4b1uDbrW343BU46RKFtwWg==
+"@firebase/functions@0.8.7":
+  version "0.8.7"
+  resolved "https://registry.yarnpkg.com/@firebase/functions/-/functions-0.8.7.tgz#b5571c50b849a31f8825a08f535419b2c2f3e9d8"
+  integrity sha512-JHSKdAOzlFJ9NdKoOaq4x6S1q6B3GmYZDg13KIDsE6BC0E9o/eWxOWOjSFJRCP/lpfFwa0rYBRayfUvZxW3BLw==
   dependencies:
     "@firebase/app-check-interop-types" "0.1.0"
     "@firebase/auth-interop-types" "0.1.6"
-    "@firebase/component" "0.5.18"
+    "@firebase/component" "0.5.20"
     "@firebase/messaging-interop-types" "0.1.0"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     node-fetch "2.6.7"
     tslib "^2.1.0"
 
-"@firebase/installations-compat@0.1.13":
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/@firebase/installations-compat/-/installations-compat-0.1.13.tgz#dfe32844d33a172dd772c1b4fa1ec037e66adcd6"
-  integrity sha512-JDdne03YV4VfIyGkmlg8ltSHS0hOzQXLkn2gDzvKsyvke0EAUI9HLHUDQAOKVpyn7LsDwFTub5QcrR0owG8b+Q==
+"@firebase/installations-compat@0.1.15":
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/@firebase/installations-compat/-/installations-compat-0.1.15.tgz#95b13a2fa55ba1aa05094b8b54ccd09fc046cc11"
+  integrity sha512-m0atyudsVj6ekmM+djhhzzInMC3Y233YJky9vXUVt5MHQY0mHhqDds9+UIrCa6cpbl+ntI2fOuoYV7y01s3sfw==
   dependencies:
-    "@firebase/component" "0.5.18"
-    "@firebase/installations" "0.5.13"
+    "@firebase/component" "0.5.20"
+    "@firebase/installations" "0.5.15"
     "@firebase/installations-types" "0.4.0"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/installations-types@0.4.0":
@@ -632,13 +588,13 @@
   resolved "https://registry.yarnpkg.com/@firebase/installations-types/-/installations-types-0.4.0.tgz#256782ff9adfb390ac658c25bc32f89635ddce7c"
   integrity sha512-nXxWKQDvBGctuvsizbUEJKfxXU9WAaDhon+j0jpjIfOJkvkj3YHqlLB/HeYjpUn85Pb22BjplpTnDn4Gm9pc3A==
 
-"@firebase/installations@0.5.13":
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.5.13.tgz#77207fc4098028a22acf3ef961c08a63f7caaa4e"
-  integrity sha512-T3+RIeqMA1vpnSOK/1wckpSSk3zbLNQgDWoiymwvK/FxjPFHO/LY1W0guqTmiYgK0stdLIHXh7syli5HboO47g==
+"@firebase/installations@0.5.15":
+  version "0.5.15"
+  resolved "https://registry.yarnpkg.com/@firebase/installations/-/installations-0.5.15.tgz#c037152c1b6a21e8ed54ecf7439ec50820962aa4"
+  integrity sha512-RVm2nc2d+bEDFzFzQDTTU1Z13fjAD0v88yDLjtRZuT2R7JwvAegQ4F7CupBvnnf7nftkd3kBwdOi8MhMthb3jQ==
   dependencies:
-    "@firebase/component" "0.5.18"
-    "@firebase/util" "1.7.0"
+    "@firebase/component" "0.5.20"
+    "@firebase/util" "1.7.2"
     idb "7.0.1"
     tslib "^2.1.0"
 
@@ -649,14 +605,14 @@
   dependencies:
     tslib "^2.1.0"
 
-"@firebase/messaging-compat@0.1.17":
-  version "0.1.17"
-  resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.1.17.tgz#1b780c54ee243b8cafa198900203b8ddc61eb234"
-  integrity sha512-WRaWizUMurqDQkCHzkW2XJkJl6BqSLhrCoCcClyIdC4XEolAgIo9X4Jy2Jd7HiX6SUSPgwEv0u93MnuIS9JWGw==
+"@firebase/messaging-compat@0.1.19":
+  version "0.1.19"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging-compat/-/messaging-compat-0.1.19.tgz#4de2dcb0768846cd889e5ba89742dd5232afb8a5"
+  integrity sha512-h5tx4nxfSILeRquk5mKE8Onu7WtL6b7rfB6GKNJKecvkPs3nnq5Z4cp2Av4JUR2Wtt9UxCTfO0iRbbmtrt2bZQ==
   dependencies:
-    "@firebase/component" "0.5.18"
-    "@firebase/messaging" "0.9.17"
-    "@firebase/util" "1.7.0"
+    "@firebase/component" "0.5.20"
+    "@firebase/messaging" "0.9.19"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/messaging-interop-types@0.1.0":
@@ -664,28 +620,28 @@
   resolved "https://registry.yarnpkg.com/@firebase/messaging-interop-types/-/messaging-interop-types-0.1.0.tgz#bdac02dd31edd5cb9eec37b1db698ea5e2c1a631"
   integrity sha512-DbvUl/rXAZpQeKBnwz0NYY5OCqr2nFA0Bj28Fmr3NXGqR4PAkfTOHuQlVtLO1Nudo3q0HxAYLa68ZDAcuv2uKQ==
 
-"@firebase/messaging@0.9.17":
-  version "0.9.17"
-  resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.9.17.tgz#37f6719c46e60f3b7ce28fd4b3017a915175bc3b"
-  integrity sha512-oyjPT1lutJqiivl3UxkJeLrNbOkakFKMUYYviEPEL1PAU+yfKWp7IbRaZPZy4Av+i0sSdLDyB8H803B6tZ+C0Q==
+"@firebase/messaging@0.9.19":
+  version "0.9.19"
+  resolved "https://registry.yarnpkg.com/@firebase/messaging/-/messaging-0.9.19.tgz#868916ed20e2bd3ecb58d13e1adb186714cfcbfa"
+  integrity sha512-xu99y/7/P+y3txGtgjsVJZyvx7T5/KdvFgDWS7oZwhKYG0o+DXFvvw3SBMK82LFGFOoyHlJUPqv45EyCPnOPCA==
   dependencies:
-    "@firebase/component" "0.5.18"
-    "@firebase/installations" "0.5.13"
+    "@firebase/component" "0.5.20"
+    "@firebase/installations" "0.5.15"
     "@firebase/messaging-interop-types" "0.1.0"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     idb "7.0.1"
     tslib "^2.1.0"
 
-"@firebase/performance-compat@0.1.13":
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.1.13.tgz#c1426e6a7a8ba497e87c3c3f9aa204ef590f3ff8"
-  integrity sha512-Den0APOV7bqnQxLuAhzo4dIkojbKR30/Q+8qeDrbdMHZL50wkZm09/OGqXoViCTy8zHDaau+Wp78z0qMqwUFxg==
+"@firebase/performance-compat@0.1.15":
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/@firebase/performance-compat/-/performance-compat-0.1.15.tgz#9ba68c6696a5ccd9ea5022ead43c1246017015bf"
+  integrity sha512-mryHr5eBEpWxBo8b3KM/53SwwVjMVahwdEnhfx1r+zAvmEPEzXUOGBzAC1l5WQ4DrwtDR87uMZ5soiQ/0jl9QQ==
   dependencies:
-    "@firebase/component" "0.5.18"
+    "@firebase/component" "0.5.20"
     "@firebase/logger" "0.3.3"
-    "@firebase/performance" "0.5.13"
+    "@firebase/performance" "0.5.15"
     "@firebase/performance-types" "0.1.0"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/performance-types@0.1.0":
@@ -693,27 +649,27 @@
   resolved "https://registry.yarnpkg.com/@firebase/performance-types/-/performance-types-0.1.0.tgz#5e6efa9dc81860aee2cb7121b39ae8fa137e69fc"
   integrity sha512-6p1HxrH0mpx+622Ql6fcxFxfkYSBpE3LSuwM7iTtYU2nw91Hj6THC8Bc8z4nboIq7WvgsT/kOTYVVZzCSlXl8w==
 
-"@firebase/performance@0.5.13":
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.5.13.tgz#ad59a8885a9667fa2650a064dfee325f641a1bb6"
-  integrity sha512-k35iR9LcRUsuyEa4sXzBaVKMaFGgDgI3fjHtcmfjspeSywTigbCWxGoN551uk+udAkC0ENnODGm6t/T/ie4HaQ==
+"@firebase/performance@0.5.15":
+  version "0.5.15"
+  resolved "https://registry.yarnpkg.com/@firebase/performance/-/performance-0.5.15.tgz#094856ab0b5799a81d57c4998cda6d363d315a07"
+  integrity sha512-YnnkUehXXzqQefNE5PlPEsXeJYSeY7cMWEdHYTj6u0/F5ntLSAhVZC8jl3Y0fTU1W8a9USQhml6NaXyWiVGmjQ==
   dependencies:
-    "@firebase/component" "0.5.18"
-    "@firebase/installations" "0.5.13"
+    "@firebase/component" "0.5.20"
+    "@firebase/installations" "0.5.15"
     "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/remote-config-compat@0.1.13":
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.1.13.tgz#a404e506b18d9c6cd2dc930025d92ee0e2078167"
-  integrity sha512-7bvcMosoS9fTXV305Cx62cyDFFk/CkToIrOR3tTKYr5cG/OKhrk0S/z9Wk6rowhgKHkg2SSZr5Difrj3vQPXDQ==
+"@firebase/remote-config-compat@0.1.15":
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config-compat/-/remote-config-compat-0.1.15.tgz#91343411085468a6c65b77acbbabc8791ea984f5"
+  integrity sha512-jGUrZXIxQRMeSrqEaCi3MtMF33NN12TNTQDZlbex2+T2+yTMI/sn3Mq52T/OccCo86DK17WVlXSWQCH1zCD13g==
   dependencies:
-    "@firebase/component" "0.5.18"
+    "@firebase/component" "0.5.20"
     "@firebase/logger" "0.3.3"
-    "@firebase/remote-config" "0.3.12"
+    "@firebase/remote-config" "0.3.14"
     "@firebase/remote-config-types" "0.2.0"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/remote-config-types@0.2.0":
@@ -721,26 +677,26 @@
   resolved "https://registry.yarnpkg.com/@firebase/remote-config-types/-/remote-config-types-0.2.0.tgz#1e2759fc01f20b58c564db42196f075844c3d1fd"
   integrity sha512-hqK5sCPeZvcHQ1D6VjJZdW6EexLTXNMJfPdTwbD8NrXUw6UjWC4KWhLK/TSlL0QPsQtcKRkaaoP+9QCgKfMFPw==
 
-"@firebase/remote-config@0.3.12":
-  version "0.3.12"
-  resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.3.12.tgz#52e3f46c42f364f5aa5e76fba67e7226f33f620a"
-  integrity sha512-Vhsr6H/onMOiNnEcEBfcv1qadtMtaIwI2oDAP4bbqmCp84XtbizUqY0Y0psOAjKArAbkoqc/33cngRl093YOIQ==
+"@firebase/remote-config@0.3.14":
+  version "0.3.14"
+  resolved "https://registry.yarnpkg.com/@firebase/remote-config/-/remote-config-0.3.14.tgz#44b2e6174b82b9729ab0893ab80eadcc7b3c830c"
+  integrity sha512-wEOz3Tasxhr5lCGioe0WNZwDOoQhNZK2qGAm5+AlHAPaAhWIWvqUTkKsk3nFRztyRZzj3r9k5Gc2OSpEcQKP1A==
   dependencies:
-    "@firebase/component" "0.5.18"
-    "@firebase/installations" "0.5.13"
+    "@firebase/component" "0.5.20"
+    "@firebase/installations" "0.5.15"
     "@firebase/logger" "0.3.3"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
-"@firebase/storage-compat@0.1.18":
-  version "0.1.18"
-  resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.1.18.tgz#1311708cbc381620a96902466b88a78ad22e3fa4"
-  integrity sha512-ULHyM0vXX/vM/tZhYJQbkk5mnv/eQPTs9KAnIdJh7o7Hj6cvNg0Hq8x9Y/QtqLZBfnm9ATszvD41mqLD4LzrGQ==
+"@firebase/storage-compat@0.1.20":
+  version "0.1.20"
+  resolved "https://registry.yarnpkg.com/@firebase/storage-compat/-/storage-compat-0.1.20.tgz#ec24fd62332d39460db6e7d62770de57e72fe690"
+  integrity sha512-8vruwltKdvEPhYbPXA/otb5fAD7MGsBHpCzktJWvF7eIALa4sUlYt+jJxG5Nwk2FoT1NrwLQ7TtI7zvm6/NinA==
   dependencies:
-    "@firebase/component" "0.5.18"
-    "@firebase/storage" "0.9.10"
+    "@firebase/component" "0.5.20"
+    "@firebase/storage" "0.9.12"
     "@firebase/storage-types" "0.6.0"
-    "@firebase/util" "1.7.0"
+    "@firebase/util" "1.7.2"
     tslib "^2.1.0"
 
 "@firebase/storage-types@0.6.0":
@@ -748,27 +704,27 @@
   resolved "https://registry.yarnpkg.com/@firebase/storage-types/-/storage-types-0.6.0.tgz#0b1af64a2965af46fca138e5b70700e9b7e6312a"
   integrity sha512-1LpWhcCb1ftpkP/akhzjzeFxgVefs6eMD2QeKiJJUGH1qOiows2w5o0sKCUSQrvrRQS1lz3SFGvNR1Ck/gqxeA==
 
-"@firebase/storage@0.9.10":
-  version "0.9.10"
-  resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.9.10.tgz#d16f852dd1d5ed21d33313bce8c1d01e5c7d3bd3"
-  integrity sha512-GXJSP/VqWNGi3gD8d59y5Ls4iW/jkX4CKuI4T6oST6eNnLrJcx68JbeOSv+37c9eBVT1d8O7LFX3oeKVWBhvRg==
+"@firebase/storage@0.9.12":
+  version "0.9.12"
+  resolved "https://registry.yarnpkg.com/@firebase/storage/-/storage-0.9.12.tgz#5631893a1ae9f7b0426948ab9910cd58782f9183"
+  integrity sha512-XIAmje0ufvRrxrUU/9tvGCuUIy7WSJf3XM8Y8OV9EW2Dg1w4f8IpraLiUdlirdtFM0UAnO2kDQHoiVQYhRrADQ==
   dependencies:
-    "@firebase/component" "0.5.18"
-    "@firebase/util" "1.7.0"
+    "@firebase/component" "0.5.20"
+    "@firebase/util" "1.7.2"
     node-fetch "2.6.7"
     tslib "^2.1.0"
 
-"@firebase/util@1.7.0":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.7.0.tgz#588accfb8ab7bb047a18baacacf4b88afde42080"
-  integrity sha512-n5g1WWd+E5IYQwtKxmTJDlhfT762mk/d7yigeh8QaS46cnvngwguOhNwlS8fniEJ7pAgyZ9v05OQMKdfMnws6g==
+"@firebase/util@1.7.2":
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/@firebase/util/-/util-1.7.2.tgz#dbdb259f141b5025a7faaaa38e2ea5df0be36ff5"
+  integrity sha512-P3aTihYEMoz2QQlcn0T7av7HLEK9gsTc1ZiN9VA8wnUtEJscUNemCmTmP3RRysqEb3Z+tVVoycztY8f6R36rRw==
   dependencies:
     tslib "^2.1.0"
 
-"@firebase/webchannel-wrapper@0.7.0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.7.0.tgz#a928358aac3aca652f417c402950d05a7a81d256"
-  integrity sha512-4ACd/c6ushrLuhn0+yjB9hznhnsc2IML6pf0Ulb1Q7w8SvR1jNGPu/Y7i4kvOm6R+WJkMHwyy5z3i3gN+Tawug==
+"@firebase/webchannel-wrapper@0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.8.0.tgz#88dfc717fb950276fd0fdee879fad2c041e33475"
+  integrity sha512-Q8erQds5LuAUgNuFOt/tu/abffYUHYxN+Ogp2V5EOssfFG7Ja4ce324Sqyq41u/vB5CSr+tfYS3JzTDrDxCvdw==
 
 "@gar/promisify@^1.1.3":
   version "1.1.3"
@@ -820,9 +776,9 @@
     p-defer "^3.0.0"
 
 "@grpc/grpc-js@^1.3.2":
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.7.1.tgz#cfac092e61eac6fe0f80d22943f98e1ba45f02a2"
-  integrity sha512-GVtMU4oh/TeKkWGzXUEsyZtyvSUIT1z49RtGH1UnEGeL+sLuxKl8QH3KZTlSB329R1sWJmesm5hQ5CxXdYH9dg==
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.7.3.tgz#f2ea79f65e31622d7f86d4b4c9ae38f13ccab99a"
+  integrity sha512-H9l79u4kJ2PVSxUNA08HMYAnUBLj9v6KjYQ7SQ71hOZcEXhShE/y5iQCesP8+6/Ik/7i2O0a10bPquIcYfufog==
   dependencies:
     "@grpc/proto-loader" "^0.7.0"
     "@types/node" ">=12.12.47"
@@ -932,9 +888,9 @@
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
 "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.16"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.16.tgz#a7982f16c18cae02be36274365433e5b49d7b23f"
-  integrity sha512-LCQ+NeThyJ4k1W2d+vIKdxuSt9R3pQSZ4P92m7EakaYuXcVWbHuT5bjNcqLd4Rdgi6xYWYDvBJZJLZSLanjDcA==
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
+  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
   dependencies:
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
@@ -1059,7 +1015,7 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
-"@rollup/pluginutils@^4.1.1", "@rollup/pluginutils@^4.2.1":
+"@rollup/pluginutils@^4.1.1":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
   integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==
@@ -1067,6 +1023,15 @@
     estree-walker "^2.0.1"
     picomatch "^2.2.2"
 
+"@rollup/pluginutils@^5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33"
+  integrity sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    estree-walker "^2.0.2"
+    picomatch "^2.3.1"
+
 "@sideway/address@^4.1.3":
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
@@ -1159,6 +1124,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/estree@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
+  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
+
 "@types/glob@*":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.0.0.tgz#321607e9cbaec54f687a0792b2d1d370739455d2"
@@ -1178,11 +1148,11 @@
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
 "@types/keyv@*":
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
-  integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-4.2.0.tgz#65b97868ab757906f2dbb653590d7167ad023fa0"
+  integrity sha512-xoBtGl5R9jeKUhc8ZqeYaRDx04qqJ10yhhXYGmJ4Jr8qKpvMsDQQrNUvF/wUJ4klOtmJeJM+p2Xo3zp9uaC3tw==
   dependencies:
-    "@types/node" "*"
+    keyv "*"
 
 "@types/long@^4.0.0", "@types/long@^4.0.1":
   version "4.0.2"
@@ -1195,9 +1165,9 @@
   integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==
 
 "@types/node@*", "@types/node@>=12.12.47", "@types/node@>=13.7.0":
-  version "18.8.3"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.8.3.tgz#ce750ab4017effa51aed6a7230651778d54e327c"
-  integrity sha512-0os9vz6BpGwxGe9LOhgP/ncvYN5Tx1fNcd2TM3rD/aCGBkysb+ZWpXEocG24h6ZzOi13+VB8HndAQFezsSOw1w==
+  version "18.11.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.4.tgz#7017a52e18dfaad32f55eebd539993014441949c"
+  integrity sha512-BxcJpBu8D3kv/GZkx/gSMz6VnTJREBj/4lbzYOQueUOELkt8WrO6zAcSPmp9uRPEW/d+lUO8QK0W2xnS1hEU0A==
 
 "@types/responselike@*", "@types/responselike@^1.0.0":
   version "1.0.0"
@@ -1419,9 +1389,9 @@ acorn@^7.1.1:
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
 acorn@^8.1.0, acorn@^8.4.1, acorn@^8.7.0, acorn@^8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
-  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
 
 adm-zip@0.5.5:
   version "0.5.5"
@@ -3245,9 +3215,9 @@ deep-is@^0.1.3, deep-is@~0.1.3:
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 defaults@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
-  integrity sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a"
+  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
   dependencies:
     clone "^1.0.2"
 
@@ -3447,16 +3417,11 @@ ejs@^3.1.6:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.3.47:
+electron-to-chromium@^1.3.47, electron-to-chromium@^1.4.251:
   version "1.4.284"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
   integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
 
-electron-to-chromium@^1.4.251:
-  version "1.4.276"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.276.tgz#17837b19dafcc43aba885c4689358b298c19b520"
-  integrity sha512-EpuHPqu8YhonqLBXHoU6hDJCD98FCe6KDoet3/gY1qsQ6usjJoHqBH2YIVs8FXaAtHwVL8Uqa/fsYao/vq9VWQ==
-
 emoji-regex@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@@ -4020,6 +3985,11 @@ eslint@8:
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
+esm@^3.2.25:
+  version "3.2.25"
+  resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
+  integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
+
 espree@^6.2.1:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
@@ -4464,36 +4434,36 @@ firebase-tools@^9.19.0:
     ws "^7.2.3"
 
 firebase@^9.1.0:
-  version "9.11.0"
-  resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.11.0.tgz#b4d93804e2a05b3b9cc59108eb6e08c850f9bf03"
-  integrity sha512-AOPj3FmpweMulG3A1901hOhbCoW22IHQuRfst0Tew9Xc8Ldq75uILu0MnmCYdMVGitF7uTFVOFeyhWyGvMxpKw==
-  dependencies:
-    "@firebase/analytics" "0.8.1"
-    "@firebase/analytics-compat" "0.1.14"
-    "@firebase/app" "0.8.0"
-    "@firebase/app-check" "0.5.13"
-    "@firebase/app-check-compat" "0.2.13"
-    "@firebase/app-compat" "0.1.35"
+  version "9.12.1"
+  resolved "https://registry.yarnpkg.com/firebase/-/firebase-9.12.1.tgz#f2ef2560a3a122bcf82dee09d5ae3a3805bb890a"
+  integrity sha512-sBp4rvkCC7TUnGeneRNs6GVcajO+iSXmYjxqXN4FsrBzldJ5/AOnDXf4bi9OUZtQSl+EHDgUWShBieht15ijgQ==
+  dependencies:
+    "@firebase/analytics" "0.8.3"
+    "@firebase/analytics-compat" "0.1.16"
+    "@firebase/app" "0.8.2"
+    "@firebase/app-check" "0.5.15"
+    "@firebase/app-check-compat" "0.2.15"
+    "@firebase/app-compat" "0.1.37"
     "@firebase/app-types" "0.8.0"
-    "@firebase/auth" "0.20.8"
-    "@firebase/auth-compat" "0.2.21"
-    "@firebase/database" "0.13.7"
-    "@firebase/database-compat" "0.2.7"
-    "@firebase/firestore" "3.6.0"
-    "@firebase/firestore-compat" "0.1.26"
-    "@firebase/functions" "0.8.5"
-    "@firebase/functions-compat" "0.2.5"
-    "@firebase/installations" "0.5.13"
-    "@firebase/installations-compat" "0.1.13"
-    "@firebase/messaging" "0.9.17"
-    "@firebase/messaging-compat" "0.1.17"
-    "@firebase/performance" "0.5.13"
-    "@firebase/performance-compat" "0.1.13"
-    "@firebase/remote-config" "0.3.12"
-    "@firebase/remote-config-compat" "0.1.13"
-    "@firebase/storage" "0.9.10"
-    "@firebase/storage-compat" "0.1.18"
-    "@firebase/util" "1.7.0"
+    "@firebase/auth" "0.20.10"
+    "@firebase/auth-compat" "0.2.23"
+    "@firebase/database" "0.13.9"
+    "@firebase/database-compat" "0.2.9"
+    "@firebase/firestore" "3.7.1"
+    "@firebase/firestore-compat" "0.2.1"
+    "@firebase/functions" "0.8.7"
+    "@firebase/functions-compat" "0.2.7"
+    "@firebase/installations" "0.5.15"
+    "@firebase/installations-compat" "0.1.15"
+    "@firebase/messaging" "0.9.19"
+    "@firebase/messaging-compat" "0.1.19"
+    "@firebase/performance" "0.5.15"
+    "@firebase/performance-compat" "0.1.15"
+    "@firebase/remote-config" "0.3.14"
+    "@firebase/remote-config-compat" "0.1.15"
+    "@firebase/storage" "0.9.12"
+    "@firebase/storage-compat" "0.1.20"
+    "@firebase/util" "1.7.2"
 
 flat-arguments@^1.0.0:
   version "1.0.2"
@@ -5427,9 +5397,9 @@ is-ci@^2.0.0:
     ci-info "^2.0.0"
 
 is-core-module@^2.9.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
-  integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
   dependencies:
     has "^1.0.3"
 
@@ -5666,9 +5636,9 @@ jju@^1.1.0:
   integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==
 
 joi@^17.4.0:
-  version "17.6.2"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.2.tgz#00ac55ce6495596545cce45309f38738cfbd7cd3"
-  integrity sha512-+gqqdh1xc1wb+Lor0J9toqgeReyDOCqOdG8QSdRcEvwrcRiFQZneUCGKjFjuyBWUb3uaFOgY56yMaZ5FIc+H4w==
+  version "17.6.4"
+  resolved "https://registry.yarnpkg.com/joi/-/joi-17.6.4.tgz#4d9536a059ef0762c718ae98673016b3ec151abd"
+  integrity sha512-tPzkTJHZQjSFCc842QpdVpOZ9LI2txApboNUbW70qgnRB14Lzl+oWQOPdF2N4yqyiY14wBGe8lc7f/2hZxbGmw==
   dependencies:
     "@hapi/hoek" "^9.0.0"
     "@hapi/topo" "^5.0.0"
@@ -5686,9 +5656,9 @@ join-path@^1.1.1:
     valid-url "^1"
 
 js-beautify@^1.6.12:
-  version "1.14.6"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.6.tgz#b23ca5d74a462c282c7711bb51150bcc97f2b507"
-  integrity sha512-GfofQY5zDp+cuHc+gsEXKPpNw2KbPddreEo35O6jT6i0RVK6LhsoYBhq5TvK4/n74wnA0QbK8gGd+jUZwTMKJw==
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.7.tgz#9206296de33f86dc106d3e50a35b7cf8729703b2"
+  integrity sha512-5SOX1KXPFKx+5f6ZrPsIPEY7NwKeQz47n3jm2i+XeHx9MoRsfQenlOP13FQhWvg8JRS0+XLO6XYUQ2GX+q+T9A==
   dependencies:
     config-chain "^1.1.13"
     editorconfig "^0.15.3"
@@ -5942,6 +5912,13 @@ jws@^4.0.0:
     jwa "^2.0.0"
     safe-buffer "^5.0.1"
 
+keyv@*, keyv@^4.0.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.0.tgz#dbce9ade79610b6e641a9a65f2f6499ba06b9bc6"
+  integrity sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA==
+  dependencies:
+    json-buffer "3.0.1"
+
 keyv@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -5949,13 +5926,6 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-keyv@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.0.tgz#dbce9ade79610b6e641a9a65f2f6499ba06b9bc6"
-  integrity sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA==
-  dependencies:
-    json-buffer "3.0.1"
-
 kind-of@^3.0.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -6372,7 +6342,7 @@ magic-string@^0.25.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
-magic-string@^0.26.5:
+magic-string@^0.26.7:
   version "0.26.7"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.7.tgz#caf7daf61b34e9982f8228c4527474dac8981d6f"
   integrity sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==
@@ -6553,9 +6523,9 @@ minimatch@^5.0.1, minimatch@^5.1.0:
     brace-expansion "^2.0.1"
 
 minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
 minipass-collect@^1.0.2:
   version "1.0.2"
@@ -6726,9 +6696,9 @@ mute-stream@0.0.8:
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
 nan@^2.16.0:
-  version "2.16.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916"
-  integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
+  integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
 
 nanoid@^3.3.4:
   version "3.3.4"
@@ -6825,9 +6795,9 @@ node-forge@^1.3.1:
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
 node-gyp@^9.0.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.2.0.tgz#b3b56144828a98018a4cfb3033095e0f5b874d72"
-  integrity sha512-/+/YxGfIJOh/fnMsr4Ep0v6oOIjnO1BgLd2dcDspBX1spTkQU7xSIox5RdRE/2/Uq3ZwK8Z5swRIbMUmPlslmg==
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.0.tgz#f8eefe77f0ad8edb3b3b898409b53e697642b319"
+  integrity sha512-A6rJWfXFz7TQNjpldJ915WFb1LnhO4lIve3ANPbWreuEoLoKlFT3sxIepPBkLhM27crW8YmN+pjlgbasH6cH/Q==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
@@ -7312,7 +7282,7 @@ postcss@^7.0.36:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.4.13, postcss@^8.4.16:
+postcss@^8.4.13, postcss@^8.4.14, postcss@^8.4.16:
   version "8.4.18"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.18.tgz#6d50046ea7d3d66a85e0e782074e7203bc7fbca2"
   integrity sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==
@@ -7321,15 +7291,6 @@ postcss@^8.4.13, postcss@^8.4.16:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.4.14:
-  version "8.4.17"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.17.tgz#f87863ec7cd353f81f7ab2dec5d67d861bbb1be5"
-  integrity sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==
-  dependencies:
-    nanoid "^3.3.4"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -7548,8 +7509,8 @@ qs@~6.5.2:
 
 querystring@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
-  integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
+  integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==
 
 querystringify@^2.1.1:
   version "2.2.0"
@@ -8001,9 +7962,9 @@ safe-regex-test@^1.0.0:
     is-regex "^1.1.4"
 
 safe-stable-stringify@^2.3.1:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.0.tgz#95fadb1bcf8057a1363e11052122f5da36a69215"
-  integrity sha512-eehKHKpab6E741ud7ZIMcXhKcP6TSIezPkNZhy5U8xC6+VvrRdUA2tMgxGxaGl4cz7c2Ew5+mg5+wNB16KQqrA==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.1.tgz#34694bd8a30575b7f94792aa51527551bd733d61"
+  integrity sha512-dVHE6bMtS/bnL2mwualjc6IxEv1F+OCUpA46pKUj6F8uDbUM0jCCulPqRNPSnWwGNKx5etqMjZYdXtrm5KJZGA==
 
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0:
   version "2.1.2"
@@ -8948,25 +8909,25 @@ unpipe@1.0.0, unpipe@~1.0.0:
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
 unplugin-vue-components@^0.22.4:
-  version "0.22.8"
-  resolved "https://registry.yarnpkg.com/unplugin-vue-components/-/unplugin-vue-components-0.22.8.tgz#84b8158beadb0c3a77eb29ed9bdc85b3880805bc"
-  integrity sha512-Musnwdtr6uj9Zopo4oeh4lp9+fJ2ArXVDzSiZxF4YC9v+pLnasKVKEEAjdXuQQ3u3KtntVw6PCscyAt52eS75g==
+  version "0.22.9"
+  resolved "https://registry.yarnpkg.com/unplugin-vue-components/-/unplugin-vue-components-0.22.9.tgz#68f0824a606d07b20fc2636b46ce63c1d960c1b6"
+  integrity sha512-qBvooq3EgpjtYicxeccRUGUBBQCCw9rJ0kHPZPOSJd8TBZViSv86vuKLTRDHPyjWtclwOIkVStZJfPdJFhYUMw==
   dependencies:
-    "@antfu/utils" "^0.5.2"
-    "@rollup/pluginutils" "^4.2.1"
+    "@antfu/utils" "^0.6.0"
+    "@rollup/pluginutils" "^5.0.2"
     chokidar "^3.5.3"
     debug "^4.3.4"
     fast-glob "^3.2.12"
     local-pkg "^0.4.2"
-    magic-string "^0.26.5"
+    magic-string "^0.26.7"
     minimatch "^5.1.0"
     resolve "^1.22.1"
-    unplugin "^0.9.6"
+    unplugin "^0.10.1"
 
-unplugin@^0.9.6:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-0.9.6.tgz#f449173b619b9970bf3190d5419a66a727bb5d18"
-  integrity sha512-YYLtfoNiie/lxswy1GOsKXgnLJTE27la/PeCGznSItk+8METYZErO+zzV9KQ/hXhPwzIJsfJ4s0m1Rl7ZCWZ4Q==
+unplugin@^0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-0.10.1.tgz#e00dc951c1901aef4124121057102a8c290e28b3"
+  integrity sha512-y1hdBitiLOJvCmer0/IGrMGmHplsm2oFRGWleoAJTRQ8aMHxHOe9gLntYlh1WNLKufBuQ2sOTrHF+KWH4xE8Ag==
   dependencies:
     acorn "^8.8.0"
     chokidar "^3.5.3"
@@ -9265,9 +9226,9 @@ vuetify-loader@^1.4.3:
     loader-utils "^2.0.0"
 
 vuetify@^2.2.23:
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.11.tgz#d6eb9654dfdeb204b78f15d9e6adce85e090b3e6"
-  integrity sha512-SX6BzS068t/RMj0d/sxxS/LsKdk9FpkL7CWShLyOMmJa/hiG63L0bvcopEaWYdRzzuQt7Nx174sk+KB6SvmYBw==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.12.tgz#ef1871c720834d53e00fef142b9841a3e8c1a4f9"
+  integrity sha512-qe3hcMpWmT1O15tp+p65lOS7UKZ/hQYQktCsw9iXx2u3RwVbX6GR82gY2iROrKsiAzYDvMgrYxWQwY/pUfkekw==
 
 vuex@^3.0.1:
   version "3.6.2"
@@ -9477,9 +9438,9 @@ write-file-atomic@^3.0.0:
     typedarray-to-buffer "^3.1.5"
 
 ws@>=7.4.6, ws@^8.9.0:
-  version "8.9.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e"
-  integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz#00a28c09dfb76eae4eb45c3b565f771d6951aa51"
+  integrity sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw==
 
 ws@^7.2.3:
   version "7.5.9"