From d519fd999b16bda2c331c96e53d6eb693bcd4215 Mon Sep 17 00:00:00 2001
From: Hunter Kehoe <hunter.kehoe@gmail.com>
Date: Sat, 16 Jul 2022 13:31:03 -0600
Subject: [PATCH 01/63] notification icons
---
client/client.go | 8 ++
client/options.go | 5 ++
cmd/publish.go | 6 ++
cmd/publish_test.go | 1 +
docs/publish.md | 79 ++++++++++++++++++++
docs/releases.md | 3 +-
docs/static/img/android-screenshot-icon.png | Bin 0 -> 39513 bytes
server/errors.go | 1 +
server/message_cache.go | 67 ++++++++++++++---
server/server.go | 12 +++
server/server_firebase.go | 5 ++
server/server_firebase_test.go | 11 +++
server/server_test.go | 4 +-
server/types.go | 8 ++
14 files changed, 197 insertions(+), 13 deletions(-)
create mode 100644 docs/static/img/android-screenshot-icon.png
diff --git a/client/client.go b/client/client.go
index 8b05a393..1f0862fc 100644
--- a/client/client.go
+++ b/client/client.go
@@ -47,6 +47,7 @@ type Message struct { // TODO combine with server.message
Priority int
Tags []string
Click string
+ Icon *Icon
Attachment *Attachment
// Additional fields
@@ -65,6 +66,13 @@ type Attachment struct {
Owner string `json:"-"` // IP address of uploader, used for rate limiting
}
+// Icon represents a message icon
+type Icon struct {
+ Url string `json:"url"`
+ Type string `json:"type,omitempty"`
+ Size int64 `json:"size,omitempty"`
+}
+
type subscription struct {
ID string
topicURL string
diff --git a/client/options.go b/client/options.go
index 7d599699..fdcbe1d2 100644
--- a/client/options.go
+++ b/client/options.go
@@ -56,6 +56,11 @@ func WithClick(url string) PublishOption {
return WithHeader("X-Click", url)
}
+// WithIcon makes the notification use the given URL as its icon
+func WithIcon(icon string) PublishOption {
+ return WithHeader("X-Icon", icon)
+}
+
// WithActions adds custom user actions to the notification. The value can be either a JSON array or the
// simple format definition. See https://ntfy.sh/docs/publish/#action-buttons for details.
func WithActions(value string) PublishOption {
diff --git a/cmd/publish.go b/cmd/publish.go
index 4d6ec781..c6b4a059 100644
--- a/cmd/publish.go
+++ b/cmd/publish.go
@@ -28,6 +28,7 @@ var flagsPublish = append(
&cli.StringFlag{Name: "tags", Aliases: []string{"tag", "T"}, EnvVars: []string{"NTFY_TAGS"}, Usage: "comma separated list of tags and emojis"},
&cli.StringFlag{Name: "delay", Aliases: []string{"at", "in", "D"}, EnvVars: []string{"NTFY_DELAY"}, Usage: "delay/schedule message"},
&cli.StringFlag{Name: "click", Aliases: []string{"U"}, EnvVars: []string{"NTFY_CLICK"}, Usage: "URL to open when notification is clicked"},
+ &cli.StringFlag{Name: "icon", Aliases: []string{"i"}, EnvVars: []string{"NTFY_ICON"}, Usage: "URL to use as notification icon"},
&cli.StringFlag{Name: "actions", Aliases: []string{"A"}, EnvVars: []string{"NTFY_ACTIONS"}, Usage: "actions JSON array or simple definition"},
&cli.StringFlag{Name: "attach", Aliases: []string{"a"}, EnvVars: []string{"NTFY_ATTACH"}, Usage: "URL to send as an external attachment"},
&cli.StringFlag{Name: "filename", Aliases: []string{"name", "n"}, EnvVars: []string{"NTFY_FILENAME"}, Usage: "filename for the attachment"},
@@ -64,6 +65,7 @@ Examples:
ntfy pub --at=8:30am delayed_topic Laterzz # Send message at 8:30am
ntfy pub -e phil@example.com alerts 'App is down!' # Also send email to phil@example.com
ntfy pub --click="https://reddit.com" redd 'New msg' # Opens Reddit when notification is clicked
+ ntfy pub --icon="http://some.tld/icon.png" 'Icon!' # Send notification with custom icon
ntfy pub --attach="http://some.tld/file.zip" files # Send ZIP archive from URL as attachment
ntfy pub --file=flower.jpg flowers 'Nice!' # Send image.jpg as attachment
ntfy pub -u phil:mypass secret Psst # Publish with username/password
@@ -90,6 +92,7 @@ func execPublish(c *cli.Context) error {
tags := c.String("tags")
delay := c.String("delay")
click := c.String("click")
+ icon := c.String("icon")
actions := c.String("actions")
attach := c.String("attach")
filename := c.String("filename")
@@ -120,6 +123,9 @@ func execPublish(c *cli.Context) error {
if click != "" {
options = append(options, client.WithClick(click))
}
+ if icon != "" {
+ options = append(options, client.WithIcon(icon))
+ }
if actions != "" {
options = append(options, client.WithActions(strings.ReplaceAll(actions, "\n", " ")))
}
diff --git a/cmd/publish_test.go b/cmd/publish_test.go
index 2b9ad3fc..ee8b116c 100644
--- a/cmd/publish_test.go
+++ b/cmd/publish_test.go
@@ -52,6 +52,7 @@ func TestCLI_Publish_All_The_Things(t *testing.T) {
"--tags", "tag1,tag2",
// No --delay, --email
"--click", "https://ntfy.sh",
+ "--icon", "https://ntfy.sh/static/img/ntfy.png",
"--attach", "https://f-droid.org/F-Droid.apk",
"--filename", "fdroid.apk",
"--no-cache",
diff --git a/docs/publish.md b/docs/publish.md
index b1bb09f8..390a376d 100644
--- a/docs/publish.md
+++ b/docs/publish.md
@@ -2349,6 +2349,84 @@ Here's an example showing how to attach an APK file:
<figcaption>File attachment sent from an external URL</figcaption>
</figure>
+## Icons
+_Supported on:_ :material-android:
+
+You can include an icon that will appear next to the text of the notification. Simply pass the `X-Icon` header or query
+parameter (or its alias `Icon`) to specify the URL that the icon is located at. The client will automatically download
+the icon (up to 300KB) and show it in the notification. Only jpeg and png images are supported at this time.
+
+Here's an example showing how to include an icon:
+
+=== "Command line (curl)"
+ ```
+ curl \
+ -X POST \
+ -H "Icon: https://ntfy.sh/docs/static/img/ntfy.png" \
+ ntfy.sh/customIcons
+ ```
+
+=== "ntfy CLI"
+ ```
+ ntfy publish \
+ --icon="https://ntfy.sh/docs/static/img/ntfy.png" \
+ customIcons
+ ```
+
+=== "HTTP"
+ ``` http
+ POST /customIcons HTTP/1.1
+ Host: ntfy.sh
+ Icon: https://ntfy.sh/docs/static/img/ntfy.png
+ ```
+
+=== "JavaScript"
+ ``` javascript
+ fetch('https://ntfy.sh/customIcons', {
+ method: 'POST',
+ headers: { 'Icon': 'https://ntfy.sh/docs/static/img/ntfy.png' }
+ })
+ ```
+
+=== "Go"
+ ``` go
+ req, _ := http.NewRequest("POST", "https://ntfy.sh/customIcons", file)
+ req.Header.Set("Icon", "https://ntfy.sh/docs/static/img/ntfy.png")
+ http.DefaultClient.Do(req)
+ ```
+
+=== "PowerShell"
+ ``` powershell
+ $uri = "https://ntfy.sh/customIcons"
+ $headers = @{ Icon="https://ntfy.sh/docs/static/img/ntfy.png" }
+ Invoke-RestMethod -Method 'Post' -Uri $uri -Headers $headers -UseBasicParsing
+ ```
+
+=== "Python"
+ ``` python
+ requests.put("https://ntfy.sh/customIcons",
+ headers={ "Icon": "https://ntfy.sh/docs/static/img/ntfy.png" })
+ ```
+
+=== "PHP"
+ ``` php-inline
+ file_get_contents('https://ntfy.sh/customIcons', false, stream_context_create([
+ 'http' => [
+ 'method' => 'PUT',
+ 'header' =>
+ "Content-Type: text/plain\r\n" . // Does not matter
+ "Icon: https://ntfy.sh/docs/static/img/ntfy.png",
+ ]
+ ]));
+ ```
+
+Here's an example of how it will look on Android:
+
+<figure markdown>
+ { width=500 }
+ <figcaption>Custom icon from an external URL</figcaption>
+</figure>
+
## E-mail notifications
_Supported on:_ :material-android: :material-apple: :material-firefox:
@@ -2804,6 +2882,7 @@ and can be passed as **HTTP headers** or **query parameters in the URL**. They a
| `X-Actions` | `Actions`, `Action` | JSON array or short format of [user actions](#action-buttons) |
| `X-Click` | `Click` | URL to open when [notification is clicked](#click-action) |
| `X-Attach` | `Attach`, `a` | URL to send as an [attachment](#attachments), as an alternative to PUT/POST-ing an attachment |
+| `X-Icon` | `Icon` | URL to use as notification [icon](#icons) |
| `X-Filename` | `Filename`, `file`, `f` | Optional [attachment](#attachments) filename, as it appears in the client |
| `X-Email` | `X-E-Mail`, `Email`, `E-Mail`, `mail`, `e` | E-mail address for [e-mail notifications](#e-mail-notifications) |
| `X-Cache` | `Cache` | Allows disabling [message caching](#message-caching) |
diff --git a/docs/releases.md b/docs/releases.md
index 3ae44d05..b615b034 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -13,6 +13,7 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
* Polling is now done with `since=<id>` API, which makes deduping easier ([#165](https://github.com/binwiederhier/ntfy/issues/165))
* Turned JSON stream deprecation banner into "Use WebSockets" banner (no ticket)
* Move action buttons in notification cards ([#236](https://github.com/binwiederhier/ntfy/issues/236), thanks to [@wunter8](https://github.com/wunter8))
+* Icons can be set for each individual notification ([#126](https://github.com/binwiederhier/ntfy/issues/126), thanks to [@wunter8](https://github.com/wunter8))
**Bugs:**
@@ -41,12 +42,12 @@ Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up s
* `ntfy user` commands don't work with `auth_file` but works with `auth-file` ([#344](https://github.com/binwiederhier/ntfy/issues/344), thanks to [@Histalek](https://github.com/Histalek) for reporting)
* Ignore new draft HTTP `Priority` header ([#351](https://github.com/binwiederhier/ntfy/issues/351), thanks to [@ksurl](https://github.com/ksurl) for reporting)
* Delete expired attachments based on mod time instead of DB entry to avoid races (no ticket)
+* Icons can be set for each individual notification ([#126](https://github.com/binwiederhier/ntfy/issues/126), thanks to [@wunter8](https://github.com/wunter8))
**Documentation:**
* Fix some PowerShell publish docs ([#345](https://github.com/binwiederhier/ntfy/pull/345), thanks to [@noahpeltier](https://github.com/noahpeltier))
--->
## ntfy server v1.27.2
Released June 23, 2022
diff --git a/docs/static/img/android-screenshot-icon.png b/docs/static/img/android-screenshot-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d9ffb2ad15d4ba3ff07d3ea52c51766a92563cc
GIT binary patch
literal 39513
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
Nw{(qkDz4c_{ttR=b!z|s
literal 0
HcmV?d00001
diff --git a/server/errors.go b/server/errors.go
index 28dbca3a..460138a7 100644
--- a/server/errors.go
+++ b/server/errors.go
@@ -52,6 +52,7 @@ var (
errHTTPBadRequestActionsInvalid = &errHTTP{40018, http.StatusBadRequest, "invalid request: actions invalid", "https://ntfy.sh/docs/publish/#action-buttons"}
errHTTPBadRequestMatrixMessageInvalid = &errHTTP{40019, http.StatusBadRequest, "invalid request: Matrix JSON invalid", "https://ntfy.sh/docs/publish/#matrix-gateway"}
errHTTPBadRequestMatrixPushkeyBaseURLMismatch = &errHTTP{40020, http.StatusBadRequest, "invalid request: push key must be prefixed with base URL", "https://ntfy.sh/docs/publish/#matrix-gateway"}
+ errHTTPBadRequestIconURLInvalid = &errHTTP{40021, http.StatusBadRequest, "invalid request: icon URL is invalid", "https://ntfy.sh/docs/publish/#icons"}
errHTTPNotFound = &errHTTP{40401, http.StatusNotFound, "page not found", ""}
errHTTPUnauthorized = &errHTTP{40101, http.StatusUnauthorized, "unauthorized", "https://ntfy.sh/docs/publish/#authentication"}
errHTTPForbidden = &errHTTP{40301, http.StatusForbidden, "forbidden", "https://ntfy.sh/docs/publish/#authentication"}
diff --git a/server/message_cache.go b/server/message_cache.go
index 2e9c577e..0905e009 100644
--- a/server/message_cache.go
+++ b/server/message_cache.go
@@ -38,44 +38,47 @@ const (
attachment_url TEXT NOT NULL,
sender TEXT NOT NULL,
encoding TEXT NOT NULL,
- published INT NOT NULL
+ published INT NOT NULL,
+ icon_url TEXT NOT NULL,
+ icon_type TEXT NOT NULL,
+ icon_size INT NOT NULL
);
CREATE INDEX IF NOT EXISTS idx_mid ON messages (mid);
CREATE INDEX IF NOT EXISTS idx_topic ON messages (topic);
COMMIT;
`
insertMessageQuery = `
- INSERT INTO messages (mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, published)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+ INSERT INTO messages (mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, published, icon_url, icon_type, icon_size)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
`
pruneMessagesQuery = `DELETE FROM messages WHERE time < ? AND published = 1`
selectRowIDFromMessageID = `SELECT id FROM messages WHERE mid = ?` // Do not include topic, see #336 and TestServer_PollSinceID_MultipleTopics
selectMessagesSinceTimeQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding
+ SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon_url, icon_type, icon_size
FROM messages
WHERE topic = ? AND time >= ? AND published = 1
ORDER BY time, id
`
selectMessagesSinceTimeIncludeScheduledQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding
+ SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon_url, icon_type, icon_size
FROM messages
WHERE topic = ? AND time >= ?
ORDER BY time, id
`
selectMessagesSinceIDQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding
+ SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon_url, icon_type, icon_size
FROM messages
WHERE topic = ? AND id > ? AND published = 1
ORDER BY time, id
`
selectMessagesSinceIDIncludeScheduledQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding
+ SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon_url, icon_type, icon_size
FROM messages
WHERE topic = ? AND (id > ? OR published = 0)
ORDER BY time, id
`
selectMessagesDueQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding
+ SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon_url, icon_type, icon_size
FROM messages
WHERE time <= ? AND published = 0
ORDER BY time, id
@@ -89,7 +92,7 @@ const (
// Schema management queries
const (
- currentSchemaVersion = 7
+ currentSchemaVersion = 8
createSchemaVersionTableQuery = `
CREATE TABLE IF NOT EXISTS schemaVersion (
id INT PRIMARY KEY,
@@ -177,6 +180,13 @@ const (
migrate6To7AlterMessagesTableQuery = `
ALTER TABLE messages RENAME COLUMN attachment_owner TO sender;
`
+
+ // 7 -> 8
+ migrate7To8AlterMessagesTableQuery = `
+ ALTER TABLE messages ADD COLUMN icon_url TEXT NOT NULL DEFAULT('');
+ ALTER TABLE messages ADD COLUMN icon_type TEXT NOT NULL DEFAULT('');
+ ALTER TABLE messages ADD COLUMN icon_size INT NOT NULL DEFAULT('0');
+ `
)
type messageCache struct {
@@ -248,6 +258,13 @@ func (c *messageCache) addMessages(ms []*message) error {
attachmentExpires = m.Attachment.Expires
attachmentURL = m.Attachment.URL
}
+ var iconURL, iconType string
+ var iconSize int64
+ if m.Icon != nil {
+ iconURL = m.Icon.URL
+ iconType = m.Icon.Type
+ iconSize = m.Icon.Size
+ }
var actionsStr string
if len(m.Actions) > 0 {
actionsBytes, err := json.Marshal(m.Actions)
@@ -275,6 +292,9 @@ func (c *messageCache) addMessages(ms []*message) error {
m.Sender,
m.Encoding,
published,
+ iconURL,
+ iconType,
+ iconSize,
)
if err != nil {
return err
@@ -412,9 +432,9 @@ func readMessages(rows *sql.Rows) ([]*message, error) {
defer rows.Close()
messages := make([]*message, 0)
for rows.Next() {
- var timestamp, attachmentSize, attachmentExpires int64
+ var timestamp, attachmentSize, attachmentExpires, iconSize int64
var priority int
- var id, topic, msg, title, tagsStr, click, actionsStr, attachmentName, attachmentType, attachmentURL, sender, encoding string
+ var id, topic, msg, title, tagsStr, click, actionsStr, attachmentName, attachmentType, attachmentURL, sender, encoding, iconURL, iconType string
err := rows.Scan(
&id,
×tamp,
@@ -432,6 +452,9 @@ func readMessages(rows *sql.Rows) ([]*message, error) {
&attachmentURL,
&sender,
&encoding,
+ &iconURL,
+ &iconType,
+ &iconSize,
)
if err != nil {
return nil, err
@@ -456,6 +479,14 @@ func readMessages(rows *sql.Rows) ([]*message, error) {
URL: attachmentURL,
}
}
+ var ico *icon
+ if iconURL != "" {
+ ico = &icon{
+ URL: iconURL,
+ Type: iconType,
+ Size: iconSize,
+ }
+ }
messages = append(messages, &message{
ID: id,
Time: timestamp,
@@ -466,6 +497,7 @@ func readMessages(rows *sql.Rows) ([]*message, error) {
Priority: priority,
Tags: tags,
Click: click,
+ Icon: ico,
Actions: actions,
Attachment: att,
Sender: sender,
@@ -524,6 +556,8 @@ func setupCacheDB(db *sql.DB, startupQueries string) error {
return migrateFrom5(db)
} else if schemaVersion == 6 {
return migrateFrom6(db)
+ } else if schemaVersion == 7 {
+ return migrateFrom7(db)
}
return fmt.Errorf("unexpected schema version found: %d", schemaVersion)
}
@@ -618,5 +652,16 @@ func migrateFrom6(db *sql.DB) error {
if _, err := db.Exec(updateSchemaVersion, 7); err != nil {
return err
}
+ return migrateFrom7(db)
+}
+
+func migrateFrom7(db *sql.DB) error {
+ log.Info("Migrating cache database schema: from 7 to 8")
+ if _, err := db.Exec(migrate7To8AlterMessagesTableQuery); err != nil {
+ return err
+ }
+ if _, err := db.Exec(updateSchemaVersion, 8); err != nil {
+ return err
+ }
return nil // Update this when a new version is added
}
diff --git a/server/server.go b/server/server.go
index 94f35801..6d25e2d5 100644
--- a/server/server.go
+++ b/server/server.go
@@ -75,6 +75,7 @@ var (
fileRegex = regexp.MustCompile(`^/file/([-_A-Za-z0-9]{1,64})(?:\.[A-Za-z0-9]{1,16})?$`)
disallowedTopics = []string{"docs", "static", "file", "app", "settings"} // If updated, also update in Android app
attachURLRegex = regexp.MustCompile(`^https?://`)
+ iconURLRegex = regexp.MustCompile(`^https?://`)
//go:embed site
webFs embed.FS
@@ -568,6 +569,7 @@ func (s *Server) parsePublishParams(r *http.Request, v *visitor, m *message) (ca
firebase = readBoolParam(r, true, "x-firebase", "firebase")
m.Title = readParam(r, "x-title", "title", "t")
m.Click = readParam(r, "x-click", "click")
+ ico := readParam(r, "x-icon", "icon")
filename := readParam(r, "x-filename", "filename", "file", "f")
attach := readParam(r, "x-attach", "attach", "a")
if attach != "" || filename != "" {
@@ -594,6 +596,13 @@ func (s *Server) parsePublishParams(r *http.Request, v *visitor, m *message) (ca
m.Attachment.Name = "attachment"
}
}
+ if ico != "" {
+ m.Icon = &icon{}
+ if !iconURLRegex.MatchString(ico) {
+ return false, false, "", false, errHTTPBadRequestIconURLInvalid
+ }
+ m.Icon.URL = ico
+ }
email = readParam(r, "x-email", "x-e-mail", "email", "e-mail", "mail", "e")
if email != "" {
if err := v.EmailAllowed(); err != nil {
@@ -1336,6 +1345,9 @@ func (s *Server) transformBodyJSON(next handleFunc) handleFunc {
if m.Click != "" {
r.Header.Set("X-Click", m.Click)
}
+ if m.Icon != "" {
+ r.Header.Set("X-Icon", m.Icon)
+ }
if len(m.Actions) > 0 {
actionsStr, err := json.Marshal(m.Actions)
if err != nil {
diff --git a/server/server_firebase.go b/server/server_firebase.go
index 99f0ba13..016f54be 100644
--- a/server/server_firebase.go
+++ b/server/server_firebase.go
@@ -166,6 +166,11 @@ func toFirebaseMessage(m *message, auther auth.Auther) (*messaging.Message, erro
data["attachment_expires"] = fmt.Sprintf("%d", m.Attachment.Expires)
data["attachment_url"] = m.Attachment.URL
}
+ if m.Icon != nil {
+ data["icon_url"] = m.Icon.URL
+ data["icon_type"] = m.Icon.Type
+ data["icon_size"] = fmt.Sprintf("%d", m.Icon.Size)
+ }
apnsConfig = createAPNSAlertConfig(m, data)
} else {
// If anonymous read for a topic is not allowed, we cannot send the message along
diff --git a/server/server_firebase_test.go b/server/server_firebase_test.go
index b004b0fa..7301057f 100644
--- a/server/server_firebase_test.go
+++ b/server/server_firebase_test.go
@@ -123,6 +123,11 @@ func TestToFirebaseMessage_Message_Normal_Allowed(t *testing.T) {
m.Priority = 4
m.Tags = []string{"tag 1", "tag2"}
m.Click = "https://google.com"
+ m.Icon = &icon{
+ URL: "https://ntfy.sh/static/img/ntfy.png",
+ Type: "image/jpeg",
+ Size: 4567,
+ }
m.Title = "some title"
m.Actions = []*action{
{
@@ -173,6 +178,9 @@ func TestToFirebaseMessage_Message_Normal_Allowed(t *testing.T) {
"priority": "4",
"tags": strings.Join(m.Tags, ","),
"click": "https://google.com",
+ "icon_url": "https://ntfy.sh/static/img/ntfy.png",
+ "icon_type": "image/jpeg",
+ "icon_size": "4567",
"title": "some title",
"message": "this is a message",
"actions": `[{"id":"123","action":"view","label":"Open page","clear":true,"url":"https://ntfy.sh"},{"id":"456","action":"http","label":"Close door","clear":false,"url":"https://door.com/close","method":"PUT","headers":{"really":"yes"}}]`,
@@ -193,6 +201,9 @@ func TestToFirebaseMessage_Message_Normal_Allowed(t *testing.T) {
"priority": "4",
"tags": strings.Join(m.Tags, ","),
"click": "https://google.com",
+ "icon_url": "https://ntfy.sh/static/img/ntfy.png",
+ "icon_type": "image/jpeg",
+ "icon_size": "4567",
"title": "some title",
"message": "this is a message",
"actions": `[{"id":"123","action":"view","label":"Open page","clear":true,"url":"https://ntfy.sh"},{"id":"456","action":"http","label":"Close door","clear":false,"url":"https://door.com/close","method":"PUT","headers":{"really":"yes"}}]`,
diff --git a/server/server_test.go b/server/server_test.go
index d68cfa11..13e51377 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -1046,7 +1046,7 @@ func TestServer_PublishAsJSON(t *testing.T) {
s := newTestServer(t, newTestConfig(t))
body := `{"topic":"mytopic","message":"A message","title":"a title\nwith lines","tags":["tag1","tag 2"],` +
`"not-a-thing":"ok", "attach":"http://google.com","filename":"google.pdf", "click":"http://ntfy.sh","priority":4,` +
- `"delay":"30min"}`
+ `"icon":"https://ntfy.sh/static/img/ntfy.png", "delay":"30min"}`
response := request(t, s, "PUT", "/", body, nil)
require.Equal(t, 200, response.Code)
@@ -1058,6 +1058,8 @@ func TestServer_PublishAsJSON(t *testing.T) {
require.Equal(t, "http://google.com", m.Attachment.URL)
require.Equal(t, "google.pdf", m.Attachment.Name)
require.Equal(t, "http://ntfy.sh", m.Click)
+ require.Equal(t, "https://ntfy.sh/static/img/ntfy.png", m.Icon.URL)
+
require.Equal(t, 4, m.Priority)
require.True(t, m.Time > time.Now().Unix()+29*60)
require.True(t, m.Time < time.Now().Unix()+31*60)
diff --git a/server/types.go b/server/types.go
index 44fe9e9e..3a5e9fa9 100644
--- a/server/types.go
+++ b/server/types.go
@@ -31,6 +31,7 @@ type message struct {
Click string `json:"click,omitempty"`
Actions []*action `json:"actions,omitempty"`
Attachment *attachment `json:"attachment,omitempty"`
+ Icon *icon `json:"icon,omitempty"`
PollID string `json:"poll_id,omitempty"`
Sender string `json:"-"` // IP address of uploader, used for rate limiting
Encoding string `json:"encoding,omitempty"` // empty for raw UTF-8, or "base64" for encoded bytes
@@ -44,6 +45,12 @@ type attachment struct {
URL string `json:"url"`
}
+type icon struct {
+ URL string `json:"url"`
+ Type string `json:"type,omitempty"`
+ Size int64 `json:"size,omitempty"`
+}
+
type action struct {
ID string `json:"id"`
Action string `json:"action"` // "view", "broadcast", or "http"
@@ -74,6 +81,7 @@ type publishMessage struct {
Click string `json:"click"`
Actions []action `json:"actions"`
Attach string `json:"attach"`
+ Icon string `json:"icon"`
Filename string `json:"filename"`
Email string `json:"email"`
Delay string `json:"delay"`
From 04f2535e924c2c12b2f1f3192a7bab5384a2bcd1 Mon Sep 17 00:00:00 2001
From: Hunter Kehoe <hunter.kehoe@gmail.com>
Date: Sat, 16 Jul 2022 14:22:23 -0600
Subject: [PATCH 02/63] linting
---
client/client.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/client.go b/client/client.go
index 1f0862fc..27e75fe5 100644
--- a/client/client.go
+++ b/client/client.go
@@ -68,7 +68,7 @@ type Attachment struct {
// Icon represents a message icon
type Icon struct {
- Url string `json:"url"`
+ URL string `json:"url"`
Type string `json:"type,omitempty"`
Size int64 `json:"size,omitempty"`
}
From 99886d7f669499b88b5136dc3dcbdbc4b34e8ba6 Mon Sep 17 00:00:00 2001
From: Hunter Kehoe <hunter.kehoe@gmail.com>
Date: Sun, 17 Jul 2022 15:40:24 -0600
Subject: [PATCH 03/63] change icon from object to string
---
client/client.go | 9 +-----
cmd/publish_test.go | 1 +
server/message_cache.go | 51 ++++++++++------------------------
server/server.go | 9 +-----
server/server_firebase.go | 6 +---
server/server_firebase_test.go | 14 ++--------
server/server_test.go | 2 +-
server/types.go | 8 +-----
8 files changed, 23 insertions(+), 77 deletions(-)
diff --git a/client/client.go b/client/client.go
index 27e75fe5..baec3011 100644
--- a/client/client.go
+++ b/client/client.go
@@ -47,7 +47,7 @@ type Message struct { // TODO combine with server.message
Priority int
Tags []string
Click string
- Icon *Icon
+ Icon string
Attachment *Attachment
// Additional fields
@@ -66,13 +66,6 @@ type Attachment struct {
Owner string `json:"-"` // IP address of uploader, used for rate limiting
}
-// Icon represents a message icon
-type Icon struct {
- URL string `json:"url"`
- Type string `json:"type,omitempty"`
- Size int64 `json:"size,omitempty"`
-}
-
type subscription struct {
ID string
topicURL string
diff --git a/cmd/publish_test.go b/cmd/publish_test.go
index ee8b116c..dde279da 100644
--- a/cmd/publish_test.go
+++ b/cmd/publish_test.go
@@ -74,6 +74,7 @@ func TestCLI_Publish_All_The_Things(t *testing.T) {
require.Equal(t, "", m.Attachment.Owner)
require.Equal(t, int64(0), m.Attachment.Expires)
require.Equal(t, "", m.Attachment.Type)
+ require.Equal(t, "https://ntfy.sh/static/img/ntfy.png", m.Icon)
}
func TestCLI_Publish_Wait_PID_And_Cmd(t *testing.T) {
diff --git a/server/message_cache.go b/server/message_cache.go
index 0905e009..f37e5a9d 100644
--- a/server/message_cache.go
+++ b/server/message_cache.go
@@ -39,46 +39,44 @@ const (
sender TEXT NOT NULL,
encoding TEXT NOT NULL,
published INT NOT NULL,
- icon_url TEXT NOT NULL,
- icon_type TEXT NOT NULL,
- icon_size INT NOT NULL
+ icon TEXT NOT NULL
);
CREATE INDEX IF NOT EXISTS idx_mid ON messages (mid);
CREATE INDEX IF NOT EXISTS idx_topic ON messages (topic);
COMMIT;
`
insertMessageQuery = `
- INSERT INTO messages (mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, published, icon_url, icon_type, icon_size)
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+ INSERT INTO messages (mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, published, icon)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
`
pruneMessagesQuery = `DELETE FROM messages WHERE time < ? AND published = 1`
selectRowIDFromMessageID = `SELECT id FROM messages WHERE mid = ?` // Do not include topic, see #336 and TestServer_PollSinceID_MultipleTopics
selectMessagesSinceTimeQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon_url, icon_type, icon_size
+ SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon
FROM messages
WHERE topic = ? AND time >= ? AND published = 1
ORDER BY time, id
`
selectMessagesSinceTimeIncludeScheduledQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon_url, icon_type, icon_size
+ SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon
FROM messages
WHERE topic = ? AND time >= ?
ORDER BY time, id
`
selectMessagesSinceIDQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon_url, icon_type, icon_size
+ SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon
FROM messages
WHERE topic = ? AND id > ? AND published = 1
ORDER BY time, id
`
selectMessagesSinceIDIncludeScheduledQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon_url, icon_type, icon_size
+ SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon
FROM messages
WHERE topic = ? AND (id > ? OR published = 0)
ORDER BY time, id
`
selectMessagesDueQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon_url, icon_type, icon_size
+ SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon
FROM messages
WHERE time <= ? AND published = 0
ORDER BY time, id
@@ -183,9 +181,7 @@ const (
// 7 -> 8
migrate7To8AlterMessagesTableQuery = `
- ALTER TABLE messages ADD COLUMN icon_url TEXT NOT NULL DEFAULT('');
- ALTER TABLE messages ADD COLUMN icon_type TEXT NOT NULL DEFAULT('');
- ALTER TABLE messages ADD COLUMN icon_size INT NOT NULL DEFAULT('0');
+ ALTER TABLE messages ADD COLUMN icon TEXT NOT NULL DEFAULT('');
`
)
@@ -258,13 +254,6 @@ func (c *messageCache) addMessages(ms []*message) error {
attachmentExpires = m.Attachment.Expires
attachmentURL = m.Attachment.URL
}
- var iconURL, iconType string
- var iconSize int64
- if m.Icon != nil {
- iconURL = m.Icon.URL
- iconType = m.Icon.Type
- iconSize = m.Icon.Size
- }
var actionsStr string
if len(m.Actions) > 0 {
actionsBytes, err := json.Marshal(m.Actions)
@@ -292,9 +281,7 @@ func (c *messageCache) addMessages(ms []*message) error {
m.Sender,
m.Encoding,
published,
- iconURL,
- iconType,
- iconSize,
+ m.Icon,
)
if err != nil {
return err
@@ -432,9 +419,9 @@ func readMessages(rows *sql.Rows) ([]*message, error) {
defer rows.Close()
messages := make([]*message, 0)
for rows.Next() {
- var timestamp, attachmentSize, attachmentExpires, iconSize int64
+ var timestamp, attachmentSize, attachmentExpires int64
var priority int
- var id, topic, msg, title, tagsStr, click, actionsStr, attachmentName, attachmentType, attachmentURL, sender, encoding, iconURL, iconType string
+ var id, topic, msg, title, tagsStr, click, actionsStr, attachmentName, attachmentType, attachmentURL, sender, encoding, icon string
err := rows.Scan(
&id,
×tamp,
@@ -452,9 +439,7 @@ func readMessages(rows *sql.Rows) ([]*message, error) {
&attachmentURL,
&sender,
&encoding,
- &iconURL,
- &iconType,
- &iconSize,
+ &icon,
)
if err != nil {
return nil, err
@@ -479,14 +464,6 @@ func readMessages(rows *sql.Rows) ([]*message, error) {
URL: attachmentURL,
}
}
- var ico *icon
- if iconURL != "" {
- ico = &icon{
- URL: iconURL,
- Type: iconType,
- Size: iconSize,
- }
- }
messages = append(messages, &message{
ID: id,
Time: timestamp,
@@ -497,7 +474,7 @@ func readMessages(rows *sql.Rows) ([]*message, error) {
Priority: priority,
Tags: tags,
Click: click,
- Icon: ico,
+ Icon: icon,
Actions: actions,
Attachment: att,
Sender: sender,
diff --git a/server/server.go b/server/server.go
index 6d25e2d5..be2ae9c1 100644
--- a/server/server.go
+++ b/server/server.go
@@ -569,7 +569,7 @@ func (s *Server) parsePublishParams(r *http.Request, v *visitor, m *message) (ca
firebase = readBoolParam(r, true, "x-firebase", "firebase")
m.Title = readParam(r, "x-title", "title", "t")
m.Click = readParam(r, "x-click", "click")
- ico := readParam(r, "x-icon", "icon")
+ m.Icon = readParam(r, "x-icon", "icon")
filename := readParam(r, "x-filename", "filename", "file", "f")
attach := readParam(r, "x-attach", "attach", "a")
if attach != "" || filename != "" {
@@ -596,13 +596,6 @@ func (s *Server) parsePublishParams(r *http.Request, v *visitor, m *message) (ca
m.Attachment.Name = "attachment"
}
}
- if ico != "" {
- m.Icon = &icon{}
- if !iconURLRegex.MatchString(ico) {
- return false, false, "", false, errHTTPBadRequestIconURLInvalid
- }
- m.Icon.URL = ico
- }
email = readParam(r, "x-email", "x-e-mail", "email", "e-mail", "mail", "e")
if email != "" {
if err := v.EmailAllowed(); err != nil {
diff --git a/server/server_firebase.go b/server/server_firebase.go
index 016f54be..ec3e6112 100644
--- a/server/server_firebase.go
+++ b/server/server_firebase.go
@@ -151,6 +151,7 @@ func toFirebaseMessage(m *message, auther auth.Auther) (*messaging.Message, erro
"title": m.Title,
"message": m.Message,
"encoding": m.Encoding,
+ "icon": m.Icon,
}
if len(m.Actions) > 0 {
actions, err := json.Marshal(m.Actions)
@@ -166,11 +167,6 @@ func toFirebaseMessage(m *message, auther auth.Auther) (*messaging.Message, erro
data["attachment_expires"] = fmt.Sprintf("%d", m.Attachment.Expires)
data["attachment_url"] = m.Attachment.URL
}
- if m.Icon != nil {
- data["icon_url"] = m.Icon.URL
- data["icon_type"] = m.Icon.Type
- data["icon_size"] = fmt.Sprintf("%d", m.Icon.Size)
- }
apnsConfig = createAPNSAlertConfig(m, data)
} else {
// If anonymous read for a topic is not allowed, we cannot send the message along
diff --git a/server/server_firebase_test.go b/server/server_firebase_test.go
index 7301057f..8d898db1 100644
--- a/server/server_firebase_test.go
+++ b/server/server_firebase_test.go
@@ -123,11 +123,7 @@ func TestToFirebaseMessage_Message_Normal_Allowed(t *testing.T) {
m.Priority = 4
m.Tags = []string{"tag 1", "tag2"}
m.Click = "https://google.com"
- m.Icon = &icon{
- URL: "https://ntfy.sh/static/img/ntfy.png",
- Type: "image/jpeg",
- Size: 4567,
- }
+ m.Icon = "https://ntfy.sh/static/img/ntfy.png"
m.Title = "some title"
m.Actions = []*action{
{
@@ -178,9 +174,7 @@ func TestToFirebaseMessage_Message_Normal_Allowed(t *testing.T) {
"priority": "4",
"tags": strings.Join(m.Tags, ","),
"click": "https://google.com",
- "icon_url": "https://ntfy.sh/static/img/ntfy.png",
- "icon_type": "image/jpeg",
- "icon_size": "4567",
+ "icon": "https://ntfy.sh/static/img/ntfy.png",
"title": "some title",
"message": "this is a message",
"actions": `[{"id":"123","action":"view","label":"Open page","clear":true,"url":"https://ntfy.sh"},{"id":"456","action":"http","label":"Close door","clear":false,"url":"https://door.com/close","method":"PUT","headers":{"really":"yes"}}]`,
@@ -201,9 +195,7 @@ func TestToFirebaseMessage_Message_Normal_Allowed(t *testing.T) {
"priority": "4",
"tags": strings.Join(m.Tags, ","),
"click": "https://google.com",
- "icon_url": "https://ntfy.sh/static/img/ntfy.png",
- "icon_type": "image/jpeg",
- "icon_size": "4567",
+ "icon": "https://ntfy.sh/static/img/ntfy.png",
"title": "some title",
"message": "this is a message",
"actions": `[{"id":"123","action":"view","label":"Open page","clear":true,"url":"https://ntfy.sh"},{"id":"456","action":"http","label":"Close door","clear":false,"url":"https://door.com/close","method":"PUT","headers":{"really":"yes"}}]`,
diff --git a/server/server_test.go b/server/server_test.go
index 13e51377..ea3495d6 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -1058,7 +1058,7 @@ func TestServer_PublishAsJSON(t *testing.T) {
require.Equal(t, "http://google.com", m.Attachment.URL)
require.Equal(t, "google.pdf", m.Attachment.Name)
require.Equal(t, "http://ntfy.sh", m.Click)
- require.Equal(t, "https://ntfy.sh/static/img/ntfy.png", m.Icon.URL)
+ require.Equal(t, "https://ntfy.sh/static/img/ntfy.png", m.Icon)
require.Equal(t, 4, m.Priority)
require.True(t, m.Time > time.Now().Unix()+29*60)
diff --git a/server/types.go b/server/types.go
index 3a5e9fa9..7a5badf8 100644
--- a/server/types.go
+++ b/server/types.go
@@ -31,7 +31,7 @@ type message struct {
Click string `json:"click,omitempty"`
Actions []*action `json:"actions,omitempty"`
Attachment *attachment `json:"attachment,omitempty"`
- Icon *icon `json:"icon,omitempty"`
+ Icon string `json:"icon,omitempty"`
PollID string `json:"poll_id,omitempty"`
Sender string `json:"-"` // IP address of uploader, used for rate limiting
Encoding string `json:"encoding,omitempty"` // empty for raw UTF-8, or "base64" for encoded bytes
@@ -45,12 +45,6 @@ type attachment struct {
URL string `json:"url"`
}
-type icon struct {
- URL string `json:"url"`
- Type string `json:"type,omitempty"`
- Size int64 `json:"size,omitempty"`
-}
-
type action struct {
ID string `json:"id"`
Action string `json:"action"` // "view", "broadcast", or "http"
From 3c5a10de17446d30e1a1a2a3debb6d4925192c76 Mon Sep 17 00:00:00 2001
From: Hunter Kehoe <hunter.kehoe@gmail.com>
Date: Sun, 17 Jul 2022 15:47:21 -0600
Subject: [PATCH 04/63] combine attachment and icon url regex
---
server/server.go | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/server/server.go b/server/server.go
index be2ae9c1..e28121c5 100644
--- a/server/server.go
+++ b/server/server.go
@@ -74,8 +74,7 @@ var (
docsRegex = regexp.MustCompile(`^/docs(|/.*)$`)
fileRegex = regexp.MustCompile(`^/file/([-_A-Za-z0-9]{1,64})(?:\.[A-Za-z0-9]{1,16})?$`)
disallowedTopics = []string{"docs", "static", "file", "app", "settings"} // If updated, also update in Android app
- attachURLRegex = regexp.MustCompile(`^https?://`)
- iconURLRegex = regexp.MustCompile(`^https?://`)
+ urlRegex = regexp.MustCompile(`^https?://`)
//go:embed site
webFs embed.FS
@@ -569,7 +568,7 @@ func (s *Server) parsePublishParams(r *http.Request, v *visitor, m *message) (ca
firebase = readBoolParam(r, true, "x-firebase", "firebase")
m.Title = readParam(r, "x-title", "title", "t")
m.Click = readParam(r, "x-click", "click")
- m.Icon = readParam(r, "x-icon", "icon")
+ icon := readParam(r, "x-icon", "icon")
filename := readParam(r, "x-filename", "filename", "file", "f")
attach := readParam(r, "x-attach", "attach", "a")
if attach != "" || filename != "" {
@@ -579,7 +578,7 @@ func (s *Server) parsePublishParams(r *http.Request, v *visitor, m *message) (ca
m.Attachment.Name = filename
}
if attach != "" {
- if !attachURLRegex.MatchString(attach) {
+ if !urlRegex.MatchString(attach) {
return false, false, "", false, errHTTPBadRequestAttachmentURLInvalid
}
m.Attachment.URL = attach
@@ -596,6 +595,12 @@ func (s *Server) parsePublishParams(r *http.Request, v *visitor, m *message) (ca
m.Attachment.Name = "attachment"
}
}
+ if icon != "" {
+ if !urlRegex.MatchString(icon) {
+ return false, false, "", false, errHTTPBadRequestIconURLInvalid
+ }
+ m.Icon = icon
+ }
email = readParam(r, "x-email", "x-e-mail", "email", "e-mail", "mail", "e")
if email != "" {
if err := v.EmailAllowed(); err != nil {
From 38e61d6a998ddf076dd21ad548e892d2cda3bf06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Jul 2022 06:01:20 +0000
Subject: [PATCH 05/63] Bump terser from 5.14.1 to 5.14.2 in /web
Bumps [terser](https://github.com/terser/terser) from 5.14.1 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)
---
updated-dependencies:
- dependency-name: terser
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
---
web/package-lock.json | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/web/package-lock.json b/web/package-lock.json
index 25c7fb4d..53991d3c 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -11,15 +11,15 @@
"@emotion/react": "^11.8.2",
"@emotion/styled": "^11.8.1",
"@mui/icons-material": "^5.4.2",
- "@mui/material": "latest",
+ "@mui/material": "*",
"dexie": "^3.2.1",
"dexie-react-hooks": "^1.1.1",
"i18next": "^21.6.14",
"i18next-browser-languagedetector": "^6.1.4",
"i18next-http-backend": "^1.4.0",
"js-base64": "^3.7.2",
- "react": "latest",
- "react-dom": "latest",
+ "react": "*",
+ "react-dom": "*",
"react-i18next": "^11.16.2",
"react-infinite-scroll-component": "^6.1.0",
"react-router-dom": "^6.2.2",
@@ -15576,9 +15576,9 @@
}
},
"node_modules/terser": {
- "version": "5.14.1",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz",
- "integrity": "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==",
+ "version": "5.14.2",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
+ "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
"dependencies": {
"@jridgewell/source-map": "^0.3.2",
"acorn": "^8.5.0",
@@ -27922,9 +27922,9 @@
}
},
"terser": {
- "version": "5.14.1",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz",
- "integrity": "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==",
+ "version": "5.14.2",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
+ "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
"requires": {
"@jridgewell/source-map": "^0.3.2",
"acorn": "^8.5.0",
From 206beb31c4fd1c7ccfe5b8589f7da81587f1eb4c Mon Sep 17 00:00:00 2001
From: poi <erbaotao@outlook.com>
Date: Thu, 21 Jul 2022 10:53:47 +0000
Subject: [PATCH 06/63] Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (189 of 189 strings)
Translation: ntfy/Web app
Translate-URL: https://hosted.weblate.org/projects/ntfy/web/zh_Hans/
---
web/public/static/langs/zh_Hans.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/web/public/static/langs/zh_Hans.json b/web/public/static/langs/zh_Hans.json
index 58b3561f..e4bb4810 100644
--- a/web/public/static/langs/zh_Hans.json
+++ b/web/public/static/langs/zh_Hans.json
@@ -118,8 +118,8 @@
"prefs_notifications_min_priority_description_max": "仅显示最高优先级的通知",
"prefs_notifications_min_priority_any": "任意优先级",
"prefs_notifications_min_priority_low_and_higher": "低优先级和更高优先级",
- "prefs_notifications_min_priority_default_and_higher": "默认优先级或更高优先级",
- "prefs_notifications_min_priority_high_and_higher": "高优先级或更高优先级",
+ "prefs_notifications_min_priority_default_and_higher": "默认优先级和更高优先级",
+ "prefs_notifications_min_priority_high_and_higher": "高优先级和更高优先级",
"prefs_notifications_min_priority_max_only": "仅最高优先级",
"prefs_notifications_delete_after_never": "从不",
"prefs_notifications_delete_after_one_month": "一月后",
@@ -186,6 +186,6 @@
"prefs_users_edit_button": "编辑用户",
"publish_dialog_tags_placeholder": "英文逗号分隔标记列表，例如 warning, srv1-backup",
"publish_dialog_details_examples_description": "有关所有发送功能的示例和详细说明，请参阅<docsLink>文档</docsLink>。",
- "subscribe_dialog_subscribe_description": "主题可能不受密码保护，因此请选择一个不容易猜测的名字。订阅后，您可以使用 PUT/POST 通知。",
+ "subscribe_dialog_subscribe_description": "主题可能不受密码保护，因此请选择一个不容易被猜中的名字。订阅后，您可以使用 PUT/POST 通知。",
"publish_dialog_delay_placeholder": "延期投递，例如 {{unixTimestamp}}、{{relativeTime}}或「{{naturalLanguage}}」（仅限英语）"
}
From 8956837443985d55e454e48dbb4407f715bc5daa Mon Sep 17 00:00:00 2001
From: Hunter Kehoe <hunter.kehoe@gmail.com>
Date: Sun, 31 Jul 2022 13:12:15 -0600
Subject: [PATCH 07/63] add default-user, default-password, and default-command
options to client.yml config
---
client/config.go | 14 ++++++++++----
client/config_test.go | 10 +++++++++-
cmd/subscribe.go | 27 ++++++++++++++++++++++++---
3 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/client/config.go b/client/config.go
index 0866cd1b..2bbe9d51 100644
--- a/client/config.go
+++ b/client/config.go
@@ -12,8 +12,11 @@ const (
// Config is the config struct for a Client
type Config struct {
- DefaultHost string `yaml:"default-host"`
- Subscribe []struct {
+ DefaultHost string `yaml:"default-host"`
+ DefaultUser string `yaml:"default-user"`
+ DefaultPassword string `yaml:"default-password"`
+ DefaultCommand string `yaml:"default-command"`
+ Subscribe []struct {
Topic string `yaml:"topic"`
User string `yaml:"user"`
Password string `yaml:"password"`
@@ -25,8 +28,11 @@ type Config struct {
// NewConfig creates a new Config struct for a Client
func NewConfig() *Config {
return &Config{
- DefaultHost: DefaultBaseURL,
- Subscribe: nil,
+ DefaultHost: DefaultBaseURL,
+ DefaultUser: "",
+ DefaultPassword: "",
+ DefaultCommand: "",
+ Subscribe: nil,
}
}
diff --git a/client/config_test.go b/client/config_test.go
index d601cdb4..240d5ac7 100644
--- a/client/config_test.go
+++ b/client/config_test.go
@@ -12,6 +12,9 @@ func TestConfig_Load(t *testing.T) {
filename := filepath.Join(t.TempDir(), "client.yml")
require.Nil(t, os.WriteFile(filename, []byte(`
default-host: http://localhost
+default-user: phil
+default-password: mypass
+default-command: 'echo "Got the message: $message"'
subscribe:
- topic: no-command-with-auth
user: phil
@@ -22,12 +25,16 @@ subscribe:
command: notify-send -i /usr/share/ntfy/logo.png "Important" "$m"
if:
priority: high,urgent
+ - topic: defaults
`), 0600))
conf, err := client.LoadConfig(filename)
require.Nil(t, err)
require.Equal(t, "http://localhost", conf.DefaultHost)
- require.Equal(t, 3, len(conf.Subscribe))
+ require.Equal(t, "phil", conf.DefaultUser)
+ require.Equal(t, "mypass", conf.DefaultPassword)
+ require.Equal(t, `echo "Got the message: $message"`, conf.DefaultCommand)
+ require.Equal(t, 4, len(conf.Subscribe))
require.Equal(t, "no-command-with-auth", conf.Subscribe[0].Topic)
require.Equal(t, "", conf.Subscribe[0].Command)
require.Equal(t, "phil", conf.Subscribe[0].User)
@@ -37,4 +44,5 @@ subscribe:
require.Equal(t, "alerts", conf.Subscribe[2].Topic)
require.Equal(t, `notify-send -i /usr/share/ntfy/logo.png "Important" "$m"`, conf.Subscribe[2].Command)
require.Equal(t, "high,urgent", conf.Subscribe[2].If["priority"])
+ require.Equal(t, "defaults", conf.Subscribe[3].Topic)
}
diff --git a/cmd/subscribe.go b/cmd/subscribe.go
index 94c11b4d..2c737870 100644
--- a/cmd/subscribe.go
+++ b/cmd/subscribe.go
@@ -175,11 +175,32 @@ func doSubscribe(c *cli.Context, cl *client.Client, conf *client.Config, topic,
for filter, value := range s.If {
topicOptions = append(topicOptions, client.WithFilter(filter, value))
}
- if s.User != "" && s.Password != "" {
- topicOptions = append(topicOptions, client.WithBasicAuth(s.User, s.Password))
+ var user, password string
+ if s.User != "" {
+ user = s.User
+ } else if conf.DefaultUser != "" {
+ user = conf.DefaultUser
+ } else {
+ user = ""
+ }
+ if s.Password != "" {
+ password = s.Password
+ } else if conf.DefaultPassword != "" {
+ password = conf.DefaultPassword
+ } else {
+ password = ""
+ }
+ if user != "" && password != "" {
+ topicOptions = append(topicOptions, client.WithBasicAuth(user, password))
}
subscriptionID := cl.Subscribe(s.Topic, topicOptions...)
- cmds[subscriptionID] = s.Command
+ if s.Command != "" {
+ cmds[subscriptionID] = s.Command
+ } else if conf.DefaultCommand != "" {
+ cmds[subscriptionID] = conf.DefaultCommand
+ } else {
+ cmds[subscriptionID] = ""
+ }
}
if topic != "" {
subscriptionID := cl.Subscribe(topic, options...)
From f6a42e7dcd8a0c9ee014dbad1d2d940d6fa19111 Mon Sep 17 00:00:00 2001
From: Hunter Kehoe <hunter.kehoe@gmail.com>
Date: Sun, 31 Jul 2022 16:40:07 -0600
Subject: [PATCH 08/63] add docs explaining default-user, default-password,
default-command
---
docs/subscribe/cli.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/docs/subscribe/cli.md b/docs/subscribe/cli.md
index 03d9132a..f1f9e760 100644
--- a/docs/subscribe/cli.md
+++ b/docs/subscribe/cli.md
@@ -254,6 +254,14 @@ I hope this shows how powerful this command is. Here's a short video that demons
<figcaption>Execute all the things</figcaption>
</figure>
+If most (or all) of your subscription usernames, passwords, and commands are the same, you can specify a `default-user`, `default-password`, and `default-command` at the top of the
+`client.yml`. If a subscription does not specify a username/password to use or does not have a command, the defaults will be used, otherwise, the subscription settings will
+override the defaults.
+
+!!! warning
+ Because the `default-user` and `default-password` will be sent for each topic that does not have its own username/password (even if the topic does not require authentication),
+ be sure that the servers/topics you subscribe to use HTTPS to prevent leaking the username and password.
+
### Using the systemd service
You can use the `ntfy-client` systemd service (see [ntfy-client.service](https://github.com/binwiederhier/ntfy/blob/main/client/ntfy-client.service))
to subscribe to multiple topics just like in the example above. The service is automatically installed (but not started)
From 613d5d554f766b8f9f815dc48b010aa29ea6e269 Mon Sep 17 00:00:00 2001
From: Hunter Kehoe <hunter.kehoe@gmail.com>
Date: Sun, 31 Jul 2022 16:46:56 -0600
Subject: [PATCH 09/63] add example config for default-user, default-password,
default-command
---
client/client.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/client/client.yml b/client/client.yml
index 56733a14..3cd5736c 100644
--- a/client/client.yml
+++ b/client/client.yml
@@ -5,6 +5,12 @@
#
# default-host: https://ntfy.sh
+# Defaults below will be used when a topic does not have its own settings
+#
+# default-user:
+# default-password:
+# default-command:
+
# Subscriptions to topics and their actions. This option is primarily used by the systemd service,
# or if you cann "ntfy subscribe --from-config" directly.
#
From a498e43d61f099c9d4d12aa2b20fc9974f6e5420 Mon Sep 17 00:00:00 2001
From: cyqsimon <28627918+cyqsimon@users.noreply.github.com>
Date: Tue, 2 Aug 2022 03:34:14 +0800
Subject: [PATCH 10/63] Move `COMMIT` into a variable so it could be overridden
if desired
---
Makefile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 932e720d..5cf44613 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
MAKEFLAGS := --jobs=1
VERSION := $(shell git describe --tag)
+COMMIT := $(shell git rev-parse --short HEAD)
.PHONY:
@@ -169,7 +170,7 @@ cli-linux-server: cli-deps-static-sites
-o dist/ntfy_linux_server/ntfy \
-tags sqlite_omit_load_extension,osusergo,netgo \
-ldflags \
- "-linkmode=external -extldflags=-static -s -w -X main.version=$(VERSION) -X main.commit=$(shell git rev-parse --short HEAD) -X main.date=$(shell date +%s)"
+ "-linkmode=external -extldflags=-static -s -w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(shell date +%s)"
cli-darwin-server: cli-deps-static-sites
# This is a target to build the CLI (including the server) manually.
@@ -179,7 +180,7 @@ cli-darwin-server: cli-deps-static-sites
-o dist/ntfy_darwin_server/ntfy \
-tags sqlite_omit_load_extension,osusergo,netgo \
-ldflags \
- "-linkmode=external -s -w -X main.version=$(VERSION) -X main.commit=$(shell git rev-parse --short HEAD) -X main.date=$(shell date +%s)"
+ "-linkmode=external -s -w -X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(shell date +%s)"
cli-client: cli-deps-static-sites
# This is a target to build the CLI (excluding the server) manually. This should work on Linux/macOS/Windows.
@@ -189,7 +190,7 @@ cli-client: cli-deps-static-sites
-o dist/ntfy_client/ntfy \
-tags noserver \
-ldflags \
- "-X main.version=$(VERSION) -X main.commit=$(shell git rev-parse --short HEAD) -X main.date=$(shell date +%s)"
+ "-X main.version=$(VERSION) -X main.commit=$(COMMIT) -X main.date=$(shell date +%s)"
cli-deps: cli-deps-static-sites cli-deps-all cli-deps-gcc
From e4c760f1ded95d04325591dfb6c065ff3e44b5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C5=A0r=C5=AFtek?=
<35694712+michalsrutek@users.noreply.github.com>
Date: Sun, 14 Aug 2022 14:29:24 +0200
Subject: [PATCH 11/63] Fix CLI address in README
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index dbcd0c61..4fa2f326 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ Made with ❤️ by [Philipp C. Heckel](https://heckel.io).
The project is dual licensed under the [Apache License 2.0](LICENSE) and the [GPLv2 License](LICENSE.GPLv2).
Third party libraries and resources:
-* [github.com/urfave/cli/v2](https://github.com/urfave/cli/v2) (MIT) is used to drive the CLI
+* [github.com/urfave/cli](https://github.com/urfave/cli) (MIT) is used to drive the CLI
* [Mixkit sounds](https://mixkit.co/free-sound-effects/notification/) (Mixkit Free License) are used as notification sounds
* [Sounds from notificationsounds.com](https://notificationsounds.com) (Creative Commons Attribution) are used as notification sounds
* [Roboto Font](https://fonts.google.com/specimen/Roboto) (Apache 2.0) is used as a font in everything web
From 08d717afbf8ab368d39340571e006c45fda9af69 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Thu, 18 Aug 2022 20:22:48 -0400
Subject: [PATCH 12/63] Bump deps
---
go.mod | 40 +-
go.sum | 50 +
web/package-lock.json | 5527 ++++++++++++++++++++---------------------
3 files changed, 2813 insertions(+), 2804 deletions(-)
diff --git a/go.mod b/go.mod
index a1ec1786..f4f3ceab 100644
--- a/go.mod
+++ b/go.mod
@@ -4,22 +4,22 @@ go 1.17
require (
cloud.google.com/go/firestore v1.6.1 // indirect
- cloud.google.com/go/storage v1.23.0 // indirect
- github.com/BurntSushi/toml v1.1.0 // indirect
+ cloud.google.com/go/storage v1.25.0 // indirect
+ github.com/BurntSushi/toml v1.2.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/emersion/go-smtp v0.15.0
- github.com/gabriel-vasile/mimetype v1.4.0
+ github.com/gabriel-vasile/mimetype v1.4.1
github.com/gorilla/websocket v1.5.0
- github.com/mattn/go-sqlite3 v1.14.13
+ github.com/mattn/go-sqlite3 v1.14.15
github.com/olebedev/when v0.0.0-20211212231525-59bd4edcf9d6
github.com/stretchr/testify v1.7.0
- github.com/urfave/cli/v2 v2.10.2
- golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
- golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect
- golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
- golang.org/x/term v0.0.0-20220526004731-065cf7ba2467
- golang.org/x/time v0.0.0-20220609170525-579cf78fd858
- google.golang.org/api v0.85.0
+ github.com/urfave/cli/v2 v2.11.2
+ golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8
+ golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7 // indirect
+ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
+ golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
+ golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9
+ google.golang.org/api v0.93.0
gopkg.in/yaml.v2 v2.4.0
)
@@ -28,8 +28,8 @@ require github.com/pkg/errors v0.9.1 // indirect
require firebase.google.com/go/v4 v4.8.0
require (
- cloud.google.com/go v0.102.1 // indirect
- cloud.google.com/go/compute v1.7.0 // indirect
+ cloud.google.com/go v0.103.0 // indirect
+ cloud.google.com/go/compute v1.9.0 // indirect
cloud.google.com/go/iam v0.3.0 // indirect
github.com/AlekSi/pointer v1.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
@@ -39,20 +39,20 @@ require (
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
- github.com/googleapis/gax-go/v2 v2.4.0 // indirect
+ github.com/googleapis/gax-go/v2 v2.5.1 // indirect
github.com/googleapis/go-type-adapters v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.opencensus.io v0.23.0 // indirect
- golang.org/x/net v0.0.0-20220622184535-263ec571b305 // indirect
- golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 // indirect
+ golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect
+ golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/appengine/v2 v2.0.1 // indirect
- google.golang.org/genproto v0.0.0-20220623142657-077d458a5694 // indirect
- google.golang.org/grpc v1.47.0 // indirect
- google.golang.org/protobuf v1.28.0 // indirect
+ google.golang.org/appengine/v2 v2.0.2 // indirect
+ google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1 // indirect
+ google.golang.org/grpc v1.48.0 // indirect
+ google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/go.sum b/go.sum
index 9dfe132d..8cd0b699 100644
--- a/go.sum
+++ b/go.sum
@@ -31,6 +31,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9
cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc=
cloud.google.com/go v0.102.1 h1:vpK6iQWv/2uUeFJth4/cBHsQAGjn1iIE6AAlxipRaA0=
cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU=
+cloud.google.com/go v0.103.0 h1:YXtxp9ymmZjlGzxV7VrYQ8aaQuAgcqxSy6YhDX4I458=
+cloud.google.com/go v0.103.0/go.mod h1:vwLx1nqLrzLX/fpwSMOXmFIqBOyHsvHbnAdbGSJ+mKk=
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
@@ -45,6 +47,10 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz
cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
cloud.google.com/go/compute v1.7.0 h1:v/k9Eueb8aAJ0vZuxKMrgm6kPhCLZU9HxFU+AFDs9Uk=
cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U=
+cloud.google.com/go/compute v1.8.0 h1:NLtR56/eKx9K1s2Tw/4hec2vsU1S3WeKRMj8HXbBo6E=
+cloud.google.com/go/compute v1.8.0/go.mod h1:boQ44qJsMqZjKzzsEkoJWQGj4h8ygmyk17UArClWzmg=
+cloud.google.com/go/compute v1.9.0 h1:ED/FP4xv8GJw63v556/ASNc1CeeLUO2Bs8nzaHchkHg=
+cloud.google.com/go/compute v1.9.0/go.mod h1:lWv1h/zUWTm/LozzfTJhBSkd6ShQq8la8VeeuOEGxfY=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
cloud.google.com/go/firestore v1.6.1 h1:8rBq3zRjnHx8UtBvaOWqBB1xq9jH6/wltfQLlTMh2Fw=
@@ -65,6 +71,8 @@ cloud.google.com/go/storage v1.21.0/go.mod h1:XmRlxkgPjlBONznT2dDUU/5XlpU2OjMnKu
cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y=
cloud.google.com/go/storage v1.23.0 h1:wWRIaDURQA8xxHguFCshYepGlrWIrbBnAmc7wfg07qY=
cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc=
+cloud.google.com/go/storage v1.25.0 h1:D2Dn0PslpK7Z3B2AvuUHyIC762bDbGJdlmQlCBR71os=
+cloud.google.com/go/storage v1.25.0/go.mod h1:Qys4JU+jeup3QnuKKAosWuxrD95C4MSqxfVDnSirDsI=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
firebase.google.com/go/v4 v4.8.0 h1:ooJqjFEh1G6DQ5+wyb/RAXAgku0E2RzJeH6WauSpWSo=
firebase.google.com/go/v4 v4.8.0/go.mod h1:y+j6xX7BgBco/XaN+YExIBVm6pzvYutheDV3nprvbWc=
@@ -74,6 +82,8 @@ github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tS
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
+github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@@ -115,6 +125,8 @@ github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/gabriel-vasile/mimetype v1.4.0 h1:Cn9dkdYsMIu56tGho+fqzh7XmvY2YyGU0FnbhiOsEro=
github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
+github.com/gabriel-vasile/mimetype v1.4.1 h1:TRWk7se+TOjCYgRth7+1/OYLNiRNIotknkFtf/dnN7Q=
+github.com/gabriel-vasile/mimetype v1.4.1/go.mod h1:05Vi0w3Y9c/lNvJOdmIwvrrAhX3rYhfQQCaf9VJcv7M=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -205,6 +217,8 @@ github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/Oth
github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
github.com/googleapis/gax-go/v2 v2.4.0 h1:dS9eYAjhrE2RjmzYw2XAPvcXfmcQLtFEQWn0CR82awk=
github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
+github.com/googleapis/gax-go/v2 v2.5.1 h1:kBRZU0PSuI7PspsSb/ChWoVResUcwNVIdpB049pKTiw=
+github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA=
github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
@@ -224,6 +238,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/mattn/go-sqlite3 v1.14.13 h1:1tj15ngiFfcZzii7yd82foL+ks+ouQcj8j/TPq3fk1I=
github.com/mattn/go-sqlite3 v1.14.13/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
+github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/olebedev/when v0.0.0-20211212231525-59bd4edcf9d6 h1:oDSPaYiL2dbjcArLrFS8ANtwgJMyOLzvQCZon+XmFsk=
github.com/olebedev/when v0.0.0-20211212231525-59bd4edcf9d6/go.mod h1:DPucAeQGDPUzYUt+NaWw6qsF5SFapWWToxEiVDh2aV0=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -246,6 +262,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
+github.com/urfave/cli/v2 v2.11.2 h1:FVfNg4m3vbjbBpLYxW//WjxUoHvJ9TlppXcqY9Q9ZfA=
+github.com/urfave/cli/v2 v2.11.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -269,6 +287,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c=
+golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -350,6 +370,10 @@ golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220622184535-263ec571b305 h1:dAgbJ2SP4jD6XYfMNLVj0BF21jo2PjChrtGaAvF5M3I=
golang.org/x/net v0.0.0-20220622184535-263ec571b305/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
+golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -373,6 +397,8 @@ golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 h1:+jnHzr9VPj32ykQVai5DNahi9+NSp7yYuCsl5eAQtL0=
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
+golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7 h1:dtndE8FcEta75/4kHF3AbpuWzV6f1LjnLrM4pe2SZrw=
+golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -386,6 +412,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -450,10 +478,17 @@ golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 h1:wEZYwx+kK+KlZ0hpvP2Ls1Xr4+RWnlzGFwPP0aiDjIU=
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8=
+golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 h1:Sx/u41w+OwrInGdEckYmEuU5gHoGSL4QbDz3S9s6j4U=
+golang.org/x/sys v0.0.0-20220818161305-2296e01440c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM=
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -469,6 +504,8 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U=
golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 h1:ftMN5LMiBFjbzleLqtoBZk7KdJwhuybIU+FckUHgoyQ=
+golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -574,6 +611,9 @@ google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3
google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o=
google.golang.org/api v0.85.0 h1:8rJoHuRxx+vCmZtAO/3k1dRLvYNVyTJtZ5oaFZvhgvc=
google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g=
+google.golang.org/api v0.86.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
+google.golang.org/api v0.93.0 h1:T2xt9gi0gHdxdnRkVQhT8mIvPaXKNsDNWz+L696M66M=
+google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -584,6 +624,8 @@ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/appengine/v2 v2.0.1 h1:jTGfiRmR5qoInpT3CXJ72GJEB4owDGEKN+xRDA6ekBY=
google.golang.org/appengine/v2 v2.0.1/go.mod h1:XgltgQxPOF3ShivrVrZyfvYCx8Dunh73bKjUuXUZb8Q=
+google.golang.org/appengine/v2 v2.0.2 h1:MSqyWy2shDLwG7chbwBJ5uMyw6SNqJzhJHNDwYB0Akk=
+google.golang.org/appengine/v2 v2.0.2/go.mod h1:PkgRUWz4o1XOvbqtWTkBtCitEJ5Tp4HoVEdMMYQR/8E=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -673,6 +715,10 @@ google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljW
google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
google.golang.org/genproto v0.0.0-20220623142657-077d458a5694 h1:itnFmgk4Ls5nT+mYO2ZK6F0DpKsGZLhB5BB9y5ZL2HA=
google.golang.org/genproto v0.0.0-20220623142657-077d458a5694/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1 h1:C2UVWqrgLYKrT5nh5oU6hLRm1AeEklCK5eloQA1NtFY=
+google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -705,6 +751,8 @@ google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu
google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w=
+google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -721,6 +769,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
diff --git a/web/package-lock.json b/web/package-lock.json
index 53991d3c..255c6be0 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -11,15 +11,15 @@
"@emotion/react": "^11.8.2",
"@emotion/styled": "^11.8.1",
"@mui/icons-material": "^5.4.2",
- "@mui/material": "*",
+ "@mui/material": "latest",
"dexie": "^3.2.1",
"dexie-react-hooks": "^1.1.1",
"i18next": "^21.6.14",
"i18next-browser-languagedetector": "^6.1.4",
"i18next-http-backend": "^1.4.0",
"js-base64": "^3.7.2",
- "react": "*",
- "react-dom": "*",
+ "react": "latest",
+ "react-dom": "latest",
"react-i18next": "^11.16.2",
"react-infinite-scroll-component": "^6.1.0",
"react-router-dom": "^6.2.2",
@@ -41,39 +41,39 @@
}
},
"node_modules/@babel/code-frame": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
- "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+ "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
"dependencies": {
- "@babel/highlight": "^7.16.7"
+ "@babel/highlight": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/compat-data": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.5.tgz",
- "integrity": "sha512-BxhE40PVCBxVEJsSBhB6UWyAuqJRxGsAw8BdHMJ3AKGydcwuWW4kOO3HmqBQAdcq/OP+/DlTVxLvsCzRTnZuGg==",
+ "version": "7.18.8",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz",
+ "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/core": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.5.tgz",
- "integrity": "sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz",
+ "integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==",
"dependencies": {
"@ampproject/remapping": "^2.1.0",
- "@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.18.2",
- "@babel/helper-compilation-targets": "^7.18.2",
- "@babel/helper-module-transforms": "^7.18.0",
- "@babel/helpers": "^7.18.2",
- "@babel/parser": "^7.18.5",
- "@babel/template": "^7.16.7",
- "@babel/traverse": "^7.18.5",
- "@babel/types": "^7.18.4",
+ "@babel/code-frame": "^7.18.6",
+ "@babel/generator": "^7.18.10",
+ "@babel/helper-compilation-targets": "^7.18.9",
+ "@babel/helper-module-transforms": "^7.18.9",
+ "@babel/helpers": "^7.18.9",
+ "@babel/parser": "^7.18.10",
+ "@babel/template": "^7.18.10",
+ "@babel/traverse": "^7.18.10",
+ "@babel/types": "^7.18.10",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -89,9 +89,9 @@
}
},
"node_modules/@babel/eslint-parser": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.2.tgz",
- "integrity": "sha512-oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.9.tgz",
+ "integrity": "sha512-KzSGpMBggz4fKbRbWLNyPVTuQr6cmCcBhOyXTw/fieOVaw5oYAwcAj4a7UKcDYCPxQq+CG1NCDZH9e2JTXquiQ==",
"dependencies": {
"eslint-scope": "^5.1.1",
"eslint-visitor-keys": "^2.1.0",
@@ -134,12 +134,12 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz",
- "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==",
+ "version": "7.18.12",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz",
+ "integrity": "sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==",
"dependencies": {
- "@babel/types": "^7.18.2",
- "@jridgewell/gen-mapping": "^0.3.0",
+ "@babel/types": "^7.18.10",
+ "@jridgewell/gen-mapping": "^0.3.2",
"jsesc": "^2.5.1"
},
"engines": {
@@ -147,11 +147,11 @@
}
},
"node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
- "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+ "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
"dependencies": {
- "@jridgewell/set-array": "^1.0.0",
+ "@jridgewell/set-array": "^1.0.1",
"@jridgewell/sourcemap-codec": "^1.4.10",
"@jridgewell/trace-mapping": "^0.3.9"
},
@@ -160,35 +160,35 @@
}
},
"node_modules/@babel/helper-annotate-as-pure": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
- "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+ "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
"dependencies": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
- "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
+ "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
"dependencies": {
- "@babel/helper-explode-assignable-expression": "^7.16.7",
- "@babel/types": "^7.16.7"
+ "@babel/helper-explode-assignable-expression": "^7.18.6",
+ "@babel/types": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-compilation-targets": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz",
- "integrity": "sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz",
+ "integrity": "sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==",
"dependencies": {
- "@babel/compat-data": "^7.17.10",
- "@babel/helper-validator-option": "^7.16.7",
+ "@babel/compat-data": "^7.18.8",
+ "@babel/helper-validator-option": "^7.18.6",
"browserslist": "^4.20.2",
"semver": "^6.3.0"
},
@@ -200,17 +200,17 @@
}
},
"node_modules/@babel/helper-create-class-features-plugin": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz",
- "integrity": "sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz",
+ "integrity": "sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "@babel/helper-environment-visitor": "^7.16.7",
- "@babel/helper-function-name": "^7.17.9",
- "@babel/helper-member-expression-to-functions": "^7.17.7",
- "@babel/helper-optimise-call-expression": "^7.16.7",
- "@babel/helper-replace-supers": "^7.16.7",
- "@babel/helper-split-export-declaration": "^7.16.7"
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-member-expression-to-functions": "^7.18.9",
+ "@babel/helper-optimise-call-expression": "^7.18.6",
+ "@babel/helper-replace-supers": "^7.18.9",
+ "@babel/helper-split-export-declaration": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -220,12 +220,12 @@
}
},
"node_modules/@babel/helper-create-regexp-features-plugin": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz",
- "integrity": "sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz",
+ "integrity": "sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "regexpu-core": "^5.0.1"
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "regexpu-core": "^5.1.0"
},
"engines": {
"node": ">=6.9.0"
@@ -235,14 +235,12 @@
}
},
"node_modules/@babel/helper-define-polyfill-provider": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
- "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz",
+ "integrity": "sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==",
"dependencies": {
- "@babel/helper-compilation-targets": "^7.13.0",
- "@babel/helper-module-imports": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/traverse": "^7.13.0",
+ "@babel/helper-compilation-targets": "^7.17.7",
+ "@babel/helper-plugin-utils": "^7.16.7",
"debug": "^4.1.1",
"lodash.debounce": "^4.0.8",
"resolve": "^1.14.2",
@@ -253,216 +251,228 @@
}
},
"node_modules/@babel/helper-environment-visitor": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz",
- "integrity": "sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+ "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-explode-assignable-expression": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
- "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
+ "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
"dependencies": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-function-name": {
- "version": "7.17.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
- "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz",
+ "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==",
"dependencies": {
- "@babel/template": "^7.16.7",
- "@babel/types": "^7.17.0"
+ "@babel/template": "^7.18.6",
+ "@babel/types": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-hoist-variables": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
- "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+ "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
"dependencies": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-member-expression-to-functions": {
- "version": "7.17.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
- "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
+ "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
"dependencies": {
- "@babel/types": "^7.17.0"
+ "@babel/types": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-module-imports": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
- "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+ "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
"dependencies": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-module-transforms": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz",
- "integrity": "sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz",
+ "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==",
"dependencies": {
- "@babel/helper-environment-visitor": "^7.16.7",
- "@babel/helper-module-imports": "^7.16.7",
- "@babel/helper-simple-access": "^7.17.7",
- "@babel/helper-split-export-declaration": "^7.16.7",
- "@babel/helper-validator-identifier": "^7.16.7",
- "@babel/template": "^7.16.7",
- "@babel/traverse": "^7.18.0",
- "@babel/types": "^7.18.0"
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-module-imports": "^7.18.6",
+ "@babel/helper-simple-access": "^7.18.6",
+ "@babel/helper-split-export-declaration": "^7.18.6",
+ "@babel/helper-validator-identifier": "^7.18.6",
+ "@babel/template": "^7.18.6",
+ "@babel/traverse": "^7.18.9",
+ "@babel/types": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-optimise-call-expression": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
- "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
+ "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
"dependencies": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-plugin-utils": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz",
- "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz",
+ "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-remap-async-to-generator": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
- "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
+ "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "@babel/helper-wrap-function": "^7.16.8",
- "@babel/types": "^7.16.8"
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-wrap-function": "^7.18.9",
+ "@babel/types": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
"node_modules/@babel/helper-replace-supers": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz",
- "integrity": "sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz",
+ "integrity": "sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==",
"dependencies": {
- "@babel/helper-environment-visitor": "^7.18.2",
- "@babel/helper-member-expression-to-functions": "^7.17.7",
- "@babel/helper-optimise-call-expression": "^7.16.7",
- "@babel/traverse": "^7.18.2",
- "@babel/types": "^7.18.2"
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-member-expression-to-functions": "^7.18.9",
+ "@babel/helper-optimise-call-expression": "^7.18.6",
+ "@babel/traverse": "^7.18.9",
+ "@babel/types": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-simple-access": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz",
- "integrity": "sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
+ "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
"dependencies": {
- "@babel/types": "^7.18.2"
+ "@babel/types": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-skip-transparent-expression-wrappers": {
- "version": "7.16.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
- "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz",
+ "integrity": "sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==",
"dependencies": {
- "@babel/types": "^7.16.0"
+ "@babel/types": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-split-export-declaration": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
- "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+ "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
"dependencies": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
}
},
+ "node_modules/@babel/helper-string-parser": {
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
+ "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==",
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
- "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
+ "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-validator-option": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
- "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+ "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helper-wrap-function": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
- "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
+ "version": "7.18.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz",
+ "integrity": "sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==",
"dependencies": {
- "@babel/helper-function-name": "^7.16.7",
- "@babel/template": "^7.16.7",
- "@babel/traverse": "^7.16.8",
- "@babel/types": "^7.16.8"
+ "@babel/helper-function-name": "^7.18.9",
+ "@babel/template": "^7.18.10",
+ "@babel/traverse": "^7.18.11",
+ "@babel/types": "^7.18.10"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helpers": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz",
- "integrity": "sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz",
+ "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==",
"dependencies": {
- "@babel/template": "^7.16.7",
- "@babel/traverse": "^7.18.2",
- "@babel/types": "^7.18.2"
+ "@babel/template": "^7.18.6",
+ "@babel/traverse": "^7.18.9",
+ "@babel/types": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/highlight": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
- "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+ "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
"dependencies": {
- "@babel/helper-validator-identifier": "^7.16.7",
+ "@babel/helper-validator-identifier": "^7.18.6",
"chalk": "^2.0.0",
"js-tokens": "^4.0.0"
},
@@ -471,9 +481,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.5.tgz",
- "integrity": "sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw==",
+ "version": "7.18.11",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz",
+ "integrity": "sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==",
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -482,11 +492,11 @@
}
},
"node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz",
- "integrity": "sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
+ "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -496,13 +506,13 @@
}
},
"node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz",
- "integrity": "sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
+ "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
- "@babel/plugin-proposal-optional-chaining": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+ "@babel/plugin-proposal-optional-chaining": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
@@ -512,12 +522,13 @@
}
},
"node_modules/@babel/plugin-proposal-async-generator-functions": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz",
- "integrity": "sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz",
+ "integrity": "sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-remap-async-to-generator": "^7.16.8",
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-remap-async-to-generator": "^7.18.9",
"@babel/plugin-syntax-async-generators": "^7.8.4"
},
"engines": {
@@ -528,12 +539,12 @@
}
},
"node_modules/@babel/plugin-proposal-class-properties": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz",
- "integrity": "sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+ "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.17.12",
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-create-class-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -543,12 +554,12 @@
}
},
"node_modules/@babel/plugin-proposal-class-static-block": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz",
- "integrity": "sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
+ "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-create-class-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-class-static-block": "^7.14.5"
},
"engines": {
@@ -559,16 +570,15 @@
}
},
"node_modules/@babel/plugin-proposal-decorators": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.2.tgz",
- "integrity": "sha512-kbDISufFOxeczi0v4NQP3p5kIeW6izn/6klfWBrIIdGZZe4UpHR+QU03FAoWjGGd9SUXAwbw2pup1kaL4OQsJQ==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.10.tgz",
+ "integrity": "sha512-wdGTwWF5QtpTY/gbBtQLAiCnoxfD4qMbN87NYZle1dOZ9Os8Y6zXcKrIaOU8W+TIvFUWVGG9tUgNww3CjXRVVw==",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-replace-supers": "^7.18.2",
- "@babel/helper-split-export-declaration": "^7.16.7",
- "@babel/plugin-syntax-decorators": "^7.17.12",
- "charcodes": "^0.2.0"
+ "@babel/helper-create-class-features-plugin": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-replace-supers": "^7.18.9",
+ "@babel/helper-split-export-declaration": "^7.18.6",
+ "@babel/plugin-syntax-decorators": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -578,11 +588,11 @@
}
},
"node_modules/@babel/plugin-proposal-dynamic-import": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
- "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
+ "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.16.7",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-dynamic-import": "^7.8.3"
},
"engines": {
@@ -593,11 +603,11 @@
}
},
"node_modules/@babel/plugin-proposal-export-namespace-from": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz",
- "integrity": "sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
+ "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-plugin-utils": "^7.18.9",
"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
},
"engines": {
@@ -608,11 +618,11 @@
}
},
"node_modules/@babel/plugin-proposal-json-strings": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz",
- "integrity": "sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
+ "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-json-strings": "^7.8.3"
},
"engines": {
@@ -623,11 +633,11 @@
}
},
"node_modules/@babel/plugin-proposal-logical-assignment-operators": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz",
- "integrity": "sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
+ "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-plugin-utils": "^7.18.9",
"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
},
"engines": {
@@ -638,11 +648,11 @@
}
},
"node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz",
- "integrity": "sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+ "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
},
"engines": {
@@ -653,11 +663,11 @@
}
},
"node_modules/@babel/plugin-proposal-numeric-separator": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
- "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+ "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.16.7",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-numeric-separator": "^7.10.4"
},
"engines": {
@@ -668,15 +678,15 @@
}
},
"node_modules/@babel/plugin-proposal-object-rest-spread": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz",
- "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz",
+ "integrity": "sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==",
"dependencies": {
- "@babel/compat-data": "^7.17.10",
- "@babel/helper-compilation-targets": "^7.17.10",
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/compat-data": "^7.18.8",
+ "@babel/helper-compilation-targets": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9",
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
- "@babel/plugin-transform-parameters": "^7.17.12"
+ "@babel/plugin-transform-parameters": "^7.18.8"
},
"engines": {
"node": ">=6.9.0"
@@ -686,11 +696,11 @@
}
},
"node_modules/@babel/plugin-proposal-optional-catch-binding": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
- "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
+ "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.16.7",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
},
"engines": {
@@ -701,12 +711,12 @@
}
},
"node_modules/@babel/plugin-proposal-optional-chaining": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz",
- "integrity": "sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
+ "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
"@babel/plugin-syntax-optional-chaining": "^7.8.3"
},
"engines": {
@@ -717,12 +727,12 @@
}
},
"node_modules/@babel/plugin-proposal-private-methods": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz",
- "integrity": "sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+ "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.17.12",
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-create-class-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -732,13 +742,13 @@
}
},
"node_modules/@babel/plugin-proposal-private-property-in-object": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz",
- "integrity": "sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
+ "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "@babel/helper-create-class-features-plugin": "^7.17.12",
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-create-class-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
},
"engines": {
@@ -749,12 +759,12 @@
}
},
"node_modules/@babel/plugin-proposal-unicode-property-regex": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz",
- "integrity": "sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+ "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.17.12",
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=4"
@@ -811,11 +821,11 @@
}
},
"node_modules/@babel/plugin-syntax-decorators": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.12.tgz",
- "integrity": "sha512-D1Hz0qtGTza8K2xGyEdVNCYLdVHukAcbQr4K3/s6r/esadyEriZovpJimQOpu8ju4/jV8dW/1xdaE0UpDroidw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz",
+ "integrity": "sha512-fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -847,11 +857,11 @@
}
},
"node_modules/@babel/plugin-syntax-flow": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.17.12.tgz",
- "integrity": "sha512-B8QIgBvkIG6G2jgsOHQUist7Sm0EBLDCx8sen072IwqNuzMegZNXrYnSv77cYzA8mLDZAfQYqsLIhimiP1s2HQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz",
+ "integrity": "sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -861,11 +871,11 @@
}
},
"node_modules/@babel/plugin-syntax-import-assertions": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz",
- "integrity": "sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz",
+ "integrity": "sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -897,11 +907,11 @@
}
},
"node_modules/@babel/plugin-syntax-jsx": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz",
- "integrity": "sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
+ "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1005,11 +1015,11 @@
}
},
"node_modules/@babel/plugin-syntax-typescript": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz",
- "integrity": "sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz",
+ "integrity": "sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1019,11 +1029,11 @@
}
},
"node_modules/@babel/plugin-transform-arrow-functions": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz",
- "integrity": "sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
+ "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1033,13 +1043,13 @@
}
},
"node_modules/@babel/plugin-transform-async-to-generator": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz",
- "integrity": "sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
+ "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
"dependencies": {
- "@babel/helper-module-imports": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-remap-async-to-generator": "^7.16.8"
+ "@babel/helper-module-imports": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6",
+ "@babel/helper-remap-async-to-generator": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1049,11 +1059,11 @@
}
},
"node_modules/@babel/plugin-transform-block-scoped-functions": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
- "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
+ "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1063,11 +1073,11 @@
}
},
"node_modules/@babel/plugin-transform-block-scoping": {
- "version": "7.18.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz",
- "integrity": "sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz",
+ "integrity": "sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1077,17 +1087,17 @@
}
},
"node_modules/@babel/plugin-transform-classes": {
- "version": "7.18.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz",
- "integrity": "sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz",
+ "integrity": "sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "@babel/helper-environment-visitor": "^7.18.2",
- "@babel/helper-function-name": "^7.17.9",
- "@babel/helper-optimise-call-expression": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-replace-supers": "^7.18.2",
- "@babel/helper-split-export-declaration": "^7.16.7",
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-optimise-call-expression": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-replace-supers": "^7.18.9",
+ "@babel/helper-split-export-declaration": "^7.18.6",
"globals": "^11.1.0"
},
"engines": {
@@ -1098,11 +1108,11 @@
}
},
"node_modules/@babel/plugin-transform-computed-properties": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz",
- "integrity": "sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
+ "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1112,11 +1122,11 @@
}
},
"node_modules/@babel/plugin-transform-destructuring": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz",
- "integrity": "sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz",
+ "integrity": "sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1126,12 +1136,12 @@
}
},
"node_modules/@babel/plugin-transform-dotall-regex": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
- "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
+ "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1141,11 +1151,11 @@
}
},
"node_modules/@babel/plugin-transform-duplicate-keys": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz",
- "integrity": "sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
+ "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1155,12 +1165,12 @@
}
},
"node_modules/@babel/plugin-transform-exponentiation-operator": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
- "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
+ "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
"dependencies": {
- "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1170,12 +1180,12 @@
}
},
"node_modules/@babel/plugin-transform-flow-strip-types": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.17.12.tgz",
- "integrity": "sha512-g8cSNt+cHCpG/uunPQELdq/TeV3eg1OLJYwxypwHtAWo9+nErH3lQx9CSO2uI9lF74A0mR0t4KoMjs1snSgnTw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.18.9.tgz",
+ "integrity": "sha512-+G6rp2zRuOAInY5wcggsx4+QVao1qPM0osC9fTUVlAV3zOrzTCnrMAFVnR6+a3T8wz1wFIH7KhYMcMB3u1n80A==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/plugin-syntax-flow": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/plugin-syntax-flow": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1185,11 +1195,11 @@
}
},
"node_modules/@babel/plugin-transform-for-of": {
- "version": "7.18.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz",
- "integrity": "sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==",
+ "version": "7.18.8",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
+ "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1199,13 +1209,13 @@
}
},
"node_modules/@babel/plugin-transform-function-name": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
- "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
+ "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
"dependencies": {
- "@babel/helper-compilation-targets": "^7.16.7",
- "@babel/helper-function-name": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-compilation-targets": "^7.18.9",
+ "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1215,11 +1225,11 @@
}
},
"node_modules/@babel/plugin-transform-literals": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz",
- "integrity": "sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
+ "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1229,11 +1239,11 @@
}
},
"node_modules/@babel/plugin-transform-member-expression-literals": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
- "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
+ "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1243,12 +1253,12 @@
}
},
"node_modules/@babel/plugin-transform-modules-amd": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz",
- "integrity": "sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz",
+ "integrity": "sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==",
"dependencies": {
- "@babel/helper-module-transforms": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-module-transforms": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6",
"babel-plugin-dynamic-import-node": "^2.3.3"
},
"engines": {
@@ -1259,13 +1269,13 @@
}
},
"node_modules/@babel/plugin-transform-modules-commonjs": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz",
- "integrity": "sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz",
+ "integrity": "sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==",
"dependencies": {
- "@babel/helper-module-transforms": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-simple-access": "^7.18.2",
+ "@babel/helper-module-transforms": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6",
+ "@babel/helper-simple-access": "^7.18.6",
"babel-plugin-dynamic-import-node": "^2.3.3"
},
"engines": {
@@ -1276,14 +1286,14 @@
}
},
"node_modules/@babel/plugin-transform-modules-systemjs": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.5.tgz",
- "integrity": "sha512-SEewrhPpcqMF1V7DhnEbhVJLrC+nnYfe1E0piZMZXBpxi9WvZqWGwpsk7JYP7wPWeqaBh4gyKlBhHJu3uz5g4Q==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz",
+ "integrity": "sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==",
"dependencies": {
- "@babel/helper-hoist-variables": "^7.16.7",
- "@babel/helper-module-transforms": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-validator-identifier": "^7.16.7",
+ "@babel/helper-hoist-variables": "^7.18.6",
+ "@babel/helper-module-transforms": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-validator-identifier": "^7.18.6",
"babel-plugin-dynamic-import-node": "^2.3.3"
},
"engines": {
@@ -1294,12 +1304,12 @@
}
},
"node_modules/@babel/plugin-transform-modules-umd": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz",
- "integrity": "sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
+ "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
"dependencies": {
- "@babel/helper-module-transforms": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-module-transforms": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1309,12 +1319,12 @@
}
},
"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz",
- "integrity": "sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz",
+ "integrity": "sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.17.12",
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1324,11 +1334,11 @@
}
},
"node_modules/@babel/plugin-transform-new-target": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.5.tgz",
- "integrity": "sha512-TuRL5uGW4KXU6OsRj+mLp9BM7pO8e7SGNTEokQRRxHFkXYMFiy2jlKSZPFtI/mKORDzciH+hneskcSOp0gU8hg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
+ "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1338,12 +1348,12 @@
}
},
"node_modules/@babel/plugin-transform-object-super": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
- "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
+ "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.16.7",
- "@babel/helper-replace-supers": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6",
+ "@babel/helper-replace-supers": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1353,11 +1363,11 @@
}
},
"node_modules/@babel/plugin-transform-parameters": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz",
- "integrity": "sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==",
+ "version": "7.18.8",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
+ "integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1367,11 +1377,11 @@
}
},
"node_modules/@babel/plugin-transform-property-literals": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
- "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
+ "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1381,11 +1391,11 @@
}
},
"node_modules/@babel/plugin-transform-react-constant-elements": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.17.12.tgz",
- "integrity": "sha512-maEkX2xs2STuv2Px8QuqxqjhV2LsFobT1elCgyU5704fcyTu9DyD/bJXxD/mrRiVyhpHweOQ00OJ5FKhHq9oEw==",
+ "version": "7.18.12",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.18.12.tgz",
+ "integrity": "sha512-Q99U9/ttiu+LMnRU8psd23HhvwXmKWDQIpocm0JKaICcZHnw+mdQbHm6xnSy7dOl8I5PELakYtNBubNQlBXbZw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1395,11 +1405,11 @@
}
},
"node_modules/@babel/plugin-transform-react-display-name": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz",
- "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz",
+ "integrity": "sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1409,15 +1419,15 @@
}
},
"node_modules/@babel/plugin-transform-react-jsx": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz",
- "integrity": "sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.10.tgz",
+ "integrity": "sha512-gCy7Iikrpu3IZjYZolFE4M1Sm+nrh1/6za2Ewj77Z+XirT4TsbJcvOFOyF+fRPwU6AKKK136CZxx6L8AbSFG6A==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "@babel/helper-module-imports": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/plugin-syntax-jsx": "^7.17.12",
- "@babel/types": "^7.17.12"
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-module-imports": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/plugin-syntax-jsx": "^7.18.6",
+ "@babel/types": "^7.18.10"
},
"engines": {
"node": ">=6.9.0"
@@ -1427,11 +1437,11 @@
}
},
"node_modules/@babel/plugin-transform-react-jsx-development": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz",
- "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz",
+ "integrity": "sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==",
"dependencies": {
- "@babel/plugin-transform-react-jsx": "^7.16.7"
+ "@babel/plugin-transform-react-jsx": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1441,12 +1451,12 @@
}
},
"node_modules/@babel/plugin-transform-react-pure-annotations": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.0.tgz",
- "integrity": "sha512-6+0IK6ouvqDn9bmEG7mEyF/pwlJXVj5lwydybpyyH3D0A7Hftk+NCTdYjnLNZksn261xaOV5ksmp20pQEmc2RQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz",
+ "integrity": "sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==",
"dependencies": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1456,11 +1466,11 @@
}
},
"node_modules/@babel/plugin-transform-regenerator": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz",
- "integrity": "sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
+ "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-plugin-utils": "^7.18.6",
"regenerator-transform": "^0.15.0"
},
"engines": {
@@ -1471,11 +1481,11 @@
}
},
"node_modules/@babel/plugin-transform-reserved-words": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz",
- "integrity": "sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
+ "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1485,15 +1495,15 @@
}
},
"node_modules/@babel/plugin-transform-runtime": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.5.tgz",
- "integrity": "sha512-Q17hHxXr2fplrE+5BSC1j1Fo5cOA8YeP8XW3/1paI8MzF/faZGh0MaH1KC4jLAvqLPamQWHB5/B7KqSLY1kuHA==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz",
+ "integrity": "sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ==",
"dependencies": {
- "@babel/helper-module-imports": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.17.12",
- "babel-plugin-polyfill-corejs2": "^0.3.0",
- "babel-plugin-polyfill-corejs3": "^0.5.0",
- "babel-plugin-polyfill-regenerator": "^0.3.0",
+ "@babel/helper-module-imports": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "babel-plugin-polyfill-corejs2": "^0.3.2",
+ "babel-plugin-polyfill-corejs3": "^0.5.3",
+ "babel-plugin-polyfill-regenerator": "^0.4.0",
"semver": "^6.3.0"
},
"engines": {
@@ -1504,11 +1514,11 @@
}
},
"node_modules/@babel/plugin-transform-shorthand-properties": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
- "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
+ "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1518,12 +1528,12 @@
}
},
"node_modules/@babel/plugin-transform-spread": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz",
- "integrity": "sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz",
+ "integrity": "sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1533,11 +1543,11 @@
}
},
"node_modules/@babel/plugin-transform-sticky-regex": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
- "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
+ "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1547,11 +1557,11 @@
}
},
"node_modules/@babel/plugin-transform-template-literals": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz",
- "integrity": "sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
+ "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1561,11 +1571,11 @@
}
},
"node_modules/@babel/plugin-transform-typeof-symbol": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz",
- "integrity": "sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
+ "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1575,13 +1585,13 @@
}
},
"node_modules/@babel/plugin-transform-typescript": {
- "version": "7.18.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz",
- "integrity": "sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==",
+ "version": "7.18.12",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.12.tgz",
+ "integrity": "sha512-2vjjam0cum0miPkenUbQswKowuxs/NjMwIKEq0zwegRxXk12C9YOF9STXnaUptITOtOJHKHpzvvWYOjbm6tc0w==",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/plugin-syntax-typescript": "^7.17.12"
+ "@babel/helper-create-class-features-plugin": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/plugin-syntax-typescript": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1591,11 +1601,11 @@
}
},
"node_modules/@babel/plugin-transform-unicode-escapes": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
- "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
+ "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.9"
},
"engines": {
"node": ">=6.9.0"
@@ -1605,12 +1615,12 @@
}
},
"node_modules/@babel/plugin-transform-unicode-regex": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
- "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
+ "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1620,37 +1630,37 @@
}
},
"node_modules/@babel/preset-env": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz",
- "integrity": "sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz",
+ "integrity": "sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==",
"dependencies": {
- "@babel/compat-data": "^7.17.10",
- "@babel/helper-compilation-targets": "^7.18.2",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-validator-option": "^7.16.7",
- "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12",
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12",
- "@babel/plugin-proposal-async-generator-functions": "^7.17.12",
- "@babel/plugin-proposal-class-properties": "^7.17.12",
- "@babel/plugin-proposal-class-static-block": "^7.18.0",
- "@babel/plugin-proposal-dynamic-import": "^7.16.7",
- "@babel/plugin-proposal-export-namespace-from": "^7.17.12",
- "@babel/plugin-proposal-json-strings": "^7.17.12",
- "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12",
- "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
- "@babel/plugin-proposal-numeric-separator": "^7.16.7",
- "@babel/plugin-proposal-object-rest-spread": "^7.18.0",
- "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
- "@babel/plugin-proposal-optional-chaining": "^7.17.12",
- "@babel/plugin-proposal-private-methods": "^7.17.12",
- "@babel/plugin-proposal-private-property-in-object": "^7.17.12",
- "@babel/plugin-proposal-unicode-property-regex": "^7.17.12",
+ "@babel/compat-data": "^7.18.8",
+ "@babel/helper-compilation-targets": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-validator-option": "^7.18.6",
+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
+ "@babel/plugin-proposal-async-generator-functions": "^7.18.10",
+ "@babel/plugin-proposal-class-properties": "^7.18.6",
+ "@babel/plugin-proposal-class-static-block": "^7.18.6",
+ "@babel/plugin-proposal-dynamic-import": "^7.18.6",
+ "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+ "@babel/plugin-proposal-json-strings": "^7.18.6",
+ "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
+ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+ "@babel/plugin-proposal-numeric-separator": "^7.18.6",
+ "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
+ "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
+ "@babel/plugin-proposal-optional-chaining": "^7.18.9",
+ "@babel/plugin-proposal-private-methods": "^7.18.6",
+ "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
+ "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
"@babel/plugin-syntax-async-generators": "^7.8.4",
"@babel/plugin-syntax-class-properties": "^7.12.13",
"@babel/plugin-syntax-class-static-block": "^7.14.5",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
- "@babel/plugin-syntax-import-assertions": "^7.17.12",
+ "@babel/plugin-syntax-import-assertions": "^7.18.6",
"@babel/plugin-syntax-json-strings": "^7.8.3",
"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -1660,43 +1670,43 @@
"@babel/plugin-syntax-optional-chaining": "^7.8.3",
"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
"@babel/plugin-syntax-top-level-await": "^7.14.5",
- "@babel/plugin-transform-arrow-functions": "^7.17.12",
- "@babel/plugin-transform-async-to-generator": "^7.17.12",
- "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
- "@babel/plugin-transform-block-scoping": "^7.17.12",
- "@babel/plugin-transform-classes": "^7.17.12",
- "@babel/plugin-transform-computed-properties": "^7.17.12",
- "@babel/plugin-transform-destructuring": "^7.18.0",
- "@babel/plugin-transform-dotall-regex": "^7.16.7",
- "@babel/plugin-transform-duplicate-keys": "^7.17.12",
- "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
- "@babel/plugin-transform-for-of": "^7.18.1",
- "@babel/plugin-transform-function-name": "^7.16.7",
- "@babel/plugin-transform-literals": "^7.17.12",
- "@babel/plugin-transform-member-expression-literals": "^7.16.7",
- "@babel/plugin-transform-modules-amd": "^7.18.0",
- "@babel/plugin-transform-modules-commonjs": "^7.18.2",
- "@babel/plugin-transform-modules-systemjs": "^7.18.0",
- "@babel/plugin-transform-modules-umd": "^7.18.0",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12",
- "@babel/plugin-transform-new-target": "^7.17.12",
- "@babel/plugin-transform-object-super": "^7.16.7",
- "@babel/plugin-transform-parameters": "^7.17.12",
- "@babel/plugin-transform-property-literals": "^7.16.7",
- "@babel/plugin-transform-regenerator": "^7.18.0",
- "@babel/plugin-transform-reserved-words": "^7.17.12",
- "@babel/plugin-transform-shorthand-properties": "^7.16.7",
- "@babel/plugin-transform-spread": "^7.17.12",
- "@babel/plugin-transform-sticky-regex": "^7.16.7",
- "@babel/plugin-transform-template-literals": "^7.18.2",
- "@babel/plugin-transform-typeof-symbol": "^7.17.12",
- "@babel/plugin-transform-unicode-escapes": "^7.16.7",
- "@babel/plugin-transform-unicode-regex": "^7.16.7",
+ "@babel/plugin-transform-arrow-functions": "^7.18.6",
+ "@babel/plugin-transform-async-to-generator": "^7.18.6",
+ "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
+ "@babel/plugin-transform-block-scoping": "^7.18.9",
+ "@babel/plugin-transform-classes": "^7.18.9",
+ "@babel/plugin-transform-computed-properties": "^7.18.9",
+ "@babel/plugin-transform-destructuring": "^7.18.9",
+ "@babel/plugin-transform-dotall-regex": "^7.18.6",
+ "@babel/plugin-transform-duplicate-keys": "^7.18.9",
+ "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
+ "@babel/plugin-transform-for-of": "^7.18.8",
+ "@babel/plugin-transform-function-name": "^7.18.9",
+ "@babel/plugin-transform-literals": "^7.18.9",
+ "@babel/plugin-transform-member-expression-literals": "^7.18.6",
+ "@babel/plugin-transform-modules-amd": "^7.18.6",
+ "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+ "@babel/plugin-transform-modules-systemjs": "^7.18.9",
+ "@babel/plugin-transform-modules-umd": "^7.18.6",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.18.6",
+ "@babel/plugin-transform-new-target": "^7.18.6",
+ "@babel/plugin-transform-object-super": "^7.18.6",
+ "@babel/plugin-transform-parameters": "^7.18.8",
+ "@babel/plugin-transform-property-literals": "^7.18.6",
+ "@babel/plugin-transform-regenerator": "^7.18.6",
+ "@babel/plugin-transform-reserved-words": "^7.18.6",
+ "@babel/plugin-transform-shorthand-properties": "^7.18.6",
+ "@babel/plugin-transform-spread": "^7.18.9",
+ "@babel/plugin-transform-sticky-regex": "^7.18.6",
+ "@babel/plugin-transform-template-literals": "^7.18.9",
+ "@babel/plugin-transform-typeof-symbol": "^7.18.9",
+ "@babel/plugin-transform-unicode-escapes": "^7.18.10",
+ "@babel/plugin-transform-unicode-regex": "^7.18.6",
"@babel/preset-modules": "^0.1.5",
- "@babel/types": "^7.18.2",
- "babel-plugin-polyfill-corejs2": "^0.3.0",
- "babel-plugin-polyfill-corejs3": "^0.5.0",
- "babel-plugin-polyfill-regenerator": "^0.3.0",
+ "@babel/types": "^7.18.10",
+ "babel-plugin-polyfill-corejs2": "^0.3.2",
+ "babel-plugin-polyfill-corejs3": "^0.5.3",
+ "babel-plugin-polyfill-regenerator": "^0.4.0",
"core-js-compat": "^3.22.1",
"semver": "^6.3.0"
},
@@ -1723,16 +1733,16 @@
}
},
"node_modules/@babel/preset-react": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.17.12.tgz",
- "integrity": "sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz",
+ "integrity": "sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-validator-option": "^7.16.7",
- "@babel/plugin-transform-react-display-name": "^7.16.7",
- "@babel/plugin-transform-react-jsx": "^7.17.12",
- "@babel/plugin-transform-react-jsx-development": "^7.16.7",
- "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6",
+ "@babel/helper-validator-option": "^7.18.6",
+ "@babel/plugin-transform-react-display-name": "^7.18.6",
+ "@babel/plugin-transform-react-jsx": "^7.18.6",
+ "@babel/plugin-transform-react-jsx-development": "^7.18.6",
+ "@babel/plugin-transform-react-pure-annotations": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1742,13 +1752,13 @@
}
},
"node_modules/@babel/preset-typescript": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz",
- "integrity": "sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz",
+ "integrity": "sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-validator-option": "^7.16.7",
- "@babel/plugin-transform-typescript": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6",
+ "@babel/helper-validator-option": "^7.18.6",
+ "@babel/plugin-transform-typescript": "^7.18.6"
},
"engines": {
"node": ">=6.9.0"
@@ -1758,9 +1768,9 @@
}
},
"node_modules/@babel/runtime": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",
- "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
+ "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
"dependencies": {
"regenerator-runtime": "^0.13.4"
},
@@ -1769,9 +1779,9 @@
}
},
"node_modules/@babel/runtime-corejs3": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.3.tgz",
- "integrity": "sha512-l4ddFwrc9rnR+EJsHsh+TJ4A35YqQz/UqcjtlX2ov53hlJYG5CxtQmNZxyajwDVmCxwy++rtvGU5HazCK4W41Q==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.9.tgz",
+ "integrity": "sha512-qZEWeccZCrHA2Au4/X05QW5CMdm4VjUDCrGq5gf1ZDcM4hRqreKrtwAn7yci9zfgAS9apvnsFXiGBHBAxZdK9A==",
"dependencies": {
"core-js-pure": "^3.20.2",
"regenerator-runtime": "^0.13.4"
@@ -1781,31 +1791,31 @@
}
},
"node_modules/@babel/template": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
- "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+ "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
"dependencies": {
- "@babel/code-frame": "^7.16.7",
- "@babel/parser": "^7.16.7",
- "@babel/types": "^7.16.7"
+ "@babel/code-frame": "^7.18.6",
+ "@babel/parser": "^7.18.10",
+ "@babel/types": "^7.18.10"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/traverse": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.5.tgz",
- "integrity": "sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==",
+ "version": "7.18.11",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz",
+ "integrity": "sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==",
"dependencies": {
- "@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.18.2",
- "@babel/helper-environment-visitor": "^7.18.2",
- "@babel/helper-function-name": "^7.17.9",
- "@babel/helper-hoist-variables": "^7.16.7",
- "@babel/helper-split-export-declaration": "^7.16.7",
- "@babel/parser": "^7.18.5",
- "@babel/types": "^7.18.4",
+ "@babel/code-frame": "^7.18.6",
+ "@babel/generator": "^7.18.10",
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-hoist-variables": "^7.18.6",
+ "@babel/helper-split-export-declaration": "^7.18.6",
+ "@babel/parser": "^7.18.11",
+ "@babel/types": "^7.18.10",
"debug": "^4.1.0",
"globals": "^11.1.0"
},
@@ -1814,11 +1824,12 @@
}
},
"node_modules/@babel/types": {
- "version": "7.18.4",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz",
- "integrity": "sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
+ "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
"dependencies": {
- "@babel/helper-validator-identifier": "^7.16.7",
+ "@babel/helper-string-parser": "^7.18.10",
+ "@babel/helper-validator-identifier": "^7.18.6",
"to-fast-properties": "^2.0.0"
},
"engines": {
@@ -1836,11 +1847,11 @@
"integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg=="
},
"node_modules/@csstools/postcss-cascade-layers": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.0.4.tgz",
- "integrity": "sha512-zP2tQIFu4C3HueOT+G4Pkla7f2Z6pfXphc1Y9wDE5jS2Ss6dk/asQ7FFEFWKgy3EkYc7E1FSjzhfeZVGg5sjXQ==",
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.0.5.tgz",
+ "integrity": "sha512-Id/9wBT7FkgFzdEpiEWrsVd4ltDxN0rI0QS0SChbeQiSuux3z21SJCRLu6h2cvCEUmaRi+VD0mHFj+GJD4GFnw==",
"dependencies": {
- "@csstools/selector-specificity": "^2.0.0",
+ "@csstools/selector-specificity": "^2.0.2",
"postcss-selector-parser": "^6.0.10"
},
"engines": {
@@ -1855,9 +1866,9 @@
}
},
"node_modules/@csstools/postcss-color-function": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.0.tgz",
- "integrity": "sha512-5D5ND/mZWcQoSfYnSPsXtuiFxhzmhxt6pcjrFLJyldj+p0ZN2vvRpYNX+lahFTtMhAYOa2WmkdGINr0yP0CvGA==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
+ "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
"dependencies": {
"@csstools/postcss-progressive-custom-properties": "^1.1.0",
"postcss-value-parser": "^4.2.0"
@@ -1870,27 +1881,13 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
}
},
"node_modules/@csstools/postcss-font-format-keywords": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.0.tgz",
- "integrity": "sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q==",
- "dependencies": {
- "postcss-value-parser": "^4.2.0"
- },
- "engines": {
- "node": "^12 || ^14 || >=16"
- },
- "peerDependencies": {
- "postcss": "^8.3"
- }
- },
- "node_modules/@csstools/postcss-hwb-function": {
"version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.1.tgz",
- "integrity": "sha512-AMZwWyHbbNLBsDADWmoXT9A5yl5dsGEBeJSJRUJt8Y9n8Ziu7Wstt4MC8jtPW7xjcLecyfJwtnUTNSmOzcnWeg==",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
+ "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
"dependencies": {
"postcss-value-parser": "^4.2.0"
},
@@ -1902,13 +1899,31 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
+ }
+ },
+ "node_modules/@csstools/postcss-hwb-function": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
+ "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^12 || ^14 || >=16"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ },
+ "peerDependencies": {
+ "postcss": "^8.2"
}
},
"node_modules/@csstools/postcss-ic-unit": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.0.tgz",
- "integrity": "sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA==",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
+ "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
"dependencies": {
"@csstools/postcss-progressive-custom-properties": "^1.1.0",
"postcss-value-parser": "^4.2.0"
@@ -1916,14 +1931,18 @@
"engines": {
"node": "^12 || ^14 || >=16"
},
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ },
"peerDependencies": {
- "postcss": "^8.3"
+ "postcss": "^8.2"
}
},
"node_modules/@csstools/postcss-is-pseudo-class": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.6.tgz",
- "integrity": "sha512-Oqs396oenuyyMdRXOstxXbxei8fYEgToYjmlYHEi5gk0QLk7xQ72LY7NDr7waWAAmdVzRqPpbE26Q7/cUrGu4Q==",
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
+ "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
"dependencies": {
"@csstools/selector-specificity": "^2.0.0",
"postcss-selector-parser": "^6.0.10"
@@ -1939,24 +1958,46 @@
"postcss": "^8.2"
}
},
- "node_modules/@csstools/postcss-normalize-display-values": {
+ "node_modules/@csstools/postcss-nested-calc": {
"version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.0.tgz",
- "integrity": "sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ==",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
+ "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
"dependencies": {
"postcss-value-parser": "^4.2.0"
},
"engines": {
"node": "^12 || ^14 || >=16"
},
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ },
"peerDependencies": {
- "postcss": "^8.3"
+ "postcss": "^8.2"
+ }
+ },
+ "node_modules/@csstools/postcss-normalize-display-values": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
+ "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^12 || ^14 || >=16"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ },
+ "peerDependencies": {
+ "postcss": "^8.2"
}
},
"node_modules/@csstools/postcss-oklab-function": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.0.tgz",
- "integrity": "sha512-e/Q5HopQzmnQgqimG9v3w2IG4VRABsBq3itOcn4bnm+j4enTgQZ0nWsaH/m9GV2otWGQ0nwccYL5vmLKyvP1ww==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
+ "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
"dependencies": {
"@csstools/postcss-progressive-custom-properties": "^1.1.0",
"postcss-value-parser": "^4.2.0"
@@ -1969,7 +2010,7 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
}
},
"node_modules/@csstools/postcss-progressive-custom-properties": {
@@ -1987,9 +2028,9 @@
}
},
"node_modules/@csstools/postcss-stepped-value-functions": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.0.tgz",
- "integrity": "sha512-q8c4bs1GumAiRenmFjASBcWSLKrbzHzWl6C2HcaAxAXIiL2rUlUWbqQZUjwVG5tied0rld19j/Mm90K3qI26vw==",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
+ "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
"dependencies": {
"postcss-value-parser": "^4.2.0"
},
@@ -2001,13 +2042,31 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.3"
+ "postcss": "^8.2"
+ }
+ },
+ "node_modules/@csstools/postcss-text-decoration-shorthand": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
+ "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0"
+ },
+ "engines": {
+ "node": "^12 || ^14 || >=16"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ },
+ "peerDependencies": {
+ "postcss": "^8.2"
}
},
"node_modules/@csstools/postcss-trigonometric-functions": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.1.tgz",
- "integrity": "sha512-G78CY/+GePc6dDCTUbwI6TTFQ5fs3N9POHhI6v0QzteGpf6ylARiJUNz9HrRKi4eVYBNXjae1W2766iUEFxHlw==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
+ "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
"dependencies": {
"postcss-value-parser": "^4.2.0"
},
@@ -2019,13 +2078,13 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
}
},
"node_modules/@csstools/postcss-unset-value": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.1.tgz",
- "integrity": "sha512-f1G1WGDXEU/RN1TWAxBPQgQudtLnLQPyiWdtypkPC+mVYNKFKH/HYXSxH4MVNqwF8M0eDsoiU7HumJHCg/L/jg==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
+ "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
"engines": {
"node": "^12 || ^14 || >=16"
},
@@ -2034,13 +2093,13 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.3"
+ "postcss": "^8.2"
}
},
"node_modules/@csstools/selector-specificity": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.1.tgz",
- "integrity": "sha512-aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
+ "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
"engines": {
"node": "^12 || ^14 || >=16"
},
@@ -2049,22 +2108,22 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.3",
+ "postcss": "^8.2",
"postcss-selector-parser": "^6.0.10"
}
},
"node_modules/@emotion/babel-plugin": {
- "version": "11.9.2",
- "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz",
- "integrity": "sha512-Pr/7HGH6H6yKgnVFNEj2MVlreu3ADqftqjqwUvDy/OJzKFgxKeTQ+eeUf20FOTuHVkDON2iNa25rAXVYtWJCjw==",
+ "version": "11.10.0",
+ "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.0.tgz",
+ "integrity": "sha512-xVnpDAAbtxL1dsuSelU5A7BnY/lftws0wUexNJZTPsvX/1tM4GZJbclgODhvW4E+NH7E5VFcH0bBn30NvniPJA==",
"dependencies": {
- "@babel/helper-module-imports": "^7.12.13",
- "@babel/plugin-syntax-jsx": "^7.12.13",
- "@babel/runtime": "^7.13.10",
- "@emotion/hash": "^0.8.0",
- "@emotion/memoize": "^0.7.5",
- "@emotion/serialize": "^1.0.2",
- "babel-plugin-macros": "^2.6.1",
+ "@babel/helper-module-imports": "^7.16.7",
+ "@babel/plugin-syntax-jsx": "^7.17.12",
+ "@babel/runtime": "^7.18.3",
+ "@emotion/hash": "^0.9.0",
+ "@emotion/memoize": "^0.8.0",
+ "@emotion/serialize": "^1.1.0",
+ "babel-plugin-macros": "^3.1.0",
"convert-source-map": "^1.5.0",
"escape-string-regexp": "^4.0.0",
"find-root": "^1.1.0",
@@ -2076,46 +2135,46 @@
}
},
"node_modules/@emotion/cache": {
- "version": "11.9.3",
- "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.9.3.tgz",
- "integrity": "sha512-0dgkI/JKlCXa+lEXviaMtGBL0ynpx4osh7rjOXE71q9bIF8G+XhJgvi+wDu0B0IdCVx37BffiwXlN9I3UuzFvg==",
+ "version": "11.10.1",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.1.tgz",
+ "integrity": "sha512-uZTj3Yz5D69GE25iFZcIQtibnVCFsc/6+XIozyL3ycgWvEdif2uEw9wlUt6umjLr4Keg9K6xRPHmD8LGi+6p1A==",
"dependencies": {
- "@emotion/memoize": "^0.7.4",
- "@emotion/sheet": "^1.1.1",
- "@emotion/utils": "^1.0.0",
- "@emotion/weak-memoize": "^0.2.5",
+ "@emotion/memoize": "^0.8.0",
+ "@emotion/sheet": "^1.2.0",
+ "@emotion/utils": "^1.2.0",
+ "@emotion/weak-memoize": "^0.3.0",
"stylis": "4.0.13"
}
},
"node_modules/@emotion/hash": {
- "version": "0.8.0",
- "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
- "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz",
+ "integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ=="
},
"node_modules/@emotion/is-prop-valid": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.1.3.tgz",
- "integrity": "sha512-RFg04p6C+1uO19uG8N+vqanzKqiM9eeV1LDOG3bmkYmuOj7NbKNlFC/4EZq5gnwAIlcC/jOT24f8Td0iax2SXA==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz",
+ "integrity": "sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg==",
"dependencies": {
- "@emotion/memoize": "^0.7.4"
+ "@emotion/memoize": "^0.8.0"
}
},
"node_modules/@emotion/memoize": {
- "version": "0.7.5",
- "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz",
- "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz",
+ "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="
},
"node_modules/@emotion/react": {
- "version": "11.9.3",
- "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.9.3.tgz",
- "integrity": "sha512-g9Q1GcTOlzOEjqwuLF/Zd9LC+4FljjPjDfxSM7KmEakm+hsHXk+bYZ2q+/hTJzr0OUNkujo72pXLQvXj6H+GJQ==",
+ "version": "11.10.0",
+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.0.tgz",
+ "integrity": "sha512-K6z9zlHxxBXwN8TcpwBKcEsBsOw4JWCCmR+BeeOWgqp8GIU1yA2Odd41bwdAAr0ssbQrbJbVnndvv7oiv1bZeQ==",
"dependencies": {
- "@babel/runtime": "^7.13.10",
- "@emotion/babel-plugin": "^11.7.1",
- "@emotion/cache": "^11.9.3",
- "@emotion/serialize": "^1.0.4",
- "@emotion/utils": "^1.1.0",
- "@emotion/weak-memoize": "^0.2.5",
+ "@babel/runtime": "^7.18.3",
+ "@emotion/babel-plugin": "^11.10.0",
+ "@emotion/cache": "^11.10.0",
+ "@emotion/serialize": "^1.1.0",
+ "@emotion/utils": "^1.2.0",
+ "@emotion/weak-memoize": "^0.3.0",
"hoist-non-react-statics": "^3.3.1"
},
"peerDependencies": {
@@ -2132,32 +2191,32 @@
}
},
"node_modules/@emotion/serialize": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.4.tgz",
- "integrity": "sha512-1JHamSpH8PIfFwAMryO2bNka+y8+KA5yga5Ocf2d7ZEiJjb7xlLW7aknBGZqJLajuLOvJ+72vN+IBSwPlXD1Pg==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.0.tgz",
+ "integrity": "sha512-F1ZZZW51T/fx+wKbVlwsfchr5q97iW8brAnXmsskz4d0hVB4O3M/SiA3SaeH06x02lSNzkkQv+n3AX3kCXKSFA==",
"dependencies": {
- "@emotion/hash": "^0.8.0",
- "@emotion/memoize": "^0.7.4",
- "@emotion/unitless": "^0.7.5",
- "@emotion/utils": "^1.0.0",
+ "@emotion/hash": "^0.9.0",
+ "@emotion/memoize": "^0.8.0",
+ "@emotion/unitless": "^0.8.0",
+ "@emotion/utils": "^1.2.0",
"csstype": "^3.0.2"
}
},
"node_modules/@emotion/sheet": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.1.1.tgz",
- "integrity": "sha512-J3YPccVRMiTZxYAY0IOq3kd+hUP8idY8Kz6B/Cyo+JuXq52Ek+zbPbSQUrVQp95aJ+lsAW7DPL1P2Z+U1jGkKA=="
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.0.tgz",
+ "integrity": "sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w=="
},
"node_modules/@emotion/styled": {
- "version": "11.9.3",
- "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.9.3.tgz",
- "integrity": "sha512-o3sBNwbtoVz9v7WB1/Y/AmXl69YHmei2mrVnK7JgyBJ//Rst5yqPZCecEJlMlJrFeWHp+ki/54uN265V2pEcXA==",
+ "version": "11.10.0",
+ "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.0.tgz",
+ "integrity": "sha512-V9oaEH6V4KePeQpgUE83i8ht+4Ri3E8Djp/ZPJ4DQlqWhSKITvgzlR3/YQE2hdfP4Jw3qVRkANJz01LLqK9/TA==",
"dependencies": {
- "@babel/runtime": "^7.13.10",
- "@emotion/babel-plugin": "^11.7.1",
- "@emotion/is-prop-valid": "^1.1.3",
- "@emotion/serialize": "^1.0.4",
- "@emotion/utils": "^1.1.0"
+ "@babel/runtime": "^7.18.3",
+ "@emotion/babel-plugin": "^11.10.0",
+ "@emotion/is-prop-valid": "^1.2.0",
+ "@emotion/serialize": "^1.1.0",
+ "@emotion/utils": "^1.2.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0",
@@ -2174,19 +2233,19 @@
}
},
"node_modules/@emotion/unitless": {
- "version": "0.7.5",
- "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
- "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz",
+ "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw=="
},
"node_modules/@emotion/utils": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.1.0.tgz",
- "integrity": "sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ=="
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz",
+ "integrity": "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw=="
},
"node_modules/@emotion/weak-memoize": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
- "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz",
+ "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="
},
"node_modules/@eslint/eslintrc": {
"version": "1.3.0",
@@ -2213,9 +2272,9 @@
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
},
"node_modules/@eslint/eslintrc/node_modules/globals": {
- "version": "13.15.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
- "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
+ "version": "13.17.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+ "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -2249,9 +2308,9 @@
}
},
"node_modules/@humanwhocodes/config-array": {
- "version": "0.9.5",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
- "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+ "version": "0.10.4",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
+ "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
"dependencies": {
"@humanwhocodes/object-schema": "^1.2.1",
"debug": "^4.1.1",
@@ -2261,6 +2320,15 @@
"node": ">=10.10.0"
}
},
+ "node_modules/@humanwhocodes/gitignore-to-minimatch": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
+ "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA==",
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/nzakas"
+ }
+ },
"node_modules/@humanwhocodes/object-schema": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
@@ -2702,11 +2770,11 @@
}
},
"node_modules/@jest/schemas": {
- "version": "28.0.2",
- "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz",
- "integrity": "sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
+ "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
"dependencies": {
- "@sinclair/typebox": "^0.23.3"
+ "@sinclair/typebox": "^0.24.1"
},
"engines": {
"node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
@@ -2950,17 +3018,17 @@
}
},
"node_modules/@jridgewell/resolve-uri": {
- "version": "3.0.7",
- "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
- "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/@jridgewell/set-array": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
- "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==",
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+ "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
"engines": {
"node": ">=6.0.0"
}
@@ -2975,11 +3043,11 @@
}
},
"node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
- "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+ "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
"dependencies": {
- "@jridgewell/set-array": "^1.0.0",
+ "@jridgewell/set-array": "^1.0.1",
"@jridgewell/sourcemap-codec": "^1.4.10",
"@jridgewell/trace-mapping": "^0.3.9"
},
@@ -2988,14 +3056,14 @@
}
},
"node_modules/@jridgewell/sourcemap-codec": {
- "version": "1.4.13",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
- "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="
+ "version": "1.4.14",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
},
"node_modules/@jridgewell/trace-mapping": {
- "version": "0.3.13",
- "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
- "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
+ "version": "0.3.15",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
+ "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
"dependencies": {
"@jridgewell/resolve-uri": "^3.0.3",
"@jridgewell/sourcemap-codec": "^1.4.10"
@@ -3007,18 +3075,18 @@
"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
},
"node_modules/@mui/base": {
- "version": "5.0.0-alpha.86",
- "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.86.tgz",
- "integrity": "sha512-0vi/Nni1mizrgrzKeyksEjw5JVSrgT8Vr2NhxzFtYxqpMgtdSrBvcmcuzBf9kE/ECMPbgpSIcqv0nLbLZUYkOQ==",
+ "version": "5.0.0-alpha.93",
+ "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.93.tgz",
+ "integrity": "sha512-IVUWO0NNlELDc9FD7mM+fWTS1/6n5sJYdIbXpLQ00NjWdVEYmTyRgUAZDlJJJrz+tbF0eeffx0kOsvJvyTZlsA==",
"dependencies": {
"@babel/runtime": "^7.17.2",
- "@emotion/is-prop-valid": "^1.1.2",
- "@mui/types": "^7.1.4",
- "@mui/utils": "^5.8.4",
- "@popperjs/core": "^2.11.5",
- "clsx": "^1.1.1",
+ "@emotion/is-prop-valid": "^1.1.3",
+ "@mui/types": "^7.1.5",
+ "@mui/utils": "^5.9.3",
+ "@popperjs/core": "^2.11.6",
+ "clsx": "^1.2.1",
"prop-types": "^15.8.1",
- "react-is": "^17.0.2"
+ "react-is": "^18.2.0"
},
"engines": {
"node": ">=12.0.0"
@@ -3038,6 +3106,15 @@
}
}
},
+ "node_modules/@mui/core-downloads-tracker": {
+ "version": "5.10.1",
+ "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.1.tgz",
+ "integrity": "sha512-zyzLkVSqi+WuxG8UZrrOaWbhHkDK+MlHFjLpL+vqUVU6iSUaDYREu1xoLWEQsWOznT4oT2iEiGZLpQLgkn+WiA==",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui"
+ }
+ },
"node_modules/@mui/icons-material": {
"version": "5.8.4",
"resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.8.4.tgz",
@@ -3064,21 +3141,22 @@
}
},
"node_modules/@mui/material": {
- "version": "5.8.5",
- "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.8.5.tgz",
- "integrity": "sha512-wngPXlOI9BurLSGlObQM/2L0QFFaIcvJnDK5A+ALxuUyuQnPviVWfC1l/r8rPlxQ4PCbSYpq3gzLlgnLoWcO/g==",
+ "version": "5.10.1",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.1.tgz",
+ "integrity": "sha512-E9fhskX6TwUdAzpL5+yoAzRxb6wY4oBqmBVlgUuLndSwPRYxXoGu+z74NxbDEkxUoHdb7vrDcRTswpB6ykDITQ==",
"dependencies": {
"@babel/runtime": "^7.17.2",
- "@mui/base": "5.0.0-alpha.86",
- "@mui/system": "^5.8.5",
- "@mui/types": "^7.1.4",
- "@mui/utils": "^5.8.4",
- "@types/react-transition-group": "^4.4.4",
- "clsx": "^1.1.1",
+ "@mui/base": "5.0.0-alpha.93",
+ "@mui/core-downloads-tracker": "^5.10.1",
+ "@mui/system": "^5.10.1",
+ "@mui/types": "^7.1.5",
+ "@mui/utils": "^5.9.3",
+ "@types/react-transition-group": "^4.4.5",
+ "clsx": "^1.2.1",
"csstype": "^3.1.0",
"prop-types": "^15.8.1",
- "react-is": "^17.0.2",
- "react-transition-group": "^4.4.2"
+ "react-is": "^18.2.0",
+ "react-transition-group": "^4.4.5"
},
"engines": {
"node": ">=12.0.0"
@@ -3107,12 +3185,12 @@
}
},
"node_modules/@mui/private-theming": {
- "version": "5.8.4",
- "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.8.4.tgz",
- "integrity": "sha512-3Lp0VAEjtQygJ70MWEyHkKvg327O6YoBH6ZNEy6fIsrK6gmRIj+YrlvJ7LQCbowY+qDGnbdMrTBd1hfThlI8lg==",
+ "version": "5.9.3",
+ "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.9.3.tgz",
+ "integrity": "sha512-Ys3WO39WqoGciGX9k5AIi/k2zJhlydv4FzlEEwtw9OqdMaV0ydK/TdZekKzjP9sTI/JcdAP3H5DWtUaPLQJjWg==",
"dependencies": {
"@babel/runtime": "^7.17.2",
- "@mui/utils": "^5.8.4",
+ "@mui/utils": "^5.9.3",
"prop-types": "^15.8.1"
},
"engines": {
@@ -3133,12 +3211,13 @@
}
},
"node_modules/@mui/styled-engine": {
- "version": "5.8.0",
- "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.8.0.tgz",
- "integrity": "sha512-Q3spibB8/EgeMYHc+/o3RRTnAYkSl7ROCLhXJ830W8HZ2/iDiyYp16UcxKPurkXvLhUaILyofPVrP3Su2uKsAw==",
+ "version": "5.10.1",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.1.tgz",
+ "integrity": "sha512-xiQp6wvSLpMcRCOExbRSvkHf6gIQ/eeK7mx/Re6BtPPYIx6OerPwia+23uVIop/k4Bs5D+w7Rv2yXYJxo5rMSQ==",
"dependencies": {
"@babel/runtime": "^7.17.2",
- "@emotion/cache": "^11.7.1",
+ "@emotion/cache": "^11.9.3",
+ "csstype": "^3.1.0",
"prop-types": "^15.8.1"
},
"engines": {
@@ -3163,16 +3242,16 @@
}
},
"node_modules/@mui/system": {
- "version": "5.8.5",
- "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.8.5.tgz",
- "integrity": "sha512-1bhITHp5sX/CVEf1QwtBWvW+kNnH+GU7lKz0CeAL1RyH9dWvoL9Yt/+i/L8hJ6jVZB/7Au2F6MsyDPt8V1jfdA==",
+ "version": "5.10.1",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.1.tgz",
+ "integrity": "sha512-Ix8LVAMtVrNtmncK0yc5llHWlZKCm9okbw8QMnWbI5UH+nI9qhtf+Aure4p5ei6dGKdil++lukar/GxCjfzRSg==",
"dependencies": {
"@babel/runtime": "^7.17.2",
- "@mui/private-theming": "^5.8.4",
- "@mui/styled-engine": "^5.8.0",
- "@mui/types": "^7.1.4",
- "@mui/utils": "^5.8.4",
- "clsx": "^1.1.1",
+ "@mui/private-theming": "^5.9.3",
+ "@mui/styled-engine": "^5.10.1",
+ "@mui/types": "^7.1.5",
+ "@mui/utils": "^5.9.3",
+ "clsx": "^1.2.1",
"csstype": "^3.1.0",
"prop-types": "^15.8.1"
},
@@ -3202,9 +3281,9 @@
}
},
"node_modules/@mui/types": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.4.tgz",
- "integrity": "sha512-uveM3byMbthO+6tXZ1n2zm0W3uJCQYtwt/v5zV5I77v2v18u0ITkb8xwhsDD2i3V2Kye7SaNR6FFJ6lMuY/WqQ==",
+ "version": "7.1.5",
+ "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.5.tgz",
+ "integrity": "sha512-HnRXrxgHJYJcT8ZDdDCQIlqk0s0skOKD7eWs9mJgBUu70hyW4iA6Kiv3yspJR474RFH8hysKR65VVSzUSzkuwA==",
"peerDependencies": {
"@types/react": "*"
},
@@ -3215,15 +3294,15 @@
}
},
"node_modules/@mui/utils": {
- "version": "5.8.4",
- "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.8.4.tgz",
- "integrity": "sha512-BHYErfrjqqh76KaDAm8wZlhEip1Uj7Cmco65NcsF3BWrAl3FWngACpaPZeEbTgmaEwyWAQEE6LZhsmy43hfyqQ==",
+ "version": "5.9.3",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.9.3.tgz",
+ "integrity": "sha512-l0N5bcrenE9hnwZ/jPecpIRqsDFHkPXoFUcmkgysaJwVZzJ3yQkGXB47eqmXX5yyGrSc6HksbbqXEaUya+siew==",
"dependencies": {
"@babel/runtime": "^7.17.2",
"@types/prop-types": "^15.7.5",
"@types/react-is": "^16.7.1 || ^17.0.0",
"prop-types": "^15.8.1",
- "react-is": "^17.0.2"
+ "react-is": "^18.2.0"
},
"engines": {
"node": ">=12.0.0"
@@ -3326,9 +3405,9 @@
}
},
"node_modules/@popperjs/core": {
- "version": "2.11.5",
- "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
- "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==",
+ "version": "2.11.6",
+ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
+ "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/popperjs"
@@ -3409,14 +3488,14 @@
"integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
},
"node_modules/@rushstack/eslint-patch": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz",
- "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw=="
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz",
+ "integrity": "sha512-LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA=="
},
"node_modules/@sinclair/typebox": {
- "version": "0.23.5",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz",
- "integrity": "sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg=="
+ "version": "0.24.28",
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.28.tgz",
+ "integrity": "sha512-dgJd3HLOkLmz4Bw50eZx/zJwtBq65nms3N9VBYu5LTjJ883oBFkTyXRlCB/ZGGwqYpJJHA5zW2Ibhl5ngITfow=="
},
"node_modules/@sinonjs/commons": {
"version": "1.8.3",
@@ -3580,21 +3659,6 @@
"url": "https://github.com/sponsors/gregberge"
}
},
- "node_modules/@svgr/core/node_modules/cosmiconfig": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
- "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
- "dependencies": {
- "@types/parse-json": "^4.0.0",
- "import-fresh": "^3.2.1",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0",
- "yaml": "^1.10.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/@svgr/hast-util-to-babel-ast": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz",
@@ -3645,21 +3709,6 @@
"url": "https://github.com/sponsors/gregberge"
}
},
- "node_modules/@svgr/plugin-svgo/node_modules/cosmiconfig": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
- "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
- "dependencies": {
- "@types/parse-json": "^4.0.0",
- "import-fresh": "^3.2.1",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0",
- "yaml": "^1.10.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/@svgr/webpack": {
"version": "5.5.0",
"resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz",
@@ -3728,9 +3777,9 @@
}
},
"node_modules/@types/babel__traverse": {
- "version": "7.17.1",
- "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz",
- "integrity": "sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.0.tgz",
+ "integrity": "sha512-v4Vwdko+pgymgS+A2UIaJru93zQd85vIGWObM5ekZNdXCKtDYqATlEYnWgfo86Q6I1Lh0oXnksDnMU1cwmlPDw==",
"dependencies": {
"@babel/types": "^7.3.0"
}
@@ -3770,27 +3819,27 @@
}
},
"node_modules/@types/eslint": {
- "version": "8.4.3",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz",
- "integrity": "sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==",
+ "version": "8.4.5",
+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz",
+ "integrity": "sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ==",
"dependencies": {
"@types/estree": "*",
"@types/json-schema": "*"
}
},
"node_modules/@types/eslint-scope": {
- "version": "3.7.3",
- "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
- "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
+ "version": "3.7.4",
+ "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+ "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
"dependencies": {
"@types/eslint": "*",
"@types/estree": "*"
}
},
"node_modules/@types/estree": {
- "version": "0.0.51",
- "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
- "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
+ "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="
},
"node_modules/@types/express": {
"version": "4.17.13",
@@ -3804,9 +3853,9 @@
}
},
"node_modules/@types/express-serve-static-core": {
- "version": "4.17.29",
- "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz",
- "integrity": "sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q==",
+ "version": "4.17.30",
+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz",
+ "integrity": "sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ==",
"dependencies": {
"@types/node": "*",
"@types/qs": "*",
@@ -3866,14 +3915,14 @@
"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
},
"node_modules/@types/mime": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
- "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
+ "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
},
"node_modules/@types/node": {
- "version": "18.0.0",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.0.tgz",
- "integrity": "sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA=="
+ "version": "18.7.6",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.6.tgz",
+ "integrity": "sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A=="
},
"node_modules/@types/parse-json": {
"version": "4.0.0",
@@ -3881,9 +3930,9 @@
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
},
"node_modules/@types/prettier": {
- "version": "2.6.3",
- "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.3.tgz",
- "integrity": "sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg=="
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz",
+ "integrity": "sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A=="
},
"node_modules/@types/prop-types": {
"version": "15.7.5",
@@ -3906,9 +3955,9 @@
"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
},
"node_modules/@types/react": {
- "version": "18.0.14",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.14.tgz",
- "integrity": "sha512-x4gGuASSiWmo0xjDLpm5mPb52syZHJx02VKbqUKdLmKtAwIh63XClGsiTI1K6DO5q7ox4xAsQrU+Gl3+gGXF9Q==",
+ "version": "18.0.17",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.17.tgz",
+ "integrity": "sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==",
"dependencies": {
"@types/prop-types": "*",
"@types/scheduler": "*",
@@ -3958,11 +4007,11 @@
}
},
"node_modules/@types/serve-static": {
- "version": "1.13.10",
- "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
- "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
+ "version": "1.15.0",
+ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
+ "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
"dependencies": {
- "@types/mime": "^1",
+ "@types/mime": "*",
"@types/node": "*"
}
},
@@ -4006,13 +4055,13 @@
"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz",
- "integrity": "sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz",
+ "integrity": "sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ==",
"dependencies": {
- "@typescript-eslint/scope-manager": "5.29.0",
- "@typescript-eslint/type-utils": "5.29.0",
- "@typescript-eslint/utils": "5.29.0",
+ "@typescript-eslint/scope-manager": "5.33.1",
+ "@typescript-eslint/type-utils": "5.33.1",
+ "@typescript-eslint/utils": "5.33.1",
"debug": "^4.3.4",
"functional-red-black-tree": "^1.0.1",
"ignore": "^5.2.0",
@@ -4052,11 +4101,11 @@
}
},
"node_modules/@typescript-eslint/experimental-utils": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.29.0.tgz",
- "integrity": "sha512-H4fqOVYiH6R15NjtMO2LVBZgzXgzjdPEXYb7x/meg4QbXsptLxdq8YlHK2NZOFKipuInY4sAPY5a6SQ/53s3dw==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.33.1.tgz",
+ "integrity": "sha512-wk2o+4wojvKz/x3UCbsgjgXl0lyLPYQsfKP0MdRzj4jtsQr4bVtgWUWck6+N3GzThUTbUFyyKLduWPwePhh0xQ==",
"dependencies": {
- "@typescript-eslint/utils": "5.29.0"
+ "@typescript-eslint/utils": "5.33.1"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4070,13 +4119,13 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz",
- "integrity": "sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz",
+ "integrity": "sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA==",
"dependencies": {
- "@typescript-eslint/scope-manager": "5.29.0",
- "@typescript-eslint/types": "5.29.0",
- "@typescript-eslint/typescript-estree": "5.29.0",
+ "@typescript-eslint/scope-manager": "5.33.1",
+ "@typescript-eslint/types": "5.33.1",
+ "@typescript-eslint/typescript-estree": "5.33.1",
"debug": "^4.3.4"
},
"engines": {
@@ -4096,12 +4145,12 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz",
- "integrity": "sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz",
+ "integrity": "sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA==",
"dependencies": {
- "@typescript-eslint/types": "5.29.0",
- "@typescript-eslint/visitor-keys": "5.29.0"
+ "@typescript-eslint/types": "5.33.1",
+ "@typescript-eslint/visitor-keys": "5.33.1"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4112,11 +4161,11 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.29.0.tgz",
- "integrity": "sha512-JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz",
+ "integrity": "sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g==",
"dependencies": {
- "@typescript-eslint/utils": "5.29.0",
+ "@typescript-eslint/utils": "5.33.1",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
@@ -4137,9 +4186,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz",
- "integrity": "sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz",
+ "integrity": "sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ==",
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
@@ -4149,12 +4198,12 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz",
- "integrity": "sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz",
+ "integrity": "sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA==",
"dependencies": {
- "@typescript-eslint/types": "5.29.0",
- "@typescript-eslint/visitor-keys": "5.29.0",
+ "@typescript-eslint/types": "5.33.1",
+ "@typescript-eslint/visitor-keys": "5.33.1",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -4189,14 +4238,14 @@
}
},
"node_modules/@typescript-eslint/utils": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz",
- "integrity": "sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz",
+ "integrity": "sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ==",
"dependencies": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.29.0",
- "@typescript-eslint/types": "5.29.0",
- "@typescript-eslint/typescript-estree": "5.29.0",
+ "@typescript-eslint/scope-manager": "5.33.1",
+ "@typescript-eslint/types": "5.33.1",
+ "@typescript-eslint/typescript-estree": "5.33.1",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
},
@@ -4232,11 +4281,11 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz",
- "integrity": "sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz",
+ "integrity": "sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg==",
"dependencies": {
- "@typescript-eslint/types": "5.29.0",
+ "@typescript-eslint/types": "5.33.1",
"eslint-visitor-keys": "^3.3.0"
},
"engines": {
@@ -4406,9 +4455,9 @@
}
},
"node_modules/acorn": {
- "version": "8.7.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
- "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+ "version": "8.8.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+ "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
"bin": {
"acorn": "bin/acorn"
},
@@ -4764,9 +4813,9 @@
}
},
"node_modules/autoprefixer": {
- "version": "10.4.7",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz",
- "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==",
+ "version": "10.4.8",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.8.tgz",
+ "integrity": "sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==",
"funding": [
{
"type": "opencollective",
@@ -4778,8 +4827,8 @@
}
],
"dependencies": {
- "browserslist": "^4.20.3",
- "caniuse-lite": "^1.0.30001335",
+ "browserslist": "^4.21.3",
+ "caniuse-lite": "^1.0.30001373",
"fraction.js": "^4.2.0",
"normalize-range": "^0.1.2",
"picocolors": "^1.0.0",
@@ -4796,11 +4845,11 @@
}
},
"node_modules/axe-core": {
- "version": "4.4.2",
- "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.2.tgz",
- "integrity": "sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA==",
+ "version": "4.4.3",
+ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.3.tgz",
+ "integrity": "sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w==",
"engines": {
- "node": ">=12"
+ "node": ">=4"
}
},
"node_modules/axobject-query": {
@@ -4966,13 +5015,17 @@
}
},
"node_modules/babel-plugin-macros": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
- "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+ "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
"dependencies": {
- "@babel/runtime": "^7.7.2",
- "cosmiconfig": "^6.0.0",
- "resolve": "^1.12.0"
+ "@babel/runtime": "^7.12.5",
+ "cosmiconfig": "^7.0.0",
+ "resolve": "^1.19.0"
+ },
+ "engines": {
+ "node": ">=10",
+ "npm": ">=6"
}
},
"node_modules/babel-plugin-named-asset-import": {
@@ -4984,12 +5037,12 @@
}
},
"node_modules/babel-plugin-polyfill-corejs2": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
- "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz",
+ "integrity": "sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==",
"dependencies": {
- "@babel/compat-data": "^7.13.11",
- "@babel/helper-define-polyfill-provider": "^0.3.1",
+ "@babel/compat-data": "^7.17.7",
+ "@babel/helper-define-polyfill-provider": "^0.3.2",
"semver": "^6.1.1"
},
"peerDependencies": {
@@ -4997,11 +5050,11 @@
}
},
"node_modules/babel-plugin-polyfill-corejs3": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
- "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz",
+ "integrity": "sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==",
"dependencies": {
- "@babel/helper-define-polyfill-provider": "^0.3.1",
+ "@babel/helper-define-polyfill-provider": "^0.3.2",
"core-js-compat": "^3.21.0"
},
"peerDependencies": {
@@ -5009,11 +5062,11 @@
}
},
"node_modules/babel-plugin-polyfill-regenerator": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
- "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz",
+ "integrity": "sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==",
"dependencies": {
- "@babel/helper-define-polyfill-provider": "^0.3.1"
+ "@babel/helper-define-polyfill-provider": "^0.3.2"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
@@ -5084,35 +5137,6 @@
"babel-plugin-transform-react-remove-prop-types": "^0.4.24"
}
},
- "node_modules/babel-preset-react-app/node_modules/babel-plugin-macros": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
- "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
- "dependencies": {
- "@babel/runtime": "^7.12.5",
- "cosmiconfig": "^7.0.0",
- "resolve": "^1.19.0"
- },
- "engines": {
- "node": ">=10",
- "npm": ">=6"
- }
- },
- "node_modules/babel-preset-react-app/node_modules/cosmiconfig": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
- "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
- "dependencies": {
- "@types/parse-json": "^4.0.0",
- "import-fresh": "^3.2.1",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0",
- "yaml": "^1.10.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -5255,9 +5279,9 @@
"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
},
"node_modules/browserslist": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz",
- "integrity": "sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==",
+ "version": "4.21.3",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
+ "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
"funding": [
{
"type": "opencollective",
@@ -5269,10 +5293,10 @@
}
],
"dependencies": {
- "caniuse-lite": "^1.0.30001358",
- "electron-to-chromium": "^1.4.164",
- "node-releases": "^2.0.5",
- "update-browserslist-db": "^1.0.0"
+ "caniuse-lite": "^1.0.30001370",
+ "electron-to-chromium": "^1.4.202",
+ "node-releases": "^2.0.6",
+ "update-browserslist-db": "^1.0.5"
},
"bin": {
"browserslist": "cli.js"
@@ -5373,9 +5397,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001358",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz",
- "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==",
+ "version": "1.0.30001378",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001378.tgz",
+ "integrity": "sha512-JVQnfoO7FK7WvU4ZkBRbPjaot4+YqxogSDosHv0Hv5mWpUESmN+UubMU6L/hGz8QlQ2aY5U0vR6MOs6j/CXpNA==",
"funding": [
{
"type": "opencollective",
@@ -5424,14 +5448,6 @@
"node": ">=10"
}
},
- "node_modules/charcodes": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz",
- "integrity": "sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ==",
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/check-types": {
"version": "11.1.2",
"resolved": "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz",
@@ -5493,9 +5509,9 @@
"integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
},
"node_modules/clean-css": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz",
- "integrity": "sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==",
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",
+ "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",
"dependencies": {
"source-map": "~0.6.0"
},
@@ -5522,9 +5538,9 @@
}
},
"node_modules/clsx": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
- "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
+ "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
"engines": {
"node": ">=6"
}
@@ -5570,9 +5586,9 @@
"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
},
"node_modules/colord": {
- "version": "2.9.2",
- "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
- "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ=="
+ "version": "2.9.3",
+ "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+ "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
},
"node_modules/colorette": {
"version": "2.0.19",
@@ -5668,9 +5684,9 @@
"integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="
},
"node_modules/connect-history-api-fallback": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
- "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+ "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
"engines": {
"node": ">=0.8"
}
@@ -5735,9 +5751,9 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
},
"node_modules/core-js": {
- "version": "3.23.2",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.23.2.tgz",
- "integrity": "sha512-ELJOWxNrJfOH/WK4VJ3Qd+fOqZuOuDNDJz0xG6Bt4mGg2eO/UT9CljCrbqDGovjLKUrGajEEBcoTOc0w+yBYeQ==",
+ "version": "3.24.1",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
+ "integrity": "sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -5745,11 +5761,11 @@
}
},
"node_modules/core-js-compat": {
- "version": "3.23.2",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.23.2.tgz",
- "integrity": "sha512-lrgZvxFwbQp9v7E8mX0rJ+JX7Bvh4eGULZXA1IAyjlsnWvCdw6TF8Tg6xtaSUSJMrSrMaLdpmk+V54LM1dvfOA==",
+ "version": "3.24.1",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.24.1.tgz",
+ "integrity": "sha512-XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw==",
"dependencies": {
- "browserslist": "^4.20.4",
+ "browserslist": "^4.21.3",
"semver": "7.0.0"
},
"funding": {
@@ -5766,9 +5782,9 @@
}
},
"node_modules/core-js-pure": {
- "version": "3.23.2",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.23.2.tgz",
- "integrity": "sha512-t6u7H4Ff/yZNk+zqTr74UjCcZ3k8ApBryeLLV4rYQd9aF3gqmjjGjjR44ENfeBMH8VVvSynIjAJ0mUuFhzQtrA==",
+ "version": "3.24.1",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.24.1.tgz",
+ "integrity": "sha512-r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -5781,18 +5797,18 @@
"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
},
"node_modules/cosmiconfig": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
- "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+ "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
"dependencies": {
"@types/parse-json": "^4.0.0",
- "import-fresh": "^3.1.0",
+ "import-fresh": "^3.2.1",
"parse-json": "^5.0.0",
"path-type": "^4.0.0",
- "yaml": "^1.7.2"
+ "yaml": "^1.10.0"
},
"engines": {
- "node": ">=8"
+ "node": ">=10"
}
},
"node_modules/cross-fetch": {
@@ -6068,9 +6084,9 @@
}
},
"node_modules/cssdb": {
- "version": "6.6.3",
- "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-6.6.3.tgz",
- "integrity": "sha512-7GDvDSmE+20+WcSMhP17Q1EVWUrLlbxxpMDqG731n8P99JhnQZHR9YvtjPvEHfjFUjvQJvdpKCjlKOX+xe4UVA==",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.0.0.tgz",
+ "integrity": "sha512-HmRYATZ4Gf8naf6sZmwKEyf7MXAC0ZxjsamtNNgmuWpQgoO973zsE/1JMIohEYsSi5e3n7vQauCLv7TWSrOlrw==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/csstools"
@@ -6088,9 +6104,9 @@
}
},
"node_modules/cssnano": {
- "version": "5.1.12",
- "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.12.tgz",
- "integrity": "sha512-TgvArbEZu0lk/dvg2ja+B7kYoD7BBCmn3+k58xD0qjrGHsFzXY/wKTo9M5egcUCabPol05e/PVoIu79s2JN4WQ==",
+ "version": "5.1.13",
+ "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.13.tgz",
+ "integrity": "sha512-S2SL2ekdEz6w6a2epXn4CmMKU4K3KpcyXLKfAYc9UQQqJRkD/2eLUG0vJ3Db/9OvO5GuAdgXw3pFbR6abqghDQ==",
"dependencies": {
"cssnano-preset-default": "^5.2.12",
"lilconfig": "^2.0.3",
@@ -6281,9 +6297,9 @@
}
},
"node_modules/decimal.js": {
- "version": "10.3.1",
- "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
- "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
+ "version": "10.4.0",
+ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.0.tgz",
+ "integrity": "sha512-Nv6ENEzyPQ6AItkGwLE2PGKinZZ9g59vSh2BeH6NqPu0OTKZ5ruJsVqh/orbAnqXc9pBbgXAIrc2EyaCj8NpGg=="
},
"node_modules/dedent": {
"version": "0.7.0",
@@ -6633,9 +6649,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.4.167",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.167.tgz",
- "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q=="
+ "version": "1.4.224",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.224.tgz",
+ "integrity": "sha512-dOujC5Yzj0nOVE23iD5HKqrRSDj2SD7RazpZS/b/WX85MtO6/LzKDF4TlYZTBteB+7fvSg5JpWh0sN7fImNF8w=="
},
"node_modules/emittery": {
"version": "0.8.1",
@@ -6670,9 +6686,9 @@
}
},
"node_modules/enhanced-resolve": {
- "version": "5.9.3",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz",
- "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==",
+ "version": "5.10.0",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
+ "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
"dependencies": {
"graceful-fs": "^4.2.4",
"tapable": "^2.2.0"
@@ -6877,12 +6893,13 @@
}
},
"node_modules/eslint": {
- "version": "8.18.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz",
- "integrity": "sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==",
+ "version": "8.22.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz",
+ "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==",
"dependencies": {
"@eslint/eslintrc": "^1.3.0",
- "@humanwhocodes/config-array": "^0.9.2",
+ "@humanwhocodes/config-array": "^0.10.4",
+ "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
@@ -6892,14 +6909,17 @@
"eslint-scope": "^7.1.1",
"eslint-utils": "^3.0.0",
"eslint-visitor-keys": "^3.3.0",
- "espree": "^9.3.2",
+ "espree": "^9.3.3",
"esquery": "^1.4.0",
"esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3",
"file-entry-cache": "^6.0.1",
+ "find-up": "^5.0.0",
"functional-red-black-tree": "^1.0.1",
"glob-parent": "^6.0.1",
"globals": "^13.15.0",
+ "globby": "^11.1.0",
+ "grapheme-splitter": "^1.0.4",
"ignore": "^5.2.0",
"import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4",
@@ -6972,15 +6992,19 @@
}
},
"node_modules/eslint-module-utils": {
- "version": "2.7.3",
- "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
- "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+ "version": "2.7.4",
+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+ "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
"dependencies": {
- "debug": "^3.2.7",
- "find-up": "^2.1.0"
+ "debug": "^3.2.7"
},
"engines": {
"node": ">=4"
+ },
+ "peerDependenciesMeta": {
+ "eslint": {
+ "optional": true
+ }
}
},
"node_modules/eslint-module-utils/node_modules/debug": {
@@ -6991,67 +7015,6 @@
"ms": "^2.1.1"
}
},
- "node_modules/eslint-module-utils/node_modules/find-up": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
- "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
- "dependencies": {
- "locate-path": "^2.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/eslint-module-utils/node_modules/locate-path": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
- "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
- "dependencies": {
- "p-locate": "^2.0.0",
- "path-exists": "^3.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/eslint-module-utils/node_modules/p-limit": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
- "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
- "dependencies": {
- "p-try": "^1.0.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/eslint-module-utils/node_modules/p-locate": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
- "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
- "dependencies": {
- "p-limit": "^1.1.0"
- },
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/eslint-module-utils/node_modules/p-try": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
- "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
- "engines": {
- "node": ">=4"
- }
- },
- "node_modules/eslint-module-utils/node_modules/path-exists": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
- "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
- "engines": {
- "node": ">=4"
- }
- },
"node_modules/eslint-plugin-flowtype": {
"version": "8.0.3",
"resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz",
@@ -7143,22 +7106,23 @@
}
},
"node_modules/eslint-plugin-jsx-a11y": {
- "version": "6.5.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
- "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
+ "version": "6.6.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz",
+ "integrity": "sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==",
"dependencies": {
- "@babel/runtime": "^7.16.3",
+ "@babel/runtime": "^7.18.9",
"aria-query": "^4.2.2",
- "array-includes": "^3.1.4",
+ "array-includes": "^3.1.5",
"ast-types-flow": "^0.0.7",
- "axe-core": "^4.3.5",
+ "axe-core": "^4.4.3",
"axobject-query": "^2.2.0",
- "damerau-levenshtein": "^1.0.7",
+ "damerau-levenshtein": "^1.0.8",
"emoji-regex": "^9.2.2",
"has": "^1.0.3",
- "jsx-ast-utils": "^3.2.1",
+ "jsx-ast-utils": "^3.3.2",
"language-tags": "^1.0.5",
- "minimatch": "^3.0.4"
+ "minimatch": "^3.1.2",
+ "semver": "^6.3.0"
},
"engines": {
"node": ">=4.0"
@@ -7168,9 +7132,9 @@
}
},
"node_modules/eslint-plugin-react": {
- "version": "7.30.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.30.0.tgz",
- "integrity": "sha512-RgwH7hjW48BleKsYyHK5vUAvxtE9SMPDKmcPRQgtRCYaZA0XQPt5FSkrU3nhz5ifzMZcA8opwmRJ2cmOO8tr5A==",
+ "version": "7.30.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.30.1.tgz",
+ "integrity": "sha512-NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg==",
"dependencies": {
"array-includes": "^3.1.5",
"array.prototype.flatmap": "^1.3.0",
@@ -7233,9 +7197,9 @@
}
},
"node_modules/eslint-plugin-testing-library": {
- "version": "5.5.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.5.1.tgz",
- "integrity": "sha512-plLEkkbAKBjPxsLj7x4jNapcHAg2ernkQlKKrN2I8NrQwPISZHyCUNvg5Hv3EDqOQReToQb5bnqXYbkijJPE/g==",
+ "version": "5.6.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.6.0.tgz",
+ "integrity": "sha512-y63TRzPhGCMNsnUwMGJU1MFWc/3GvYw+nzobp9QiyNTTKsgAt5RKAOT1I34+XqVBpX1lC8bScoOjCkP7iRv0Mw==",
"dependencies": {
"@typescript-eslint/utils": "^5.13.0"
},
@@ -7350,9 +7314,9 @@
}
},
"node_modules/eslint-webpack-plugin/node_modules/jest-worker": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.1.tgz",
- "integrity": "sha512-Au7slXB08C6h+xbJPp7VIb6U0XX5Kc9uel/WFc6/rcTzGiaVCBRngBExSYuXSLFPULPSYU3cJ3ybS988lNFQhQ==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
+ "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
"dependencies": {
"@types/node": "*",
"merge-stream": "^2.0.0",
@@ -7450,9 +7414,9 @@
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/eslint/node_modules/globals": {
- "version": "13.15.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
- "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
+ "version": "13.17.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+ "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
"dependencies": {
"type-fest": "^0.20.2"
},
@@ -7505,16 +7469,19 @@
}
},
"node_modules/espree": {
- "version": "9.3.2",
- "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
- "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
+ "version": "9.3.3",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz",
+ "integrity": "sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==",
"dependencies": {
- "acorn": "^8.7.1",
+ "acorn": "^8.8.0",
"acorn-jsx": "^5.3.2",
"eslint-visitor-keys": "^3.3.0"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
}
},
"node_modules/esprima": {
@@ -7938,9 +7905,9 @@
}
},
"node_modules/flatted": {
- "version": "3.2.5",
- "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
- "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz",
+ "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="
},
"node_modules/follow-redirects": {
"version": "1.15.1",
@@ -8044,6 +8011,21 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
+ "node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+ "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+ "dependencies": {
+ "@types/parse-json": "^4.0.0",
+ "import-fresh": "^3.1.0",
+ "parse-json": "^5.0.0",
+ "path-type": "^4.0.0",
+ "yaml": "^1.7.2"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
@@ -8398,6 +8380,11 @@
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
},
+ "node_modules/grapheme-splitter": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+ "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
+ },
"node_modules/gzip-size": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
@@ -8665,9 +8652,9 @@
}
},
"node_modules/http-parser-js": {
- "version": "0.5.7",
- "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.7.tgz",
- "integrity": "sha512-8gQM8ZcewlONQLnik2AKzS13euQhaZcu4rK5QBSYOszW0T1upLW9VA2MdWvTvMmRo42HjXp7igFmdROoBCCrfg=="
+ "version": "0.5.8",
+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+ "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
},
"node_modules/http-proxy": {
"version": "1.18.1",
@@ -8739,9 +8726,9 @@
}
},
"node_modules/i18next": {
- "version": "21.8.10",
- "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.8.10.tgz",
- "integrity": "sha512-7xRb6y4QlSqZRZ3uA5BIEsLuZpmxpzHLizQyKjDDThOcvdfgICOX7aFoBnh4BSWcLtJamTqSweaOuK22A2xqkA==",
+ "version": "21.9.1",
+ "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.9.1.tgz",
+ "integrity": "sha512-ITbDrAjbRR73spZAiu6+ex5WNlHRr1mY+acDi2ioTHuUiviJqSz269Le1xHAf0QaQ6GgIHResUhQNcxGwa/PhA==",
"funding": [
{
"type": "individual",
@@ -8761,11 +8748,11 @@
}
},
"node_modules/i18next-browser-languagedetector": {
- "version": "6.1.4",
- "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-6.1.4.tgz",
- "integrity": "sha512-wukWnFeU7rKIWT66VU5i8I+3Zc4wReGcuDK2+kuFhtoxBRGWGdvYI9UQmqNL/yQH1KogWwh+xGEaIPH8V/i2Zg==",
+ "version": "6.1.5",
+ "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-6.1.5.tgz",
+ "integrity": "sha512-11t7b39oKeZe4uyMxLSPnfw28BCPNLZgUk7zyufex0zKXZ+Bv+JnmJgoB+IfQLZwDt1d71PM8vwBX1NCgliY3g==",
"dependencies": {
- "@babel/runtime": "^7.14.6"
+ "@babel/runtime": "^7.18.9"
}
},
"node_modules/i18next-http-backend": {
@@ -8799,9 +8786,9 @@
}
},
"node_modules/idb": {
- "version": "6.1.5",
- "resolved": "https://registry.npmjs.org/idb/-/idb-6.1.5.tgz",
- "integrity": "sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw=="
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/idb/-/idb-7.0.2.tgz",
+ "integrity": "sha512-jjKrT1EnyZewQ/gCBb/eyiYrhGzws2FeY92Yx8qT9S9GeQAmo4JFVIiWRIfKW/6Ob9A+UDAOW9j9jn58fy2HIg=="
},
"node_modules/identity-obj-proxy": {
"version": "3.0.0",
@@ -8966,9 +8953,9 @@
}
},
"node_modules/is-core-module": {
- "version": "2.9.0",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
- "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
+ "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
"dependencies": {
"has": "^1.0.3"
},
@@ -9296,9 +9283,9 @@
}
},
"node_modules/istanbul-reports": {
- "version": "3.1.4",
- "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
- "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
+ "version": "3.1.5",
+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
+ "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
"dependencies": {
"html-escaper": "^2.0.0",
"istanbul-lib-report": "^3.0.0"
@@ -10846,15 +10833,15 @@
}
},
"node_modules/jest-watch-typeahead/node_modules/@jest/console": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.1.tgz",
- "integrity": "sha512-0RiUocPVFEm3WRMOStIHbRWllG6iW6E3/gUPnf4lkrVFyXIIDeCe+vlKeYyFOMhB2EPE6FLFCNADSOOQMaqvyA==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
+ "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
"dependencies": {
- "@jest/types": "^28.1.1",
+ "@jest/types": "^28.1.3",
"@types/node": "*",
"chalk": "^4.0.0",
- "jest-message-util": "^28.1.1",
- "jest-util": "^28.1.1",
+ "jest-message-util": "^28.1.3",
+ "jest-util": "^28.1.3",
"slash": "^3.0.0"
},
"engines": {
@@ -10870,12 +10857,12 @@
}
},
"node_modules/jest-watch-typeahead/node_modules/@jest/test-result": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.1.tgz",
- "integrity": "sha512-hPmkugBktqL6rRzwWAtp1JtYT4VHwv8OQ+9lE5Gymj6dHzubI/oJHMUpPOt8NrdVWSrz9S7bHjJUmv2ggFoUNQ==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
+ "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
"dependencies": {
- "@jest/console": "^28.1.1",
- "@jest/types": "^28.1.1",
+ "@jest/console": "^28.1.3",
+ "@jest/types": "^28.1.3",
"@types/istanbul-lib-coverage": "^2.0.0",
"collect-v8-coverage": "^1.0.0"
},
@@ -10884,11 +10871,11 @@
}
},
"node_modules/jest-watch-typeahead/node_modules/@jest/types": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.1.tgz",
- "integrity": "sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
+ "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
"dependencies": {
- "@jest/schemas": "^28.0.2",
+ "@jest/schemas": "^28.1.3",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
@@ -10900,9 +10887,9 @@
}
},
"node_modules/jest-watch-typeahead/node_modules/@types/yargs": {
- "version": "17.0.10",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz",
- "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==",
+ "version": "17.0.11",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz",
+ "integrity": "sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==",
"dependencies": {
"@types/yargs-parser": "*"
}
@@ -10972,17 +10959,17 @@
}
},
"node_modules/jest-watch-typeahead/node_modules/jest-message-util": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.1.tgz",
- "integrity": "sha512-xoDOOT66fLfmTRiqkoLIU7v42mal/SqwDKvfmfiWAdJMSJiU+ozgluO7KbvoAgiwIrrGZsV7viETjc8GNrA/IQ==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
+ "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
"dependencies": {
"@babel/code-frame": "^7.12.13",
- "@jest/types": "^28.1.1",
+ "@jest/types": "^28.1.3",
"@types/stack-utils": "^2.0.0",
"chalk": "^4.0.0",
"graceful-fs": "^4.2.9",
"micromatch": "^4.0.4",
- "pretty-format": "^28.1.1",
+ "pretty-format": "^28.1.3",
"slash": "^3.0.0",
"stack-utils": "^2.0.3"
},
@@ -11007,11 +10994,11 @@
}
},
"node_modules/jest-watch-typeahead/node_modules/jest-util": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.1.tgz",
- "integrity": "sha512-FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
+ "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
"dependencies": {
- "@jest/types": "^28.1.1",
+ "@jest/types": "^28.1.3",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -11023,17 +11010,17 @@
}
},
"node_modules/jest-watch-typeahead/node_modules/jest-watcher": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.1.tgz",
- "integrity": "sha512-RQIpeZ8EIJMxbQrXpJQYIIlubBnB9imEHsxxE41f54ZwcqWLysL/A0ZcdMirf+XsMn3xfphVQVV4EW0/p7i7Ug==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
+ "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
"dependencies": {
- "@jest/test-result": "^28.1.1",
- "@jest/types": "^28.1.1",
+ "@jest/test-result": "^28.1.3",
+ "@jest/types": "^28.1.3",
"@types/node": "*",
"ansi-escapes": "^4.2.1",
"chalk": "^4.0.0",
"emittery": "^0.10.2",
- "jest-util": "^28.1.1",
+ "jest-util": "^28.1.3",
"string-length": "^4.0.1"
},
"engines": {
@@ -11064,11 +11051,11 @@
}
},
"node_modules/jest-watch-typeahead/node_modules/pretty-format": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
- "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
+ "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
"dependencies": {
- "@jest/schemas": "^28.0.2",
+ "@jest/schemas": "^28.1.3",
"ansi-regex": "^5.0.1",
"ansi-styles": "^5.0.0",
"react-is": "^18.0.0"
@@ -11088,11 +11075,6 @@
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
- "node_modules/jest-watch-typeahead/node_modules/react-is": {
- "version": "18.2.0",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
- "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
- },
"node_modules/jest-watch-typeahead/node_modules/slash": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
@@ -11424,20 +11406,20 @@
}
},
"node_modules/jsonpointer": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.0.tgz",
- "integrity": "sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
+ "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/jsx-ast-utils": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.1.tgz",
- "integrity": "sha512-pxrjmNpeRw5wwVeWyEAk7QJu2GnBO3uzPFmHCKJJFPKK2Cy0cWL23krGtLdnMmbIi6/FjlrQpPyfQI19ByPOhQ==",
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
+ "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
"dependencies": {
"array-includes": "^3.1.5",
- "object.assign": "^4.1.2"
+ "object.assign": "^4.1.3"
},
"engines": {
"node": ">=4.0"
@@ -11468,9 +11450,9 @@
}
},
"node_modules/language-subtag-registry": {
- "version": "0.3.21",
- "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
- "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg=="
+ "version": "0.3.22",
+ "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
+ "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="
},
"node_modules/language-tags": {
"version": "1.0.5",
@@ -11501,9 +11483,9 @@
}
},
"node_modules/lilconfig": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
- "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==",
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz",
+ "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==",
"engines": {
"node": ">=10"
}
@@ -11652,9 +11634,9 @@
}
},
"node_modules/memfs": {
- "version": "3.4.6",
- "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.6.tgz",
- "integrity": "sha512-rH9mjopto6Wkr7RFuH9l9dk3qb2XGOcYKr7xMhaYqfzuJqOqhRrcFvfD7JMuPj6SLmPreh5+6eAuv36NFAU+Mw==",
+ "version": "3.4.7",
+ "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz",
+ "integrity": "sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==",
"dependencies": {
"fs-monkey": "^1.0.3"
},
@@ -11925,9 +11907,9 @@
"integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
},
"node_modules/node-releases": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
- "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
+ "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
},
"node_modules/normalize-path": {
"version": "3.0.0",
@@ -11979,9 +11961,9 @@
}
},
"node_modules/nwsapi": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
- "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.1.tgz",
+ "integrity": "sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg=="
},
"node_modules/object-assign": {
"version": "4.1.1",
@@ -12016,13 +11998,13 @@
}
},
"node_modules/object.assign": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
- "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+ "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
"dependencies": {
- "call-bind": "^1.0.0",
- "define-properties": "^1.1.3",
- "has-symbols": "^1.0.1",
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.1.4",
+ "has-symbols": "^1.0.3",
"object-keys": "^1.1.1"
},
"engines": {
@@ -12497,9 +12479,9 @@
}
},
"node_modules/postcss": {
- "version": "8.4.14",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
- "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+ "version": "8.4.16",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
+ "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
"funding": [
{
"type": "opencollective",
@@ -12520,9 +12502,9 @@
}
},
"node_modules/postcss-attribute-case-insensitive": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.1.tgz",
- "integrity": "sha512-wrt2VndqSLJpyBRNz9OmJcgnhI9MaongeWgapdBuUMu2a/KNJ8SENesG4SdiTnQwGO9b1VKbTWYAfCPeokLqZQ==",
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
+ "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
"dependencies": {
"postcss-selector-parser": "^6.0.10"
},
@@ -12534,7 +12516,7 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.3"
+ "postcss": "^8.2"
}
},
"node_modules/postcss-browser-comments": {
@@ -12576,9 +12558,9 @@
}
},
"node_modules/postcss-color-functional-notation": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.3.tgz",
- "integrity": "sha512-5fbr6FzFzjwHXKsVnkmEYrJYG8VNNzvD1tAXaPPWR97S6rhKI5uh2yOfV5TAzhDkZoq4h+chxEplFDc8GeyFtw==",
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
+ "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
"dependencies": {
"postcss-value-parser": "^4.2.0"
},
@@ -12590,7 +12572,7 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
}
},
"node_modules/postcss-color-hex-alpha": {
@@ -12612,9 +12594,9 @@
}
},
"node_modules/postcss-color-rebeccapurple": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.0.tgz",
- "integrity": "sha512-1jtE5AKnZcKq4pjOrltFHcbEM2/IvtbD1OdhZ/wqds18//bh0UmQkffcCkzDJU+/vGodfIsVQeKn+45CJvX9Bw==",
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
+ "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
"dependencies": {
"postcss-value-parser": "^4.2.0"
},
@@ -12626,7 +12608,7 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.3"
+ "postcss": "^8.2"
}
},
"node_modules/postcss-colormin": {
@@ -12716,17 +12698,21 @@
}
},
"node_modules/postcss-dir-pseudo-class": {
- "version": "6.0.4",
- "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.4.tgz",
- "integrity": "sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==",
+ "version": "6.0.5",
+ "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
+ "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
"dependencies": {
- "postcss-selector-parser": "^6.0.9"
+ "postcss-selector-parser": "^6.0.10"
},
"engines": {
"node": "^12 || ^14 || >=16"
},
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ },
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
}
},
"node_modules/postcss-discard-comments": {
@@ -12774,9 +12760,9 @@
}
},
"node_modules/postcss-double-position-gradients": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.1.tgz",
- "integrity": "sha512-jM+CGkTs4FcG53sMPjrrGE0rIvLDdCrqMzgDC5fLI7JHDO7o6QG8C5TQBtExb13hdBdoH9C2QVbG4jo2y9lErQ==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
+ "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
"dependencies": {
"@csstools/postcss-progressive-custom-properties": "^1.1.0",
"postcss-value-parser": "^4.2.0"
@@ -12784,8 +12770,12 @@
"engines": {
"node": "^12 || ^14 || >=16"
},
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ },
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
}
},
"node_modules/postcss-env-function": {
@@ -12847,28 +12837,36 @@
}
},
"node_modules/postcss-gap-properties": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz",
- "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==",
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
+ "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
"engines": {
"node": "^12 || ^14 || >=16"
},
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ },
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
}
},
"node_modules/postcss-image-set-function": {
- "version": "4.0.6",
- "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.6.tgz",
- "integrity": "sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==",
+ "version": "4.0.7",
+ "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
+ "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
"dependencies": {
"postcss-value-parser": "^4.2.0"
},
"engines": {
"node": "^12 || ^14 || >=16"
},
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ },
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
}
},
"node_modules/postcss-import": {
@@ -12914,9 +12912,9 @@
}
},
"node_modules/postcss-lab-function": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.0.tgz",
- "integrity": "sha512-Zb1EO9DGYfa3CP8LhINHCcTTCTLI+R3t7AX2mKsDzdgVQ/GkCpHOTgOr6HBHslP7XDdVbqgHW5vvRPMdVANQ8w==",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
+ "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
"dependencies": {
"@csstools/postcss-progressive-custom-properties": "^1.1.0",
"postcss-value-parser": "^4.2.0"
@@ -12929,7 +12927,7 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
}
},
"node_modules/postcss-load-config": {
@@ -12981,21 +12979,6 @@
"webpack": "^5.0.0"
}
},
- "node_modules/postcss-loader/node_modules/cosmiconfig": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
- "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
- "dependencies": {
- "@types/parse-json": "^4.0.0",
- "import-fresh": "^3.2.1",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0",
- "yaml": "^1.10.0"
- },
- "engines": {
- "node": ">=10"
- }
- },
"node_modules/postcss-loader/node_modules/semver": {
"version": "7.3.7",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
@@ -13198,9 +13181,9 @@
}
},
"node_modules/postcss-nesting": {
- "version": "10.1.9",
- "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.9.tgz",
- "integrity": "sha512-WlnqQecNMT7eizBpWwAnQOIk7Zr0A+OZJccEwQoTwmcIsZCVdcjT1LjXj1hBk6zR3BDLZQYsb5KZj2HquZgvTw==",
+ "version": "10.1.10",
+ "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.10.tgz",
+ "integrity": "sha512-lqd7LXCq0gWc0wKXtoKDru5wEUNjm3OryLVNRZ8OnW8km6fSNUuFrjEhU3nklxXE2jvd4qrox566acgh+xQt8w==",
"dependencies": {
"@csstools/selector-specificity": "^2.0.0",
"postcss-selector-parser": "^6.0.10"
@@ -13392,14 +13375,21 @@
}
},
"node_modules/postcss-overflow-shorthand": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz",
- "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==",
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
+ "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
+ "dependencies": {
+ "postcss-value-parser": "^4.2.0"
+ },
"engines": {
"node": "^12 || ^14 || >=16"
},
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ },
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
}
},
"node_modules/postcss-page-break": {
@@ -13411,70 +13401,76 @@
}
},
"node_modules/postcss-place": {
- "version": "7.0.4",
- "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.4.tgz",
- "integrity": "sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==",
+ "version": "7.0.5",
+ "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
+ "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
"dependencies": {
"postcss-value-parser": "^4.2.0"
},
"engines": {
"node": "^12 || ^14 || >=16"
},
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/csstools"
+ },
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
}
},
"node_modules/postcss-preset-env": {
- "version": "7.7.2",
- "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.7.2.tgz",
- "integrity": "sha512-1q0ih7EDsZmCb/FMDRvosna7Gsbdx8CvYO5hYT120hcp2ZAuOHpSzibujZ4JpIUcAC02PG6b+eftxqjTFh5BNA==",
+ "version": "7.8.0",
+ "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.0.tgz",
+ "integrity": "sha512-leqiqLOellpLKfbHkD06E04P6d9ZQ24mat6hu4NSqun7WG0UhspHR5Myiv/510qouCjoo4+YJtNOqg5xHaFnCA==",
"dependencies": {
- "@csstools/postcss-cascade-layers": "^1.0.4",
- "@csstools/postcss-color-function": "^1.1.0",
- "@csstools/postcss-font-format-keywords": "^1.0.0",
- "@csstools/postcss-hwb-function": "^1.0.1",
- "@csstools/postcss-ic-unit": "^1.0.0",
- "@csstools/postcss-is-pseudo-class": "^2.0.6",
- "@csstools/postcss-normalize-display-values": "^1.0.0",
- "@csstools/postcss-oklab-function": "^1.1.0",
+ "@csstools/postcss-cascade-layers": "^1.0.5",
+ "@csstools/postcss-color-function": "^1.1.1",
+ "@csstools/postcss-font-format-keywords": "^1.0.1",
+ "@csstools/postcss-hwb-function": "^1.0.2",
+ "@csstools/postcss-ic-unit": "^1.0.1",
+ "@csstools/postcss-is-pseudo-class": "^2.0.7",
+ "@csstools/postcss-nested-calc": "^1.0.0",
+ "@csstools/postcss-normalize-display-values": "^1.0.1",
+ "@csstools/postcss-oklab-function": "^1.1.1",
"@csstools/postcss-progressive-custom-properties": "^1.3.0",
- "@csstools/postcss-stepped-value-functions": "^1.0.0",
- "@csstools/postcss-trigonometric-functions": "^1.0.1",
- "@csstools/postcss-unset-value": "^1.0.1",
- "autoprefixer": "^10.4.7",
- "browserslist": "^4.21.0",
+ "@csstools/postcss-stepped-value-functions": "^1.0.1",
+ "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
+ "@csstools/postcss-trigonometric-functions": "^1.0.2",
+ "@csstools/postcss-unset-value": "^1.0.2",
+ "autoprefixer": "^10.4.8",
+ "browserslist": "^4.21.3",
"css-blank-pseudo": "^3.0.3",
"css-has-pseudo": "^3.0.4",
"css-prefers-color-scheme": "^6.0.3",
- "cssdb": "^6.6.3",
- "postcss-attribute-case-insensitive": "^5.0.1",
+ "cssdb": "^7.0.0",
+ "postcss-attribute-case-insensitive": "^5.0.2",
"postcss-clamp": "^4.1.0",
- "postcss-color-functional-notation": "^4.2.3",
+ "postcss-color-functional-notation": "^4.2.4",
"postcss-color-hex-alpha": "^8.0.4",
- "postcss-color-rebeccapurple": "^7.1.0",
+ "postcss-color-rebeccapurple": "^7.1.1",
"postcss-custom-media": "^8.0.2",
"postcss-custom-properties": "^12.1.8",
"postcss-custom-selectors": "^6.0.3",
- "postcss-dir-pseudo-class": "^6.0.4",
- "postcss-double-position-gradients": "^3.1.1",
+ "postcss-dir-pseudo-class": "^6.0.5",
+ "postcss-double-position-gradients": "^3.1.2",
"postcss-env-function": "^4.0.6",
"postcss-focus-visible": "^6.0.4",
"postcss-focus-within": "^5.0.4",
"postcss-font-variant": "^5.0.0",
- "postcss-gap-properties": "^3.0.3",
- "postcss-image-set-function": "^4.0.6",
+ "postcss-gap-properties": "^3.0.5",
+ "postcss-image-set-function": "^4.0.7",
"postcss-initial": "^4.0.1",
- "postcss-lab-function": "^4.2.0",
+ "postcss-lab-function": "^4.2.1",
"postcss-logical": "^5.0.4",
"postcss-media-minmax": "^5.0.0",
- "postcss-nesting": "^10.1.9",
+ "postcss-nesting": "^10.1.10",
"postcss-opacity-percentage": "^1.1.2",
- "postcss-overflow-shorthand": "^3.0.3",
+ "postcss-overflow-shorthand": "^3.0.4",
"postcss-page-break": "^3.0.4",
- "postcss-place": "^7.0.4",
- "postcss-pseudo-class-any-link": "^7.1.5",
+ "postcss-place": "^7.0.5",
+ "postcss-pseudo-class-any-link": "^7.1.6",
"postcss-replace-overflow-wrap": "^4.0.0",
- "postcss-selector-not": "^6.0.0",
+ "postcss-selector-not": "^6.0.1",
"postcss-value-parser": "^4.2.0"
},
"engines": {
@@ -13489,9 +13485,9 @@
}
},
"node_modules/postcss-pseudo-class-any-link": {
- "version": "7.1.5",
- "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.5.tgz",
- "integrity": "sha512-nSGKGScwFTaaV8Cyi27W9FegX3l3b7tmNxujxmykI/j3++cBAiq8fTUAU3ZK0s2aneN2T8cTUvKdNedzp3JIEA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
+ "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
"dependencies": {
"postcss-selector-parser": "^6.0.10"
},
@@ -13544,9 +13540,9 @@
}
},
"node_modules/postcss-selector-not": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.0.tgz",
- "integrity": "sha512-i/HI/VNd3V9e1WOLCwJsf9nePBRXqcGtVibcJ9FsVo0agfDEfsLSlFt94aYjY35wUNcdG0KrvdyjEr7It50wLQ==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
+ "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
"dependencies": {
"postcss-selector-parser": "^6.0.10"
},
@@ -13558,7 +13554,7 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.3"
+ "postcss": "^8.2"
}
},
"node_modules/postcss-selector-parser": {
@@ -13712,6 +13708,11 @@
"url": "https://github.com/chalk/ansi-styles?sponsor=1"
}
},
+ "node_modules/pretty-format/node_modules/react-is": {
+ "version": "17.0.2",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+ "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+ },
"node_modules/process-nextick-args": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@@ -13773,9 +13774,9 @@
}
},
"node_modules/psl": {
- "version": "1.8.0",
- "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
- "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+ "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
},
"node_modules/punycode": {
"version": "2.1.1",
@@ -14046,12 +14047,11 @@
"integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
},
"node_modules/react-i18next": {
- "version": "11.17.2",
- "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.17.2.tgz",
- "integrity": "sha512-/HG4XSResWDY450cFmoUqLgCYDu8VYMFISGcMnZlxRSV05naj3+F7DoebwnPu6z/akA3Wd0Xe7KGTYdywL9z9g==",
+ "version": "11.18.4",
+ "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.4.tgz",
+ "integrity": "sha512-gK/AylAQC5DvCD5YLNCHW4PNzpCfrWIyVAXbSMl+/5QXzlDP8VdBoqE2s2niGHB+zIXwBV9hRXbDrVuupbgHcg==",
"dependencies": {
"@babel/runtime": "^7.14.5",
- "html-escaper": "^2.0.2",
"html-parse-stringify": "^3.0.1"
},
"peerDependencies": {
@@ -14079,9 +14079,9 @@
}
},
"node_modules/react-is": {
- "version": "17.0.2",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
- "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+ "version": "18.2.0",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
},
"node_modules/react-refresh": {
"version": "0.11.0",
@@ -14202,9 +14202,9 @@
}
},
"node_modules/react-transition-group": {
- "version": "4.4.2",
- "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
- "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
+ "version": "4.4.5",
+ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+ "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
"dependencies": {
"@babel/runtime": "^7.5.5",
"dom-helpers": "^5.0.1",
@@ -14332,9 +14332,9 @@
}
},
"node_modules/regexpu-core": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
- "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz",
+ "integrity": "sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==",
"dependencies": {
"regenerate": "^1.4.2",
"regenerate-unicode-properties": "^10.0.1",
@@ -14551,9 +14551,9 @@
}
},
"node_modules/rollup": {
- "version": "2.75.7",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz",
- "integrity": "sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==",
+ "version": "2.78.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.78.0.tgz",
+ "integrity": "sha512-4+YfbQC9QEVvKTanHhIAFVUFSRsezvQF8vFOJwtGfb9Bb+r014S+qryr9PSmw8x6sMnPkmFBGAvIFVQxvJxjtg==",
"bin": {
"rollup": "dist/bin/rollup"
},
@@ -15473,9 +15473,9 @@
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
},
"node_modules/tailwindcss": {
- "version": "3.1.4",
- "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.4.tgz",
- "integrity": "sha512-NrxbFV4tYsga/hpWbRyUfIaBrNMXDxx5BsHgBS4v5tlyjf+sDsgBg5m9OxjrXIqAS/uR9kicxLKP+bEHI7BSeQ==",
+ "version": "3.1.8",
+ "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.8.tgz",
+ "integrity": "sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==",
"dependencies": {
"arg": "^5.0.2",
"chokidar": "^3.5.3",
@@ -15486,7 +15486,7 @@
"fast-glob": "^3.2.11",
"glob-parent": "^6.0.2",
"is-glob": "^4.0.3",
- "lilconfig": "^2.0.5",
+ "lilconfig": "^2.0.6",
"normalize-path": "^3.0.0",
"object-hash": "^3.0.0",
"picocolors": "^1.0.0",
@@ -15498,7 +15498,7 @@
"postcss-selector-parser": "^6.0.10",
"postcss-value-parser": "^4.2.0",
"quick-lru": "^5.1.1",
- "resolve": "^1.22.0"
+ "resolve": "^1.22.1"
},
"bin": {
"tailwind": "lib/cli.js",
@@ -15593,15 +15593,15 @@
}
},
"node_modules/terser-webpack-plugin": {
- "version": "5.3.3",
- "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz",
- "integrity": "sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==",
+ "version": "5.3.5",
+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.5.tgz",
+ "integrity": "sha512-AOEDLDxD2zylUGf/wxHxklEkOe2/r+seuyOWujejFrIxHf11brA1/dWQNIgXa1c6/Wkxgu7zvv0JhOWfc2ELEA==",
"dependencies": {
- "@jridgewell/trace-mapping": "^0.3.7",
+ "@jridgewell/trace-mapping": "^0.3.14",
"jest-worker": "^27.4.5",
"schema-utils": "^3.1.1",
"serialize-javascript": "^6.0.0",
- "terser": "^5.7.2"
+ "terser": "^5.14.1"
},
"engines": {
"node": ">= 10.13.0"
@@ -15938,9 +15938,9 @@
}
},
"node_modules/update-browserslist-db": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz",
- "integrity": "sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==",
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz",
+ "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==",
"funding": [
{
"type": "opencollective",
@@ -16108,20 +16108,20 @@
}
},
"node_modules/webpack": {
- "version": "5.73.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz",
- "integrity": "sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==",
+ "version": "5.74.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
+ "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
"dependencies": {
"@types/eslint-scope": "^3.7.3",
"@types/estree": "^0.0.51",
"@webassemblyjs/ast": "1.11.1",
"@webassemblyjs/wasm-edit": "1.11.1",
"@webassemblyjs/wasm-parser": "1.11.1",
- "acorn": "^8.4.1",
+ "acorn": "^8.7.1",
"acorn-import-assertions": "^1.7.6",
"browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2",
- "enhanced-resolve": "^5.9.3",
+ "enhanced-resolve": "^5.10.0",
"es-module-lexer": "^0.9.0",
"eslint-scope": "5.1.1",
"events": "^3.2.0",
@@ -16134,7 +16134,7 @@
"schema-utils": "^3.1.0",
"tapable": "^2.1.1",
"terser-webpack-plugin": "^5.1.3",
- "watchpack": "^2.3.1",
+ "watchpack": "^2.4.0",
"webpack-sources": "^3.2.3"
},
"bin": {
@@ -16225,9 +16225,9 @@
}
},
"node_modules/webpack-dev-server": {
- "version": "4.9.2",
- "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz",
- "integrity": "sha512-H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q==",
+ "version": "4.10.0",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.10.0.tgz",
+ "integrity": "sha512-7dezwAs+k6yXVFZ+MaL8VnE+APobiO3zvpp3rBHe/HmWQ+avwh0Q3d0xxacOiBybZZ3syTZw9HXzpa3YNbAZDQ==",
"dependencies": {
"@types/bonjour": "^3.5.9",
"@types/connect-history-api-fallback": "^1.3.5",
@@ -16241,7 +16241,7 @@
"chokidar": "^3.5.3",
"colorette": "^2.0.10",
"compression": "^1.7.4",
- "connect-history-api-fallback": "^1.6.0",
+ "connect-history-api-fallback": "^2.0.0",
"default-gateway": "^6.0.3",
"express": "^4.17.3",
"graceful-fs": "^4.2.6",
@@ -16265,6 +16265,10 @@
"engines": {
"node": ">= 12.13.0"
},
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/webpack"
+ },
"peerDependencies": {
"webpack": "^4.37.0 || ^5.0.0"
},
@@ -16324,9 +16328,9 @@
}
},
"node_modules/webpack-dev-server/node_modules/ws": {
- "version": "8.8.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
- "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
+ "version": "8.8.1",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
+ "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
"engines": {
"node": ">=10.0.0"
},
@@ -16386,6 +16390,11 @@
"node": ">=10.13.0"
}
},
+ "node_modules/webpack/node_modules/@types/estree": {
+ "version": "0.0.51",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+ "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
+ },
"node_modules/webpack/node_modules/eslint-scope": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -16508,26 +16517,26 @@
}
},
"node_modules/workbox-background-sync": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.3.tgz",
- "integrity": "sha512-0DD/V05FAcek6tWv9XYj2w5T/plxhDSpclIcAGjA/b7t/6PdaRkQ7ZgtAX6Q/L7kV7wZ8uYRJUoH11VjNipMZw==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz",
+ "integrity": "sha512-0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g==",
"dependencies": {
- "idb": "^6.1.4",
- "workbox-core": "6.5.3"
+ "idb": "^7.0.1",
+ "workbox-core": "6.5.4"
}
},
"node_modules/workbox-broadcast-update": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.3.tgz",
- "integrity": "sha512-4AwCIA5DiDrYhlN+Miv/fp5T3/whNmSL+KqhTwRBTZIL6pvTgE4lVuRzAt1JltmqyMcQ3SEfCdfxczuI4kwFQg==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz",
+ "integrity": "sha512-I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw==",
"dependencies": {
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"node_modules/workbox-build": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.3.tgz",
- "integrity": "sha512-8JNHHS7u13nhwIYCDea9MNXBNPHXCs5KDZPKI/ZNTr3f4sMGoD7hgFGecbyjX1gw4z6e9bMpMsOEJNyH5htA/w==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.4.tgz",
+ "integrity": "sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA==",
"dependencies": {
"@apideck/better-ajv-errors": "^0.3.1",
"@babel/core": "^7.11.1",
@@ -16551,30 +16560,30 @@
"strip-comments": "^2.0.1",
"tempy": "^0.6.0",
"upath": "^1.2.0",
- "workbox-background-sync": "6.5.3",
- "workbox-broadcast-update": "6.5.3",
- "workbox-cacheable-response": "6.5.3",
- "workbox-core": "6.5.3",
- "workbox-expiration": "6.5.3",
- "workbox-google-analytics": "6.5.3",
- "workbox-navigation-preload": "6.5.3",
- "workbox-precaching": "6.5.3",
- "workbox-range-requests": "6.5.3",
- "workbox-recipes": "6.5.3",
- "workbox-routing": "6.5.3",
- "workbox-strategies": "6.5.3",
- "workbox-streams": "6.5.3",
- "workbox-sw": "6.5.3",
- "workbox-window": "6.5.3"
+ "workbox-background-sync": "6.5.4",
+ "workbox-broadcast-update": "6.5.4",
+ "workbox-cacheable-response": "6.5.4",
+ "workbox-core": "6.5.4",
+ "workbox-expiration": "6.5.4",
+ "workbox-google-analytics": "6.5.4",
+ "workbox-navigation-preload": "6.5.4",
+ "workbox-precaching": "6.5.4",
+ "workbox-range-requests": "6.5.4",
+ "workbox-recipes": "6.5.4",
+ "workbox-routing": "6.5.4",
+ "workbox-strategies": "6.5.4",
+ "workbox-streams": "6.5.4",
+ "workbox-sw": "6.5.4",
+ "workbox-window": "6.5.4"
},
"engines": {
"node": ">=10.0.0"
}
},
"node_modules/workbox-build/node_modules/@apideck/better-ajv-errors": {
- "version": "0.3.4",
- "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.4.tgz",
- "integrity": "sha512-Ic2d8ZT6HJiSikGVQvSklaFyw1OUv4g8sDOxa0PXSlbmN/3gL5IO1WYY9DOwTDqOFmjWoqG1yaaKnPDqYCE9KA==",
+ "version": "0.3.6",
+ "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz",
+ "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==",
"dependencies": {
"json-schema": "^0.4.0",
"jsonpointer": "^5.0.0",
@@ -16656,117 +16665,117 @@
}
},
"node_modules/workbox-cacheable-response": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.3.tgz",
- "integrity": "sha512-6JE/Zm05hNasHzzAGKDkqqgYtZZL2H06ic2GxuRLStA4S/rHUfm2mnLFFXuHAaGR1XuuYyVCEey1M6H3PdZ7SQ==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz",
+ "integrity": "sha512-DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug==",
"dependencies": {
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"node_modules/workbox-core": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.3.tgz",
- "integrity": "sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q=="
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.4.tgz",
+ "integrity": "sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q=="
},
"node_modules/workbox-expiration": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.3.tgz",
- "integrity": "sha512-jzYopYR1zD04ZMdlbn/R2Ik6ixiXbi15c9iX5H8CTi6RPDz7uhvMLZPKEndZTpfgmUk8mdmT9Vx/AhbuCl5Sqw==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.4.tgz",
+ "integrity": "sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ==",
"dependencies": {
- "idb": "^6.1.4",
- "workbox-core": "6.5.3"
+ "idb": "^7.0.1",
+ "workbox-core": "6.5.4"
}
},
"node_modules/workbox-google-analytics": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.3.tgz",
- "integrity": "sha512-3GLCHotz5umoRSb4aNQeTbILETcrTVEozSfLhHSBaegHs1PnqCmN0zbIy2TjTpph2AGXiNwDrWGF0AN+UgDNTw==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz",
+ "integrity": "sha512-8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg==",
"dependencies": {
- "workbox-background-sync": "6.5.3",
- "workbox-core": "6.5.3",
- "workbox-routing": "6.5.3",
- "workbox-strategies": "6.5.3"
+ "workbox-background-sync": "6.5.4",
+ "workbox-core": "6.5.4",
+ "workbox-routing": "6.5.4",
+ "workbox-strategies": "6.5.4"
}
},
"node_modules/workbox-navigation-preload": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.3.tgz",
- "integrity": "sha512-bK1gDFTc5iu6lH3UQ07QVo+0ovErhRNGvJJO/1ngknT0UQ702nmOUhoN9qE5mhuQSrnK+cqu7O7xeaJ+Rd9Tmg==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz",
+ "integrity": "sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng==",
"dependencies": {
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"node_modules/workbox-precaching": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.3.tgz",
- "integrity": "sha512-sjNfgNLSsRX5zcc63H/ar/hCf+T19fRtTqvWh795gdpghWb5xsfEkecXEvZ8biEi1QD7X/ljtHphdaPvXDygMQ==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.4.tgz",
+ "integrity": "sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg==",
"dependencies": {
- "workbox-core": "6.5.3",
- "workbox-routing": "6.5.3",
- "workbox-strategies": "6.5.3"
+ "workbox-core": "6.5.4",
+ "workbox-routing": "6.5.4",
+ "workbox-strategies": "6.5.4"
}
},
"node_modules/workbox-range-requests": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.3.tgz",
- "integrity": "sha512-pGCP80Bpn/0Q0MQsfETSfmtXsQcu3M2QCJwSFuJ6cDp8s2XmbUXkzbuQhCUzKR86ZH2Vex/VUjb2UaZBGamijA==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz",
+ "integrity": "sha512-Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg==",
"dependencies": {
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"node_modules/workbox-recipes": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.3.tgz",
- "integrity": "sha512-IcgiKYmbGiDvvf3PMSEtmwqxwfQ5zwI7OZPio3GWu4PfehA8jI8JHI3KZj+PCfRiUPZhjQHJ3v1HbNs+SiSkig==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.4.tgz",
+ "integrity": "sha512-QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA==",
"dependencies": {
- "workbox-cacheable-response": "6.5.3",
- "workbox-core": "6.5.3",
- "workbox-expiration": "6.5.3",
- "workbox-precaching": "6.5.3",
- "workbox-routing": "6.5.3",
- "workbox-strategies": "6.5.3"
+ "workbox-cacheable-response": "6.5.4",
+ "workbox-core": "6.5.4",
+ "workbox-expiration": "6.5.4",
+ "workbox-precaching": "6.5.4",
+ "workbox-routing": "6.5.4",
+ "workbox-strategies": "6.5.4"
}
},
"node_modules/workbox-routing": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.3.tgz",
- "integrity": "sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.4.tgz",
+ "integrity": "sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg==",
"dependencies": {
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"node_modules/workbox-strategies": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.3.tgz",
- "integrity": "sha512-MgmGRrDVXs7rtSCcetZgkSZyMpRGw8HqL2aguszOc3nUmzGZsT238z/NN9ZouCxSzDu3PQ3ZSKmovAacaIhu1w==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.4.tgz",
+ "integrity": "sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw==",
"dependencies": {
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"node_modules/workbox-streams": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.3.tgz",
- "integrity": "sha512-vN4Qi8o+b7zj1FDVNZ+PlmAcy1sBoV7SC956uhqYvZ9Sg1fViSbOpydULOssVJ4tOyKRifH/eoi6h99d+sJ33w==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.4.tgz",
+ "integrity": "sha512-FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg==",
"dependencies": {
- "workbox-core": "6.5.3",
- "workbox-routing": "6.5.3"
+ "workbox-core": "6.5.4",
+ "workbox-routing": "6.5.4"
}
},
"node_modules/workbox-sw": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.3.tgz",
- "integrity": "sha512-BQBzm092w+NqdIEF2yhl32dERt9j9MDGUTa2Eaa+o3YKL4Qqw55W9yQC6f44FdAHdAJrJvp0t+HVrfh8AiGj8A=="
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.4.tgz",
+ "integrity": "sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA=="
},
"node_modules/workbox-webpack-plugin": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.3.tgz",
- "integrity": "sha512-Es8Xr02Gi6Kc3zaUwR691ZLy61hz3vhhs5GztcklQ7kl5k2qAusPh0s6LF3wEtlpfs9ZDErnmy5SErwoll7jBA==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.4.tgz",
+ "integrity": "sha512-LmWm/zoaahe0EGmMTrSLUi+BjyR3cdGEfU3fS6PN1zKFYbqAKuQ+Oy/27e4VSXsyIwAw8+QDfk1XHNGtZu9nQg==",
"dependencies": {
"fast-json-stable-stringify": "^2.1.0",
"pretty-bytes": "^5.4.1",
"upath": "^1.2.0",
"webpack-sources": "^1.4.3",
- "workbox-build": "6.5.3"
+ "workbox-build": "6.5.4"
},
"engines": {
"node": ">=10.0.0"
@@ -16793,12 +16802,12 @@
}
},
"node_modules/workbox-window": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.3.tgz",
- "integrity": "sha512-GnJbx1kcKXDtoJBVZs/P7ddP0Yt52NNy4nocjBpYPiRhMqTpJCNrSL+fGHZ/i/oP6p/vhE8II0sA6AZGKGnssw==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.4.tgz",
+ "integrity": "sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug==",
"dependencies": {
"@types/trusted-types": "^2.0.2",
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"node_modules/wrap-ansi": {
@@ -16864,9 +16873,9 @@
}
},
"node_modules/ws": {
- "version": "7.5.8",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz",
- "integrity": "sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==",
+ "version": "7.5.9",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+ "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
"engines": {
"node": ">=8.3.0"
},
@@ -16970,33 +16979,33 @@
}
},
"@babel/code-frame": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz",
- "integrity": "sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
+ "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
"requires": {
- "@babel/highlight": "^7.16.7"
+ "@babel/highlight": "^7.18.6"
}
},
"@babel/compat-data": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.5.tgz",
- "integrity": "sha512-BxhE40PVCBxVEJsSBhB6UWyAuqJRxGsAw8BdHMJ3AKGydcwuWW4kOO3HmqBQAdcq/OP+/DlTVxLvsCzRTnZuGg=="
+ "version": "7.18.8",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz",
+ "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="
},
"@babel/core": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.5.tgz",
- "integrity": "sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz",
+ "integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==",
"requires": {
"@ampproject/remapping": "^2.1.0",
- "@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.18.2",
- "@babel/helper-compilation-targets": "^7.18.2",
- "@babel/helper-module-transforms": "^7.18.0",
- "@babel/helpers": "^7.18.2",
- "@babel/parser": "^7.18.5",
- "@babel/template": "^7.16.7",
- "@babel/traverse": "^7.18.5",
- "@babel/types": "^7.18.4",
+ "@babel/code-frame": "^7.18.6",
+ "@babel/generator": "^7.18.10",
+ "@babel/helper-compilation-targets": "^7.18.9",
+ "@babel/helper-module-transforms": "^7.18.9",
+ "@babel/helpers": "^7.18.9",
+ "@babel/parser": "^7.18.10",
+ "@babel/template": "^7.18.10",
+ "@babel/traverse": "^7.18.10",
+ "@babel/types": "^7.18.10",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -17005,9 +17014,9 @@
}
},
"@babel/eslint-parser": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.2.tgz",
- "integrity": "sha512-oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.9.tgz",
+ "integrity": "sha512-KzSGpMBggz4fKbRbWLNyPVTuQr6cmCcBhOyXTw/fieOVaw5oYAwcAj4a7UKcDYCPxQq+CG1NCDZH9e2JTXquiQ==",
"requires": {
"eslint-scope": "^5.1.1",
"eslint-visitor-keys": "^2.1.0",
@@ -17036,21 +17045,21 @@
}
},
"@babel/generator": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz",
- "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==",
+ "version": "7.18.12",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz",
+ "integrity": "sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==",
"requires": {
- "@babel/types": "^7.18.2",
- "@jridgewell/gen-mapping": "^0.3.0",
+ "@babel/types": "^7.18.10",
+ "@jridgewell/gen-mapping": "^0.3.2",
"jsesc": "^2.5.1"
},
"dependencies": {
"@jridgewell/gen-mapping": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
- "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+ "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
"requires": {
- "@jridgewell/set-array": "^1.0.0",
+ "@jridgewell/set-array": "^1.0.1",
"@jridgewell/sourcemap-codec": "^1.4.10",
"@jridgewell/trace-mapping": "^0.3.9"
}
@@ -17058,65 +17067,63 @@
}
},
"@babel/helper-annotate-as-pure": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
- "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+ "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
"requires": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.18.6"
}
},
"@babel/helper-builder-binary-assignment-operator-visitor": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
- "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
+ "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
"requires": {
- "@babel/helper-explode-assignable-expression": "^7.16.7",
- "@babel/types": "^7.16.7"
+ "@babel/helper-explode-assignable-expression": "^7.18.6",
+ "@babel/types": "^7.18.9"
}
},
"@babel/helper-compilation-targets": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz",
- "integrity": "sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz",
+ "integrity": "sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==",
"requires": {
- "@babel/compat-data": "^7.17.10",
- "@babel/helper-validator-option": "^7.16.7",
+ "@babel/compat-data": "^7.18.8",
+ "@babel/helper-validator-option": "^7.18.6",
"browserslist": "^4.20.2",
"semver": "^6.3.0"
}
},
"@babel/helper-create-class-features-plugin": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz",
- "integrity": "sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz",
+ "integrity": "sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw==",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "@babel/helper-environment-visitor": "^7.16.7",
- "@babel/helper-function-name": "^7.17.9",
- "@babel/helper-member-expression-to-functions": "^7.17.7",
- "@babel/helper-optimise-call-expression": "^7.16.7",
- "@babel/helper-replace-supers": "^7.16.7",
- "@babel/helper-split-export-declaration": "^7.16.7"
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-member-expression-to-functions": "^7.18.9",
+ "@babel/helper-optimise-call-expression": "^7.18.6",
+ "@babel/helper-replace-supers": "^7.18.9",
+ "@babel/helper-split-export-declaration": "^7.18.6"
}
},
"@babel/helper-create-regexp-features-plugin": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz",
- "integrity": "sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz",
+ "integrity": "sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "regexpu-core": "^5.0.1"
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "regexpu-core": "^5.1.0"
}
},
"@babel/helper-define-polyfill-provider": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
- "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz",
+ "integrity": "sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==",
"requires": {
- "@babel/helper-compilation-targets": "^7.13.0",
- "@babel/helper-module-imports": "^7.12.13",
- "@babel/helper-plugin-utils": "^7.13.0",
- "@babel/traverse": "^7.13.0",
+ "@babel/helper-compilation-targets": "^7.17.7",
+ "@babel/helper-plugin-utils": "^7.16.7",
"debug": "^4.1.1",
"lodash.debounce": "^4.0.8",
"resolve": "^1.14.2",
@@ -17124,343 +17131,349 @@
}
},
"@babel/helper-environment-visitor": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz",
- "integrity": "sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ=="
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+ "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="
},
"@babel/helper-explode-assignable-expression": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
- "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
+ "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
"requires": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.18.6"
}
},
"@babel/helper-function-name": {
- "version": "7.17.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
- "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz",
+ "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==",
"requires": {
- "@babel/template": "^7.16.7",
- "@babel/types": "^7.17.0"
+ "@babel/template": "^7.18.6",
+ "@babel/types": "^7.18.9"
}
},
"@babel/helper-hoist-variables": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz",
- "integrity": "sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+ "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
"requires": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.18.6"
}
},
"@babel/helper-member-expression-to-functions": {
- "version": "7.17.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
- "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
+ "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
"requires": {
- "@babel/types": "^7.17.0"
+ "@babel/types": "^7.18.9"
}
},
"@babel/helper-module-imports": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz",
- "integrity": "sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
+ "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
"requires": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.18.6"
}
},
"@babel/helper-module-transforms": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz",
- "integrity": "sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz",
+ "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==",
"requires": {
- "@babel/helper-environment-visitor": "^7.16.7",
- "@babel/helper-module-imports": "^7.16.7",
- "@babel/helper-simple-access": "^7.17.7",
- "@babel/helper-split-export-declaration": "^7.16.7",
- "@babel/helper-validator-identifier": "^7.16.7",
- "@babel/template": "^7.16.7",
- "@babel/traverse": "^7.18.0",
- "@babel/types": "^7.18.0"
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-module-imports": "^7.18.6",
+ "@babel/helper-simple-access": "^7.18.6",
+ "@babel/helper-split-export-declaration": "^7.18.6",
+ "@babel/helper-validator-identifier": "^7.18.6",
+ "@babel/template": "^7.18.6",
+ "@babel/traverse": "^7.18.9",
+ "@babel/types": "^7.18.9"
}
},
"@babel/helper-optimise-call-expression": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
- "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
+ "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
"requires": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.18.6"
}
},
"@babel/helper-plugin-utils": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz",
- "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz",
+ "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="
},
"@babel/helper-remap-async-to-generator": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
- "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
+ "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "@babel/helper-wrap-function": "^7.16.8",
- "@babel/types": "^7.16.8"
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-wrap-function": "^7.18.9",
+ "@babel/types": "^7.18.9"
}
},
"@babel/helper-replace-supers": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz",
- "integrity": "sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz",
+ "integrity": "sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==",
"requires": {
- "@babel/helper-environment-visitor": "^7.18.2",
- "@babel/helper-member-expression-to-functions": "^7.17.7",
- "@babel/helper-optimise-call-expression": "^7.16.7",
- "@babel/traverse": "^7.18.2",
- "@babel/types": "^7.18.2"
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-member-expression-to-functions": "^7.18.9",
+ "@babel/helper-optimise-call-expression": "^7.18.6",
+ "@babel/traverse": "^7.18.9",
+ "@babel/types": "^7.18.9"
}
},
"@babel/helper-simple-access": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz",
- "integrity": "sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz",
+ "integrity": "sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==",
"requires": {
- "@babel/types": "^7.18.2"
+ "@babel/types": "^7.18.6"
}
},
"@babel/helper-skip-transparent-expression-wrappers": {
- "version": "7.16.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
- "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz",
+ "integrity": "sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==",
"requires": {
- "@babel/types": "^7.16.0"
+ "@babel/types": "^7.18.9"
}
},
"@babel/helper-split-export-declaration": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz",
- "integrity": "sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+ "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
"requires": {
- "@babel/types": "^7.16.7"
+ "@babel/types": "^7.18.6"
}
},
+ "@babel/helper-string-parser": {
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz",
+ "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="
+ },
"@babel/helper-validator-identifier": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz",
- "integrity": "sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
+ "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
},
"@babel/helper-validator-option": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz",
- "integrity": "sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
+ "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
},
"@babel/helper-wrap-function": {
- "version": "7.16.8",
- "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
- "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
+ "version": "7.18.11",
+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz",
+ "integrity": "sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==",
"requires": {
- "@babel/helper-function-name": "^7.16.7",
- "@babel/template": "^7.16.7",
- "@babel/traverse": "^7.16.8",
- "@babel/types": "^7.16.8"
+ "@babel/helper-function-name": "^7.18.9",
+ "@babel/template": "^7.18.10",
+ "@babel/traverse": "^7.18.11",
+ "@babel/types": "^7.18.10"
}
},
"@babel/helpers": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz",
- "integrity": "sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz",
+ "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==",
"requires": {
- "@babel/template": "^7.16.7",
- "@babel/traverse": "^7.18.2",
- "@babel/types": "^7.18.2"
+ "@babel/template": "^7.18.6",
+ "@babel/traverse": "^7.18.9",
+ "@babel/types": "^7.18.9"
}
},
"@babel/highlight": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
- "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz",
+ "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
"requires": {
- "@babel/helper-validator-identifier": "^7.16.7",
+ "@babel/helper-validator-identifier": "^7.18.6",
"chalk": "^2.0.0",
"js-tokens": "^4.0.0"
}
},
"@babel/parser": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.5.tgz",
- "integrity": "sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw=="
+ "version": "7.18.11",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz",
+ "integrity": "sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ=="
},
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz",
- "integrity": "sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
+ "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz",
- "integrity": "sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
+ "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
- "@babel/plugin-proposal-optional-chaining": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
+ "@babel/plugin-proposal-optional-chaining": "^7.18.9"
}
},
"@babel/plugin-proposal-async-generator-functions": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz",
- "integrity": "sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz",
+ "integrity": "sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-remap-async-to-generator": "^7.16.8",
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-remap-async-to-generator": "^7.18.9",
"@babel/plugin-syntax-async-generators": "^7.8.4"
}
},
"@babel/plugin-proposal-class-properties": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz",
- "integrity": "sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+ "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.17.12",
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-create-class-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-proposal-class-static-block": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz",
- "integrity": "sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
+ "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-create-class-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-class-static-block": "^7.14.5"
}
},
"@babel/plugin-proposal-decorators": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.2.tgz",
- "integrity": "sha512-kbDISufFOxeczi0v4NQP3p5kIeW6izn/6klfWBrIIdGZZe4UpHR+QU03FAoWjGGd9SUXAwbw2pup1kaL4OQsJQ==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.10.tgz",
+ "integrity": "sha512-wdGTwWF5QtpTY/gbBtQLAiCnoxfD4qMbN87NYZle1dOZ9Os8Y6zXcKrIaOU8W+TIvFUWVGG9tUgNww3CjXRVVw==",
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-replace-supers": "^7.18.2",
- "@babel/helper-split-export-declaration": "^7.16.7",
- "@babel/plugin-syntax-decorators": "^7.17.12",
- "charcodes": "^0.2.0"
+ "@babel/helper-create-class-features-plugin": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-replace-supers": "^7.18.9",
+ "@babel/helper-split-export-declaration": "^7.18.6",
+ "@babel/plugin-syntax-decorators": "^7.18.6"
}
},
"@babel/plugin-proposal-dynamic-import": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
- "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
+ "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
"requires": {
- "@babel/helper-plugin-utils": "^7.16.7",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-dynamic-import": "^7.8.3"
}
},
"@babel/plugin-proposal-export-namespace-from": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz",
- "integrity": "sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
+ "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-plugin-utils": "^7.18.9",
"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
}
},
"@babel/plugin-proposal-json-strings": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz",
- "integrity": "sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
+ "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-json-strings": "^7.8.3"
}
},
"@babel/plugin-proposal-logical-assignment-operators": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz",
- "integrity": "sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
+ "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-plugin-utils": "^7.18.9",
"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
}
},
"@babel/plugin-proposal-nullish-coalescing-operator": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz",
- "integrity": "sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
+ "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
}
},
"@babel/plugin-proposal-numeric-separator": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
- "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
+ "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
"requires": {
- "@babel/helper-plugin-utils": "^7.16.7",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-numeric-separator": "^7.10.4"
}
},
"@babel/plugin-proposal-object-rest-spread": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz",
- "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz",
+ "integrity": "sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==",
"requires": {
- "@babel/compat-data": "^7.17.10",
- "@babel/helper-compilation-targets": "^7.17.10",
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/compat-data": "^7.18.8",
+ "@babel/helper-compilation-targets": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9",
"@babel/plugin-syntax-object-rest-spread": "^7.8.3",
- "@babel/plugin-transform-parameters": "^7.17.12"
+ "@babel/plugin-transform-parameters": "^7.18.8"
}
},
"@babel/plugin-proposal-optional-catch-binding": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
- "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
+ "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
"requires": {
- "@babel/helper-plugin-utils": "^7.16.7",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
}
},
"@babel/plugin-proposal-optional-chaining": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz",
- "integrity": "sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
+ "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
"@babel/plugin-syntax-optional-chaining": "^7.8.3"
}
},
"@babel/plugin-proposal-private-methods": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz",
- "integrity": "sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
+ "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.17.12",
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-create-class-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-proposal-private-property-in-object": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz",
- "integrity": "sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
+ "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "@babel/helper-create-class-features-plugin": "^7.17.12",
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-create-class-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6",
"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
}
},
"@babel/plugin-proposal-unicode-property-regex": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz",
- "integrity": "sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+ "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
"requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.17.12",
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-syntax-async-generators": {
@@ -17496,11 +17509,11 @@
}
},
"@babel/plugin-syntax-decorators": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.12.tgz",
- "integrity": "sha512-D1Hz0qtGTza8K2xGyEdVNCYLdVHukAcbQr4K3/s6r/esadyEriZovpJimQOpu8ju4/jV8dW/1xdaE0UpDroidw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz",
+ "integrity": "sha512-fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-syntax-dynamic-import": {
@@ -17520,19 +17533,19 @@
}
},
"@babel/plugin-syntax-flow": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.17.12.tgz",
- "integrity": "sha512-B8QIgBvkIG6G2jgsOHQUist7Sm0EBLDCx8sen072IwqNuzMegZNXrYnSv77cYzA8mLDZAfQYqsLIhimiP1s2HQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz",
+ "integrity": "sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-syntax-import-assertions": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz",
- "integrity": "sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz",
+ "integrity": "sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-syntax-import-meta": {
@@ -17552,11 +17565,11 @@
}
},
"@babel/plugin-syntax-jsx": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz",
- "integrity": "sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
+ "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-syntax-logical-assignment-operators": {
@@ -17624,406 +17637,406 @@
}
},
"@babel/plugin-syntax-typescript": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz",
- "integrity": "sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz",
+ "integrity": "sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-arrow-functions": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz",
- "integrity": "sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
+ "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-async-to-generator": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz",
- "integrity": "sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
+ "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
"requires": {
- "@babel/helper-module-imports": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-remap-async-to-generator": "^7.16.8"
+ "@babel/helper-module-imports": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6",
+ "@babel/helper-remap-async-to-generator": "^7.18.6"
}
},
"@babel/plugin-transform-block-scoped-functions": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
- "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
+ "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
"requires": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-block-scoping": {
- "version": "7.18.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz",
- "integrity": "sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz",
+ "integrity": "sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
}
},
"@babel/plugin-transform-classes": {
- "version": "7.18.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz",
- "integrity": "sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz",
+ "integrity": "sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "@babel/helper-environment-visitor": "^7.18.2",
- "@babel/helper-function-name": "^7.17.9",
- "@babel/helper-optimise-call-expression": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-replace-supers": "^7.18.2",
- "@babel/helper-split-export-declaration": "^7.16.7",
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-optimise-call-expression": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-replace-supers": "^7.18.9",
+ "@babel/helper-split-export-declaration": "^7.18.6",
"globals": "^11.1.0"
}
},
"@babel/plugin-transform-computed-properties": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz",
- "integrity": "sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
+ "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
}
},
"@babel/plugin-transform-destructuring": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz",
- "integrity": "sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz",
+ "integrity": "sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
}
},
"@babel/plugin-transform-dotall-regex": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
- "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
+ "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
"requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-duplicate-keys": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz",
- "integrity": "sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
+ "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
}
},
"@babel/plugin-transform-exponentiation-operator": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
- "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
+ "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
"requires": {
- "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-flow-strip-types": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.17.12.tgz",
- "integrity": "sha512-g8cSNt+cHCpG/uunPQELdq/TeV3eg1OLJYwxypwHtAWo9+nErH3lQx9CSO2uI9lF74A0mR0t4KoMjs1snSgnTw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.18.9.tgz",
+ "integrity": "sha512-+G6rp2zRuOAInY5wcggsx4+QVao1qPM0osC9fTUVlAV3zOrzTCnrMAFVnR6+a3T8wz1wFIH7KhYMcMB3u1n80A==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/plugin-syntax-flow": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/plugin-syntax-flow": "^7.18.6"
}
},
"@babel/plugin-transform-for-of": {
- "version": "7.18.1",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz",
- "integrity": "sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==",
+ "version": "7.18.8",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
+ "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-function-name": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
- "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
+ "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
"requires": {
- "@babel/helper-compilation-targets": "^7.16.7",
- "@babel/helper-function-name": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-compilation-targets": "^7.18.9",
+ "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9"
}
},
"@babel/plugin-transform-literals": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz",
- "integrity": "sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
+ "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
}
},
"@babel/plugin-transform-member-expression-literals": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
- "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
+ "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
"requires": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-modules-amd": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz",
- "integrity": "sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz",
+ "integrity": "sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==",
"requires": {
- "@babel/helper-module-transforms": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-module-transforms": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6",
"babel-plugin-dynamic-import-node": "^2.3.3"
}
},
"@babel/plugin-transform-modules-commonjs": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz",
- "integrity": "sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz",
+ "integrity": "sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==",
"requires": {
- "@babel/helper-module-transforms": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-simple-access": "^7.18.2",
+ "@babel/helper-module-transforms": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6",
+ "@babel/helper-simple-access": "^7.18.6",
"babel-plugin-dynamic-import-node": "^2.3.3"
}
},
"@babel/plugin-transform-modules-systemjs": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.5.tgz",
- "integrity": "sha512-SEewrhPpcqMF1V7DhnEbhVJLrC+nnYfe1E0piZMZXBpxi9WvZqWGwpsk7JYP7wPWeqaBh4gyKlBhHJu3uz5g4Q==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz",
+ "integrity": "sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==",
"requires": {
- "@babel/helper-hoist-variables": "^7.16.7",
- "@babel/helper-module-transforms": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-validator-identifier": "^7.16.7",
+ "@babel/helper-hoist-variables": "^7.18.6",
+ "@babel/helper-module-transforms": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-validator-identifier": "^7.18.6",
"babel-plugin-dynamic-import-node": "^2.3.3"
}
},
"@babel/plugin-transform-modules-umd": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz",
- "integrity": "sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
+ "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
"requires": {
- "@babel/helper-module-transforms": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-module-transforms": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz",
- "integrity": "sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz",
+ "integrity": "sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==",
"requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.17.12",
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-new-target": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.5.tgz",
- "integrity": "sha512-TuRL5uGW4KXU6OsRj+mLp9BM7pO8e7SGNTEokQRRxHFkXYMFiy2jlKSZPFtI/mKORDzciH+hneskcSOp0gU8hg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
+ "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-object-super": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
- "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
+ "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
"requires": {
- "@babel/helper-plugin-utils": "^7.16.7",
- "@babel/helper-replace-supers": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6",
+ "@babel/helper-replace-supers": "^7.18.6"
}
},
"@babel/plugin-transform-parameters": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz",
- "integrity": "sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==",
+ "version": "7.18.8",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
+ "integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-property-literals": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
- "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
+ "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
"requires": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-react-constant-elements": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.17.12.tgz",
- "integrity": "sha512-maEkX2xs2STuv2Px8QuqxqjhV2LsFobT1elCgyU5704fcyTu9DyD/bJXxD/mrRiVyhpHweOQ00OJ5FKhHq9oEw==",
+ "version": "7.18.12",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.18.12.tgz",
+ "integrity": "sha512-Q99U9/ttiu+LMnRU8psd23HhvwXmKWDQIpocm0JKaICcZHnw+mdQbHm6xnSy7dOl8I5PELakYtNBubNQlBXbZw==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
}
},
"@babel/plugin-transform-react-display-name": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz",
- "integrity": "sha512-qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz",
+ "integrity": "sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==",
"requires": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-react-jsx": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz",
- "integrity": "sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.10.tgz",
+ "integrity": "sha512-gCy7Iikrpu3IZjYZolFE4M1Sm+nrh1/6za2Ewj77Z+XirT4TsbJcvOFOyF+fRPwU6AKKK136CZxx6L8AbSFG6A==",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "@babel/helper-module-imports": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/plugin-syntax-jsx": "^7.17.12",
- "@babel/types": "^7.17.12"
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-module-imports": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/plugin-syntax-jsx": "^7.18.6",
+ "@babel/types": "^7.18.10"
}
},
"@babel/plugin-transform-react-jsx-development": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz",
- "integrity": "sha512-RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz",
+ "integrity": "sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==",
"requires": {
- "@babel/plugin-transform-react-jsx": "^7.16.7"
+ "@babel/plugin-transform-react-jsx": "^7.18.6"
}
},
"@babel/plugin-transform-react-pure-annotations": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.0.tgz",
- "integrity": "sha512-6+0IK6ouvqDn9bmEG7mEyF/pwlJXVj5lwydybpyyH3D0A7Hftk+NCTdYjnLNZksn261xaOV5ksmp20pQEmc2RQ==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz",
+ "integrity": "sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==",
"requires": {
- "@babel/helper-annotate-as-pure": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-regenerator": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz",
- "integrity": "sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
+ "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12",
+ "@babel/helper-plugin-utils": "^7.18.6",
"regenerator-transform": "^0.15.0"
}
},
"@babel/plugin-transform-reserved-words": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz",
- "integrity": "sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
+ "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-runtime": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.5.tgz",
- "integrity": "sha512-Q17hHxXr2fplrE+5BSC1j1Fo5cOA8YeP8XW3/1paI8MzF/faZGh0MaH1KC4jLAvqLPamQWHB5/B7KqSLY1kuHA==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz",
+ "integrity": "sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ==",
"requires": {
- "@babel/helper-module-imports": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.17.12",
- "babel-plugin-polyfill-corejs2": "^0.3.0",
- "babel-plugin-polyfill-corejs3": "^0.5.0",
- "babel-plugin-polyfill-regenerator": "^0.3.0",
+ "@babel/helper-module-imports": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "babel-plugin-polyfill-corejs2": "^0.3.2",
+ "babel-plugin-polyfill-corejs3": "^0.5.3",
+ "babel-plugin-polyfill-regenerator": "^0.4.0",
"semver": "^6.3.0"
}
},
"@babel/plugin-transform-shorthand-properties": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
- "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
+ "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
"requires": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-spread": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz",
- "integrity": "sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz",
+ "integrity": "sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
}
},
"@babel/plugin-transform-sticky-regex": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
- "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
+ "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
"requires": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/plugin-transform-template-literals": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz",
- "integrity": "sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
+ "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
}
},
"@babel/plugin-transform-typeof-symbol": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz",
- "integrity": "sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
+ "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.9"
}
},
"@babel/plugin-transform-typescript": {
- "version": "7.18.4",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz",
- "integrity": "sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw==",
+ "version": "7.18.12",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.12.tgz",
+ "integrity": "sha512-2vjjam0cum0miPkenUbQswKowuxs/NjMwIKEq0zwegRxXk12C9YOF9STXnaUptITOtOJHKHpzvvWYOjbm6tc0w==",
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.18.0",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/plugin-syntax-typescript": "^7.17.12"
+ "@babel/helper-create-class-features-plugin": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/plugin-syntax-typescript": "^7.18.6"
}
},
"@babel/plugin-transform-unicode-escapes": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
- "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
+ "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
"requires": {
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.9"
}
},
"@babel/plugin-transform-unicode-regex": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
- "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
+ "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
"requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.16.7",
- "@babel/helper-plugin-utils": "^7.16.7"
+ "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
}
},
"@babel/preset-env": {
- "version": "7.18.2",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz",
- "integrity": "sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz",
+ "integrity": "sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==",
"requires": {
- "@babel/compat-data": "^7.17.10",
- "@babel/helper-compilation-targets": "^7.18.2",
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-validator-option": "^7.16.7",
- "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.17.12",
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.17.12",
- "@babel/plugin-proposal-async-generator-functions": "^7.17.12",
- "@babel/plugin-proposal-class-properties": "^7.17.12",
- "@babel/plugin-proposal-class-static-block": "^7.18.0",
- "@babel/plugin-proposal-dynamic-import": "^7.16.7",
- "@babel/plugin-proposal-export-namespace-from": "^7.17.12",
- "@babel/plugin-proposal-json-strings": "^7.17.12",
- "@babel/plugin-proposal-logical-assignment-operators": "^7.17.12",
- "@babel/plugin-proposal-nullish-coalescing-operator": "^7.17.12",
- "@babel/plugin-proposal-numeric-separator": "^7.16.7",
- "@babel/plugin-proposal-object-rest-spread": "^7.18.0",
- "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
- "@babel/plugin-proposal-optional-chaining": "^7.17.12",
- "@babel/plugin-proposal-private-methods": "^7.17.12",
- "@babel/plugin-proposal-private-property-in-object": "^7.17.12",
- "@babel/plugin-proposal-unicode-property-regex": "^7.17.12",
+ "@babel/compat-data": "^7.18.8",
+ "@babel/helper-compilation-targets": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-validator-option": "^7.18.6",
+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
+ "@babel/plugin-proposal-async-generator-functions": "^7.18.10",
+ "@babel/plugin-proposal-class-properties": "^7.18.6",
+ "@babel/plugin-proposal-class-static-block": "^7.18.6",
+ "@babel/plugin-proposal-dynamic-import": "^7.18.6",
+ "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
+ "@babel/plugin-proposal-json-strings": "^7.18.6",
+ "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
+ "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+ "@babel/plugin-proposal-numeric-separator": "^7.18.6",
+ "@babel/plugin-proposal-object-rest-spread": "^7.18.9",
+ "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
+ "@babel/plugin-proposal-optional-chaining": "^7.18.9",
+ "@babel/plugin-proposal-private-methods": "^7.18.6",
+ "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
+ "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
"@babel/plugin-syntax-async-generators": "^7.8.4",
"@babel/plugin-syntax-class-properties": "^7.12.13",
"@babel/plugin-syntax-class-static-block": "^7.14.5",
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
- "@babel/plugin-syntax-import-assertions": "^7.17.12",
+ "@babel/plugin-syntax-import-assertions": "^7.18.6",
"@babel/plugin-syntax-json-strings": "^7.8.3",
"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -18033,43 +18046,43 @@
"@babel/plugin-syntax-optional-chaining": "^7.8.3",
"@babel/plugin-syntax-private-property-in-object": "^7.14.5",
"@babel/plugin-syntax-top-level-await": "^7.14.5",
- "@babel/plugin-transform-arrow-functions": "^7.17.12",
- "@babel/plugin-transform-async-to-generator": "^7.17.12",
- "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
- "@babel/plugin-transform-block-scoping": "^7.17.12",
- "@babel/plugin-transform-classes": "^7.17.12",
- "@babel/plugin-transform-computed-properties": "^7.17.12",
- "@babel/plugin-transform-destructuring": "^7.18.0",
- "@babel/plugin-transform-dotall-regex": "^7.16.7",
- "@babel/plugin-transform-duplicate-keys": "^7.17.12",
- "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
- "@babel/plugin-transform-for-of": "^7.18.1",
- "@babel/plugin-transform-function-name": "^7.16.7",
- "@babel/plugin-transform-literals": "^7.17.12",
- "@babel/plugin-transform-member-expression-literals": "^7.16.7",
- "@babel/plugin-transform-modules-amd": "^7.18.0",
- "@babel/plugin-transform-modules-commonjs": "^7.18.2",
- "@babel/plugin-transform-modules-systemjs": "^7.18.0",
- "@babel/plugin-transform-modules-umd": "^7.18.0",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.17.12",
- "@babel/plugin-transform-new-target": "^7.17.12",
- "@babel/plugin-transform-object-super": "^7.16.7",
- "@babel/plugin-transform-parameters": "^7.17.12",
- "@babel/plugin-transform-property-literals": "^7.16.7",
- "@babel/plugin-transform-regenerator": "^7.18.0",
- "@babel/plugin-transform-reserved-words": "^7.17.12",
- "@babel/plugin-transform-shorthand-properties": "^7.16.7",
- "@babel/plugin-transform-spread": "^7.17.12",
- "@babel/plugin-transform-sticky-regex": "^7.16.7",
- "@babel/plugin-transform-template-literals": "^7.18.2",
- "@babel/plugin-transform-typeof-symbol": "^7.17.12",
- "@babel/plugin-transform-unicode-escapes": "^7.16.7",
- "@babel/plugin-transform-unicode-regex": "^7.16.7",
+ "@babel/plugin-transform-arrow-functions": "^7.18.6",
+ "@babel/plugin-transform-async-to-generator": "^7.18.6",
+ "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
+ "@babel/plugin-transform-block-scoping": "^7.18.9",
+ "@babel/plugin-transform-classes": "^7.18.9",
+ "@babel/plugin-transform-computed-properties": "^7.18.9",
+ "@babel/plugin-transform-destructuring": "^7.18.9",
+ "@babel/plugin-transform-dotall-regex": "^7.18.6",
+ "@babel/plugin-transform-duplicate-keys": "^7.18.9",
+ "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
+ "@babel/plugin-transform-for-of": "^7.18.8",
+ "@babel/plugin-transform-function-name": "^7.18.9",
+ "@babel/plugin-transform-literals": "^7.18.9",
+ "@babel/plugin-transform-member-expression-literals": "^7.18.6",
+ "@babel/plugin-transform-modules-amd": "^7.18.6",
+ "@babel/plugin-transform-modules-commonjs": "^7.18.6",
+ "@babel/plugin-transform-modules-systemjs": "^7.18.9",
+ "@babel/plugin-transform-modules-umd": "^7.18.6",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.18.6",
+ "@babel/plugin-transform-new-target": "^7.18.6",
+ "@babel/plugin-transform-object-super": "^7.18.6",
+ "@babel/plugin-transform-parameters": "^7.18.8",
+ "@babel/plugin-transform-property-literals": "^7.18.6",
+ "@babel/plugin-transform-regenerator": "^7.18.6",
+ "@babel/plugin-transform-reserved-words": "^7.18.6",
+ "@babel/plugin-transform-shorthand-properties": "^7.18.6",
+ "@babel/plugin-transform-spread": "^7.18.9",
+ "@babel/plugin-transform-sticky-regex": "^7.18.6",
+ "@babel/plugin-transform-template-literals": "^7.18.9",
+ "@babel/plugin-transform-typeof-symbol": "^7.18.9",
+ "@babel/plugin-transform-unicode-escapes": "^7.18.10",
+ "@babel/plugin-transform-unicode-regex": "^7.18.6",
"@babel/preset-modules": "^0.1.5",
- "@babel/types": "^7.18.2",
- "babel-plugin-polyfill-corejs2": "^0.3.0",
- "babel-plugin-polyfill-corejs3": "^0.5.0",
- "babel-plugin-polyfill-regenerator": "^0.3.0",
+ "@babel/types": "^7.18.10",
+ "babel-plugin-polyfill-corejs2": "^0.3.2",
+ "babel-plugin-polyfill-corejs3": "^0.5.3",
+ "babel-plugin-polyfill-regenerator": "^0.4.0",
"core-js-compat": "^3.22.1",
"semver": "^6.3.0"
}
@@ -18087,78 +18100,79 @@
}
},
"@babel/preset-react": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.17.12.tgz",
- "integrity": "sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz",
+ "integrity": "sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-validator-option": "^7.16.7",
- "@babel/plugin-transform-react-display-name": "^7.16.7",
- "@babel/plugin-transform-react-jsx": "^7.17.12",
- "@babel/plugin-transform-react-jsx-development": "^7.16.7",
- "@babel/plugin-transform-react-pure-annotations": "^7.16.7"
+ "@babel/helper-plugin-utils": "^7.18.6",
+ "@babel/helper-validator-option": "^7.18.6",
+ "@babel/plugin-transform-react-display-name": "^7.18.6",
+ "@babel/plugin-transform-react-jsx": "^7.18.6",
+ "@babel/plugin-transform-react-jsx-development": "^7.18.6",
+ "@babel/plugin-transform-react-pure-annotations": "^7.18.6"
}
},
"@babel/preset-typescript": {
- "version": "7.17.12",
- "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz",
- "integrity": "sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg==",
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz",
+ "integrity": "sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==",
"requires": {
- "@babel/helper-plugin-utils": "^7.17.12",
- "@babel/helper-validator-option": "^7.16.7",
- "@babel/plugin-transform-typescript": "^7.17.12"
+ "@babel/helper-plugin-utils": "^7.18.6",
+ "@babel/helper-validator-option": "^7.18.6",
+ "@babel/plugin-transform-typescript": "^7.18.6"
}
},
"@babel/runtime": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",
- "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
+ "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
},
"@babel/runtime-corejs3": {
- "version": "7.18.3",
- "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.3.tgz",
- "integrity": "sha512-l4ddFwrc9rnR+EJsHsh+TJ4A35YqQz/UqcjtlX2ov53hlJYG5CxtQmNZxyajwDVmCxwy++rtvGU5HazCK4W41Q==",
+ "version": "7.18.9",
+ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.9.tgz",
+ "integrity": "sha512-qZEWeccZCrHA2Au4/X05QW5CMdm4VjUDCrGq5gf1ZDcM4hRqreKrtwAn7yci9zfgAS9apvnsFXiGBHBAxZdK9A==",
"requires": {
"core-js-pure": "^3.20.2",
"regenerator-runtime": "^0.13.4"
}
},
"@babel/template": {
- "version": "7.16.7",
- "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
- "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz",
+ "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
"requires": {
- "@babel/code-frame": "^7.16.7",
- "@babel/parser": "^7.16.7",
- "@babel/types": "^7.16.7"
+ "@babel/code-frame": "^7.18.6",
+ "@babel/parser": "^7.18.10",
+ "@babel/types": "^7.18.10"
}
},
"@babel/traverse": {
- "version": "7.18.5",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.5.tgz",
- "integrity": "sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==",
+ "version": "7.18.11",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz",
+ "integrity": "sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==",
"requires": {
- "@babel/code-frame": "^7.16.7",
- "@babel/generator": "^7.18.2",
- "@babel/helper-environment-visitor": "^7.18.2",
- "@babel/helper-function-name": "^7.17.9",
- "@babel/helper-hoist-variables": "^7.16.7",
- "@babel/helper-split-export-declaration": "^7.16.7",
- "@babel/parser": "^7.18.5",
- "@babel/types": "^7.18.4",
+ "@babel/code-frame": "^7.18.6",
+ "@babel/generator": "^7.18.10",
+ "@babel/helper-environment-visitor": "^7.18.9",
+ "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-hoist-variables": "^7.18.6",
+ "@babel/helper-split-export-declaration": "^7.18.6",
+ "@babel/parser": "^7.18.11",
+ "@babel/types": "^7.18.10",
"debug": "^4.1.0",
"globals": "^11.1.0"
}
},
"@babel/types": {
- "version": "7.18.4",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz",
- "integrity": "sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==",
+ "version": "7.18.10",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
+ "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
"requires": {
- "@babel/helper-validator-identifier": "^7.16.7",
+ "@babel/helper-string-parser": "^7.18.10",
+ "@babel/helper-validator-identifier": "^7.18.6",
"to-fast-properties": "^2.0.0"
}
},
@@ -18173,69 +18187,77 @@
"integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg=="
},
"@csstools/postcss-cascade-layers": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.0.4.tgz",
- "integrity": "sha512-zP2tQIFu4C3HueOT+G4Pkla7f2Z6pfXphc1Y9wDE5jS2Ss6dk/asQ7FFEFWKgy3EkYc7E1FSjzhfeZVGg5sjXQ==",
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.0.5.tgz",
+ "integrity": "sha512-Id/9wBT7FkgFzdEpiEWrsVd4ltDxN0rI0QS0SChbeQiSuux3z21SJCRLu6h2cvCEUmaRi+VD0mHFj+GJD4GFnw==",
"requires": {
- "@csstools/selector-specificity": "^2.0.0",
+ "@csstools/selector-specificity": "^2.0.2",
"postcss-selector-parser": "^6.0.10"
}
},
"@csstools/postcss-color-function": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.0.tgz",
- "integrity": "sha512-5D5ND/mZWcQoSfYnSPsXtuiFxhzmhxt6pcjrFLJyldj+p0ZN2vvRpYNX+lahFTtMhAYOa2WmkdGINr0yP0CvGA==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
+ "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==",
"requires": {
"@csstools/postcss-progressive-custom-properties": "^1.1.0",
"postcss-value-parser": "^4.2.0"
}
},
"@csstools/postcss-font-format-keywords": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.0.tgz",
- "integrity": "sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q==",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz",
+ "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==",
"requires": {
"postcss-value-parser": "^4.2.0"
}
},
"@csstools/postcss-hwb-function": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.1.tgz",
- "integrity": "sha512-AMZwWyHbbNLBsDADWmoXT9A5yl5dsGEBeJSJRUJt8Y9n8Ziu7Wstt4MC8jtPW7xjcLecyfJwtnUTNSmOzcnWeg==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz",
+ "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==",
"requires": {
"postcss-value-parser": "^4.2.0"
}
},
"@csstools/postcss-ic-unit": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.0.tgz",
- "integrity": "sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA==",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz",
+ "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==",
"requires": {
"@csstools/postcss-progressive-custom-properties": "^1.1.0",
"postcss-value-parser": "^4.2.0"
}
},
"@csstools/postcss-is-pseudo-class": {
- "version": "2.0.6",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.6.tgz",
- "integrity": "sha512-Oqs396oenuyyMdRXOstxXbxei8fYEgToYjmlYHEi5gk0QLk7xQ72LY7NDr7waWAAmdVzRqPpbE26Q7/cUrGu4Q==",
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz",
+ "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==",
"requires": {
"@csstools/selector-specificity": "^2.0.0",
"postcss-selector-parser": "^6.0.10"
}
},
- "@csstools/postcss-normalize-display-values": {
+ "@csstools/postcss-nested-calc": {
"version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.0.tgz",
- "integrity": "sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ==",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
+ "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==",
+ "requires": {
+ "postcss-value-parser": "^4.2.0"
+ }
+ },
+ "@csstools/postcss-normalize-display-values": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz",
+ "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==",
"requires": {
"postcss-value-parser": "^4.2.0"
}
},
"@csstools/postcss-oklab-function": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.0.tgz",
- "integrity": "sha512-e/Q5HopQzmnQgqimG9v3w2IG4VRABsBq3itOcn4bnm+j4enTgQZ0nWsaH/m9GV2otWGQ0nwccYL5vmLKyvP1ww==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz",
+ "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==",
"requires": {
"@csstools/postcss-progressive-custom-properties": "^1.1.0",
"postcss-value-parser": "^4.2.0"
@@ -18250,45 +18272,53 @@
}
},
"@csstools/postcss-stepped-value-functions": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz",
+ "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==",
+ "requires": {
+ "postcss-value-parser": "^4.2.0"
+ }
+ },
+ "@csstools/postcss-text-decoration-shorthand": {
"version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.0.tgz",
- "integrity": "sha512-q8c4bs1GumAiRenmFjASBcWSLKrbzHzWl6C2HcaAxAXIiL2rUlUWbqQZUjwVG5tied0rld19j/Mm90K3qI26vw==",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz",
+ "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==",
"requires": {
"postcss-value-parser": "^4.2.0"
}
},
"@csstools/postcss-trigonometric-functions": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.1.tgz",
- "integrity": "sha512-G78CY/+GePc6dDCTUbwI6TTFQ5fs3N9POHhI6v0QzteGpf6ylARiJUNz9HrRKi4eVYBNXjae1W2766iUEFxHlw==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz",
+ "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==",
"requires": {
"postcss-value-parser": "^4.2.0"
}
},
"@csstools/postcss-unset-value": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.1.tgz",
- "integrity": "sha512-f1G1WGDXEU/RN1TWAxBPQgQudtLnLQPyiWdtypkPC+mVYNKFKH/HYXSxH4MVNqwF8M0eDsoiU7HumJHCg/L/jg==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz",
+ "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==",
"requires": {}
},
"@csstools/selector-specificity": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.1.tgz",
- "integrity": "sha512-aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz",
+ "integrity": "sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==",
"requires": {}
},
"@emotion/babel-plugin": {
- "version": "11.9.2",
- "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.9.2.tgz",
- "integrity": "sha512-Pr/7HGH6H6yKgnVFNEj2MVlreu3ADqftqjqwUvDy/OJzKFgxKeTQ+eeUf20FOTuHVkDON2iNa25rAXVYtWJCjw==",
+ "version": "11.10.0",
+ "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.0.tgz",
+ "integrity": "sha512-xVnpDAAbtxL1dsuSelU5A7BnY/lftws0wUexNJZTPsvX/1tM4GZJbclgODhvW4E+NH7E5VFcH0bBn30NvniPJA==",
"requires": {
- "@babel/helper-module-imports": "^7.12.13",
- "@babel/plugin-syntax-jsx": "^7.12.13",
- "@babel/runtime": "^7.13.10",
- "@emotion/hash": "^0.8.0",
- "@emotion/memoize": "^0.7.5",
- "@emotion/serialize": "^1.0.2",
- "babel-plugin-macros": "^2.6.1",
+ "@babel/helper-module-imports": "^7.16.7",
+ "@babel/plugin-syntax-jsx": "^7.17.12",
+ "@babel/runtime": "^7.18.3",
+ "@emotion/hash": "^0.9.0",
+ "@emotion/memoize": "^0.8.0",
+ "@emotion/serialize": "^1.1.0",
+ "babel-plugin-macros": "^3.1.0",
"convert-source-map": "^1.5.0",
"escape-string-regexp": "^4.0.0",
"find-root": "^1.1.0",
@@ -18297,92 +18327,92 @@
}
},
"@emotion/cache": {
- "version": "11.9.3",
- "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.9.3.tgz",
- "integrity": "sha512-0dgkI/JKlCXa+lEXviaMtGBL0ynpx4osh7rjOXE71q9bIF8G+XhJgvi+wDu0B0IdCVx37BffiwXlN9I3UuzFvg==",
+ "version": "11.10.1",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.1.tgz",
+ "integrity": "sha512-uZTj3Yz5D69GE25iFZcIQtibnVCFsc/6+XIozyL3ycgWvEdif2uEw9wlUt6umjLr4Keg9K6xRPHmD8LGi+6p1A==",
"requires": {
- "@emotion/memoize": "^0.7.4",
- "@emotion/sheet": "^1.1.1",
- "@emotion/utils": "^1.0.0",
- "@emotion/weak-memoize": "^0.2.5",
+ "@emotion/memoize": "^0.8.0",
+ "@emotion/sheet": "^1.2.0",
+ "@emotion/utils": "^1.2.0",
+ "@emotion/weak-memoize": "^0.3.0",
"stylis": "4.0.13"
}
},
"@emotion/hash": {
- "version": "0.8.0",
- "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
- "integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.0.tgz",
+ "integrity": "sha512-14FtKiHhy2QoPIzdTcvh//8OyBlknNs2nXRwIhG904opCby3l+9Xaf/wuPvICBF0rc1ZCNBd3nKe9cd2mecVkQ=="
},
"@emotion/is-prop-valid": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.1.3.tgz",
- "integrity": "sha512-RFg04p6C+1uO19uG8N+vqanzKqiM9eeV1LDOG3bmkYmuOj7NbKNlFC/4EZq5gnwAIlcC/jOT24f8Td0iax2SXA==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz",
+ "integrity": "sha512-3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg==",
"requires": {
- "@emotion/memoize": "^0.7.4"
+ "@emotion/memoize": "^0.8.0"
}
},
"@emotion/memoize": {
- "version": "0.7.5",
- "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz",
- "integrity": "sha512-igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz",
+ "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="
},
"@emotion/react": {
- "version": "11.9.3",
- "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.9.3.tgz",
- "integrity": "sha512-g9Q1GcTOlzOEjqwuLF/Zd9LC+4FljjPjDfxSM7KmEakm+hsHXk+bYZ2q+/hTJzr0OUNkujo72pXLQvXj6H+GJQ==",
+ "version": "11.10.0",
+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.0.tgz",
+ "integrity": "sha512-K6z9zlHxxBXwN8TcpwBKcEsBsOw4JWCCmR+BeeOWgqp8GIU1yA2Odd41bwdAAr0ssbQrbJbVnndvv7oiv1bZeQ==",
"requires": {
- "@babel/runtime": "^7.13.10",
- "@emotion/babel-plugin": "^11.7.1",
- "@emotion/cache": "^11.9.3",
- "@emotion/serialize": "^1.0.4",
- "@emotion/utils": "^1.1.0",
- "@emotion/weak-memoize": "^0.2.5",
+ "@babel/runtime": "^7.18.3",
+ "@emotion/babel-plugin": "^11.10.0",
+ "@emotion/cache": "^11.10.0",
+ "@emotion/serialize": "^1.1.0",
+ "@emotion/utils": "^1.2.0",
+ "@emotion/weak-memoize": "^0.3.0",
"hoist-non-react-statics": "^3.3.1"
}
},
"@emotion/serialize": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.0.4.tgz",
- "integrity": "sha512-1JHamSpH8PIfFwAMryO2bNka+y8+KA5yga5Ocf2d7ZEiJjb7xlLW7aknBGZqJLajuLOvJ+72vN+IBSwPlXD1Pg==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.0.tgz",
+ "integrity": "sha512-F1ZZZW51T/fx+wKbVlwsfchr5q97iW8brAnXmsskz4d0hVB4O3M/SiA3SaeH06x02lSNzkkQv+n3AX3kCXKSFA==",
"requires": {
- "@emotion/hash": "^0.8.0",
- "@emotion/memoize": "^0.7.4",
- "@emotion/unitless": "^0.7.5",
- "@emotion/utils": "^1.0.0",
+ "@emotion/hash": "^0.9.0",
+ "@emotion/memoize": "^0.8.0",
+ "@emotion/unitless": "^0.8.0",
+ "@emotion/utils": "^1.2.0",
"csstype": "^3.0.2"
}
},
"@emotion/sheet": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.1.1.tgz",
- "integrity": "sha512-J3YPccVRMiTZxYAY0IOq3kd+hUP8idY8Kz6B/Cyo+JuXq52Ek+zbPbSQUrVQp95aJ+lsAW7DPL1P2Z+U1jGkKA=="
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.0.tgz",
+ "integrity": "sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w=="
},
"@emotion/styled": {
- "version": "11.9.3",
- "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.9.3.tgz",
- "integrity": "sha512-o3sBNwbtoVz9v7WB1/Y/AmXl69YHmei2mrVnK7JgyBJ//Rst5yqPZCecEJlMlJrFeWHp+ki/54uN265V2pEcXA==",
+ "version": "11.10.0",
+ "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.0.tgz",
+ "integrity": "sha512-V9oaEH6V4KePeQpgUE83i8ht+4Ri3E8Djp/ZPJ4DQlqWhSKITvgzlR3/YQE2hdfP4Jw3qVRkANJz01LLqK9/TA==",
"requires": {
- "@babel/runtime": "^7.13.10",
- "@emotion/babel-plugin": "^11.7.1",
- "@emotion/is-prop-valid": "^1.1.3",
- "@emotion/serialize": "^1.0.4",
- "@emotion/utils": "^1.1.0"
+ "@babel/runtime": "^7.18.3",
+ "@emotion/babel-plugin": "^11.10.0",
+ "@emotion/is-prop-valid": "^1.2.0",
+ "@emotion/serialize": "^1.1.0",
+ "@emotion/utils": "^1.2.0"
}
},
"@emotion/unitless": {
- "version": "0.7.5",
- "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.7.5.tgz",
- "integrity": "sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz",
+ "integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw=="
},
"@emotion/utils": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.1.0.tgz",
- "integrity": "sha512-iRLa/Y4Rs5H/f2nimczYmS5kFJEbpiVvgN3XVfZ022IYhuNA1IRSHEizcof88LtCTXtl9S2Cxt32KgaXEu72JQ=="
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz",
+ "integrity": "sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw=="
},
"@emotion/weak-memoize": {
- "version": "0.2.5",
- "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz",
- "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA=="
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz",
+ "integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="
},
"@eslint/eslintrc": {
"version": "1.3.0",
@@ -18406,9 +18436,9 @@
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
},
"globals": {
- "version": "13.15.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
- "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
+ "version": "13.17.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+ "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
"requires": {
"type-fest": "^0.20.2"
}
@@ -18429,15 +18459,20 @@
}
},
"@humanwhocodes/config-array": {
- "version": "0.9.5",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
- "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
+ "version": "0.10.4",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
+ "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
"requires": {
"@humanwhocodes/object-schema": "^1.2.1",
"debug": "^4.1.1",
"minimatch": "^3.0.4"
}
},
+ "@humanwhocodes/gitignore-to-minimatch": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
+ "integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA=="
+ },
"@humanwhocodes/object-schema": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
@@ -18760,11 +18795,11 @@
}
},
"@jest/schemas": {
- "version": "28.0.2",
- "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz",
- "integrity": "sha512-YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz",
+ "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==",
"requires": {
- "@sinclair/typebox": "^0.23.3"
+ "@sinclair/typebox": "^0.24.1"
}
},
"@jest/source-map": {
@@ -18945,14 +18980,14 @@
}
},
"@jridgewell/resolve-uri": {
- "version": "3.0.7",
- "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
- "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA=="
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="
},
"@jridgewell/set-array": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
- "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+ "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="
},
"@jridgewell/source-map": {
"version": "0.3.2",
@@ -18964,11 +18999,11 @@
},
"dependencies": {
"@jridgewell/gen-mapping": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
- "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+ "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
"requires": {
- "@jridgewell/set-array": "^1.0.0",
+ "@jridgewell/set-array": "^1.0.1",
"@jridgewell/sourcemap-codec": "^1.4.10",
"@jridgewell/trace-mapping": "^0.3.9"
}
@@ -18976,14 +19011,14 @@
}
},
"@jridgewell/sourcemap-codec": {
- "version": "1.4.13",
- "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
- "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="
+ "version": "1.4.14",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="
},
"@jridgewell/trace-mapping": {
- "version": "0.3.13",
- "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
- "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
+ "version": "0.3.15",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz",
+ "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==",
"requires": {
"@jridgewell/resolve-uri": "^3.0.3",
"@jridgewell/sourcemap-codec": "^1.4.10"
@@ -18995,20 +19030,25 @@
"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
},
"@mui/base": {
- "version": "5.0.0-alpha.86",
- "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.86.tgz",
- "integrity": "sha512-0vi/Nni1mizrgrzKeyksEjw5JVSrgT8Vr2NhxzFtYxqpMgtdSrBvcmcuzBf9kE/ECMPbgpSIcqv0nLbLZUYkOQ==",
+ "version": "5.0.0-alpha.93",
+ "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.93.tgz",
+ "integrity": "sha512-IVUWO0NNlELDc9FD7mM+fWTS1/6n5sJYdIbXpLQ00NjWdVEYmTyRgUAZDlJJJrz+tbF0eeffx0kOsvJvyTZlsA==",
"requires": {
"@babel/runtime": "^7.17.2",
- "@emotion/is-prop-valid": "^1.1.2",
- "@mui/types": "^7.1.4",
- "@mui/utils": "^5.8.4",
- "@popperjs/core": "^2.11.5",
- "clsx": "^1.1.1",
+ "@emotion/is-prop-valid": "^1.1.3",
+ "@mui/types": "^7.1.5",
+ "@mui/utils": "^5.9.3",
+ "@popperjs/core": "^2.11.6",
+ "clsx": "^1.2.1",
"prop-types": "^15.8.1",
- "react-is": "^17.0.2"
+ "react-is": "^18.2.0"
}
},
+ "@mui/core-downloads-tracker": {
+ "version": "5.10.1",
+ "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.1.tgz",
+ "integrity": "sha512-zyzLkVSqi+WuxG8UZrrOaWbhHkDK+MlHFjLpL+vqUVU6iSUaDYREu1xoLWEQsWOznT4oT2iEiGZLpQLgkn+WiA=="
+ },
"@mui/icons-material": {
"version": "5.8.4",
"resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.8.4.tgz",
@@ -19018,74 +19058,76 @@
}
},
"@mui/material": {
- "version": "5.8.5",
- "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.8.5.tgz",
- "integrity": "sha512-wngPXlOI9BurLSGlObQM/2L0QFFaIcvJnDK5A+ALxuUyuQnPviVWfC1l/r8rPlxQ4PCbSYpq3gzLlgnLoWcO/g==",
+ "version": "5.10.1",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.1.tgz",
+ "integrity": "sha512-E9fhskX6TwUdAzpL5+yoAzRxb6wY4oBqmBVlgUuLndSwPRYxXoGu+z74NxbDEkxUoHdb7vrDcRTswpB6ykDITQ==",
"requires": {
"@babel/runtime": "^7.17.2",
- "@mui/base": "5.0.0-alpha.86",
- "@mui/system": "^5.8.5",
- "@mui/types": "^7.1.4",
- "@mui/utils": "^5.8.4",
- "@types/react-transition-group": "^4.4.4",
- "clsx": "^1.1.1",
+ "@mui/base": "5.0.0-alpha.93",
+ "@mui/core-downloads-tracker": "^5.10.1",
+ "@mui/system": "^5.10.1",
+ "@mui/types": "^7.1.5",
+ "@mui/utils": "^5.9.3",
+ "@types/react-transition-group": "^4.4.5",
+ "clsx": "^1.2.1",
"csstype": "^3.1.0",
"prop-types": "^15.8.1",
- "react-is": "^17.0.2",
- "react-transition-group": "^4.4.2"
+ "react-is": "^18.2.0",
+ "react-transition-group": "^4.4.5"
}
},
"@mui/private-theming": {
- "version": "5.8.4",
- "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.8.4.tgz",
- "integrity": "sha512-3Lp0VAEjtQygJ70MWEyHkKvg327O6YoBH6ZNEy6fIsrK6gmRIj+YrlvJ7LQCbowY+qDGnbdMrTBd1hfThlI8lg==",
+ "version": "5.9.3",
+ "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.9.3.tgz",
+ "integrity": "sha512-Ys3WO39WqoGciGX9k5AIi/k2zJhlydv4FzlEEwtw9OqdMaV0ydK/TdZekKzjP9sTI/JcdAP3H5DWtUaPLQJjWg==",
"requires": {
"@babel/runtime": "^7.17.2",
- "@mui/utils": "^5.8.4",
+ "@mui/utils": "^5.9.3",
"prop-types": "^15.8.1"
}
},
"@mui/styled-engine": {
- "version": "5.8.0",
- "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.8.0.tgz",
- "integrity": "sha512-Q3spibB8/EgeMYHc+/o3RRTnAYkSl7ROCLhXJ830W8HZ2/iDiyYp16UcxKPurkXvLhUaILyofPVrP3Su2uKsAw==",
+ "version": "5.10.1",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.1.tgz",
+ "integrity": "sha512-xiQp6wvSLpMcRCOExbRSvkHf6gIQ/eeK7mx/Re6BtPPYIx6OerPwia+23uVIop/k4Bs5D+w7Rv2yXYJxo5rMSQ==",
"requires": {
"@babel/runtime": "^7.17.2",
- "@emotion/cache": "^11.7.1",
+ "@emotion/cache": "^11.9.3",
+ "csstype": "^3.1.0",
"prop-types": "^15.8.1"
}
},
"@mui/system": {
- "version": "5.8.5",
- "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.8.5.tgz",
- "integrity": "sha512-1bhITHp5sX/CVEf1QwtBWvW+kNnH+GU7lKz0CeAL1RyH9dWvoL9Yt/+i/L8hJ6jVZB/7Au2F6MsyDPt8V1jfdA==",
+ "version": "5.10.1",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.1.tgz",
+ "integrity": "sha512-Ix8LVAMtVrNtmncK0yc5llHWlZKCm9okbw8QMnWbI5UH+nI9qhtf+Aure4p5ei6dGKdil++lukar/GxCjfzRSg==",
"requires": {
"@babel/runtime": "^7.17.2",
- "@mui/private-theming": "^5.8.4",
- "@mui/styled-engine": "^5.8.0",
- "@mui/types": "^7.1.4",
- "@mui/utils": "^5.8.4",
- "clsx": "^1.1.1",
+ "@mui/private-theming": "^5.9.3",
+ "@mui/styled-engine": "^5.10.1",
+ "@mui/types": "^7.1.5",
+ "@mui/utils": "^5.9.3",
+ "clsx": "^1.2.1",
"csstype": "^3.1.0",
"prop-types": "^15.8.1"
}
},
"@mui/types": {
- "version": "7.1.4",
- "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.4.tgz",
- "integrity": "sha512-uveM3byMbthO+6tXZ1n2zm0W3uJCQYtwt/v5zV5I77v2v18u0ITkb8xwhsDD2i3V2Kye7SaNR6FFJ6lMuY/WqQ==",
+ "version": "7.1.5",
+ "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.5.tgz",
+ "integrity": "sha512-HnRXrxgHJYJcT8ZDdDCQIlqk0s0skOKD7eWs9mJgBUu70hyW4iA6Kiv3yspJR474RFH8hysKR65VVSzUSzkuwA==",
"requires": {}
},
"@mui/utils": {
- "version": "5.8.4",
- "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.8.4.tgz",
- "integrity": "sha512-BHYErfrjqqh76KaDAm8wZlhEip1Uj7Cmco65NcsF3BWrAl3FWngACpaPZeEbTgmaEwyWAQEE6LZhsmy43hfyqQ==",
+ "version": "5.9.3",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.9.3.tgz",
+ "integrity": "sha512-l0N5bcrenE9hnwZ/jPecpIRqsDFHkPXoFUcmkgysaJwVZzJ3yQkGXB47eqmXX5yyGrSc6HksbbqXEaUya+siew==",
"requires": {
"@babel/runtime": "^7.17.2",
"@types/prop-types": "^15.7.5",
"@types/react-is": "^16.7.1 || ^17.0.0",
"prop-types": "^15.8.1",
- "react-is": "^17.0.2"
+ "react-is": "^18.2.0"
}
},
"@nodelib/fs.scandir": {
@@ -19135,9 +19177,9 @@
}
},
"@popperjs/core": {
- "version": "2.11.5",
- "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz",
- "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw=="
+ "version": "2.11.6",
+ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
+ "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
},
"@rollup/plugin-babel": {
"version": "5.3.1",
@@ -19188,14 +19230,14 @@
}
},
"@rushstack/eslint-patch": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.3.tgz",
- "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw=="
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz",
+ "integrity": "sha512-LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA=="
},
"@sinclair/typebox": {
- "version": "0.23.5",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz",
- "integrity": "sha512-AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg=="
+ "version": "0.24.28",
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.28.tgz",
+ "integrity": "sha512-dgJd3HLOkLmz4Bw50eZx/zJwtBq65nms3N9VBYu5LTjJ883oBFkTyXRlCB/ZGGwqYpJJHA5zW2Ibhl5ngITfow=="
},
"@sinonjs/commons": {
"version": "1.8.3",
@@ -19287,20 +19329,6 @@
"@svgr/plugin-jsx": "^5.5.0",
"camelcase": "^6.2.0",
"cosmiconfig": "^7.0.0"
- },
- "dependencies": {
- "cosmiconfig": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
- "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
- "requires": {
- "@types/parse-json": "^4.0.0",
- "import-fresh": "^3.2.1",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0",
- "yaml": "^1.10.0"
- }
- }
}
},
"@svgr/hast-util-to-babel-ast": {
@@ -19330,20 +19358,6 @@
"cosmiconfig": "^7.0.0",
"deepmerge": "^4.2.2",
"svgo": "^1.2.2"
- },
- "dependencies": {
- "cosmiconfig": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
- "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
- "requires": {
- "@types/parse-json": "^4.0.0",
- "import-fresh": "^3.2.1",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0",
- "yaml": "^1.10.0"
- }
- }
}
},
"@svgr/webpack": {
@@ -19401,9 +19415,9 @@
}
},
"@types/babel__traverse": {
- "version": "7.17.1",
- "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz",
- "integrity": "sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==",
+ "version": "7.18.0",
+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.0.tgz",
+ "integrity": "sha512-v4Vwdko+pgymgS+A2UIaJru93zQd85vIGWObM5ekZNdXCKtDYqATlEYnWgfo86Q6I1Lh0oXnksDnMU1cwmlPDw==",
"requires": {
"@babel/types": "^7.3.0"
}
@@ -19443,27 +19457,27 @@
}
},
"@types/eslint": {
- "version": "8.4.3",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz",
- "integrity": "sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==",
+ "version": "8.4.5",
+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz",
+ "integrity": "sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ==",
"requires": {
"@types/estree": "*",
"@types/json-schema": "*"
}
},
"@types/eslint-scope": {
- "version": "3.7.3",
- "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
- "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
+ "version": "3.7.4",
+ "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+ "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
"requires": {
"@types/eslint": "*",
"@types/estree": "*"
}
},
"@types/estree": {
- "version": "0.0.51",
- "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
- "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz",
+ "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="
},
"@types/express": {
"version": "4.17.13",
@@ -19477,9 +19491,9 @@
}
},
"@types/express-serve-static-core": {
- "version": "4.17.29",
- "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz",
- "integrity": "sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q==",
+ "version": "4.17.30",
+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz",
+ "integrity": "sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ==",
"requires": {
"@types/node": "*",
"@types/qs": "*",
@@ -19539,14 +19553,14 @@
"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="
},
"@types/mime": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
- "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
+ "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
},
"@types/node": {
- "version": "18.0.0",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.0.0.tgz",
- "integrity": "sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA=="
+ "version": "18.7.6",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.6.tgz",
+ "integrity": "sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A=="
},
"@types/parse-json": {
"version": "4.0.0",
@@ -19554,9 +19568,9 @@
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
},
"@types/prettier": {
- "version": "2.6.3",
- "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.3.tgz",
- "integrity": "sha512-ymZk3LEC/fsut+/Q5qejp6R9O1rMxz3XaRHDV6kX8MrGAhOSPqVARbDi+EZvInBpw+BnCX3TD240byVkOfQsHg=="
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz",
+ "integrity": "sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A=="
},
"@types/prop-types": {
"version": "15.7.5",
@@ -19579,9 +19593,9 @@
"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
},
"@types/react": {
- "version": "18.0.14",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.14.tgz",
- "integrity": "sha512-x4gGuASSiWmo0xjDLpm5mPb52syZHJx02VKbqUKdLmKtAwIh63XClGsiTI1K6DO5q7ox4xAsQrU+Gl3+gGXF9Q==",
+ "version": "18.0.17",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.17.tgz",
+ "integrity": "sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==",
"requires": {
"@types/prop-types": "*",
"@types/scheduler": "*",
@@ -19631,11 +19645,11 @@
}
},
"@types/serve-static": {
- "version": "1.13.10",
- "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
- "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
+ "version": "1.15.0",
+ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
+ "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
"requires": {
- "@types/mime": "^1",
+ "@types/mime": "*",
"@types/node": "*"
}
},
@@ -19679,13 +19693,13 @@
"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
},
"@typescript-eslint/eslint-plugin": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz",
- "integrity": "sha512-kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz",
+ "integrity": "sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ==",
"requires": {
- "@typescript-eslint/scope-manager": "5.29.0",
- "@typescript-eslint/type-utils": "5.29.0",
- "@typescript-eslint/utils": "5.29.0",
+ "@typescript-eslint/scope-manager": "5.33.1",
+ "@typescript-eslint/type-utils": "5.33.1",
+ "@typescript-eslint/utils": "5.33.1",
"debug": "^4.3.4",
"functional-red-black-tree": "^1.0.1",
"ignore": "^5.2.0",
@@ -19705,55 +19719,55 @@
}
},
"@typescript-eslint/experimental-utils": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.29.0.tgz",
- "integrity": "sha512-H4fqOVYiH6R15NjtMO2LVBZgzXgzjdPEXYb7x/meg4QbXsptLxdq8YlHK2NZOFKipuInY4sAPY5a6SQ/53s3dw==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.33.1.tgz",
+ "integrity": "sha512-wk2o+4wojvKz/x3UCbsgjgXl0lyLPYQsfKP0MdRzj4jtsQr4bVtgWUWck6+N3GzThUTbUFyyKLduWPwePhh0xQ==",
"requires": {
- "@typescript-eslint/utils": "5.29.0"
+ "@typescript-eslint/utils": "5.33.1"
}
},
"@typescript-eslint/parser": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz",
- "integrity": "sha512-ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz",
+ "integrity": "sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA==",
"requires": {
- "@typescript-eslint/scope-manager": "5.29.0",
- "@typescript-eslint/types": "5.29.0",
- "@typescript-eslint/typescript-estree": "5.29.0",
+ "@typescript-eslint/scope-manager": "5.33.1",
+ "@typescript-eslint/types": "5.33.1",
+ "@typescript-eslint/typescript-estree": "5.33.1",
"debug": "^4.3.4"
}
},
"@typescript-eslint/scope-manager": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz",
- "integrity": "sha512-etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz",
+ "integrity": "sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA==",
"requires": {
- "@typescript-eslint/types": "5.29.0",
- "@typescript-eslint/visitor-keys": "5.29.0"
+ "@typescript-eslint/types": "5.33.1",
+ "@typescript-eslint/visitor-keys": "5.33.1"
}
},
"@typescript-eslint/type-utils": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.29.0.tgz",
- "integrity": "sha512-JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz",
+ "integrity": "sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g==",
"requires": {
- "@typescript-eslint/utils": "5.29.0",
+ "@typescript-eslint/utils": "5.33.1",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
}
},
"@typescript-eslint/types": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz",
- "integrity": "sha512-X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg=="
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz",
+ "integrity": "sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ=="
},
"@typescript-eslint/typescript-estree": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz",
- "integrity": "sha512-mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz",
+ "integrity": "sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA==",
"requires": {
- "@typescript-eslint/types": "5.29.0",
- "@typescript-eslint/visitor-keys": "5.29.0",
+ "@typescript-eslint/types": "5.33.1",
+ "@typescript-eslint/visitor-keys": "5.33.1",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -19772,14 +19786,14 @@
}
},
"@typescript-eslint/utils": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz",
- "integrity": "sha512-3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz",
+ "integrity": "sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ==",
"requires": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.29.0",
- "@typescript-eslint/types": "5.29.0",
- "@typescript-eslint/typescript-estree": "5.29.0",
+ "@typescript-eslint/scope-manager": "5.33.1",
+ "@typescript-eslint/types": "5.33.1",
+ "@typescript-eslint/typescript-estree": "5.33.1",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
},
@@ -19801,11 +19815,11 @@
}
},
"@typescript-eslint/visitor-keys": {
- "version": "5.29.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz",
- "integrity": "sha512-Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ==",
+ "version": "5.33.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz",
+ "integrity": "sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg==",
"requires": {
- "@typescript-eslint/types": "5.29.0",
+ "@typescript-eslint/types": "5.33.1",
"eslint-visitor-keys": "^3.3.0"
}
},
@@ -19965,9 +19979,9 @@
}
},
"acorn": {
- "version": "8.7.1",
- "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
- "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="
+ "version": "8.8.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
+ "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="
},
"acorn-globals": {
"version": "6.0.0",
@@ -20223,12 +20237,12 @@
"integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
},
"autoprefixer": {
- "version": "10.4.7",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz",
- "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==",
+ "version": "10.4.8",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.8.tgz",
+ "integrity": "sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==",
"requires": {
- "browserslist": "^4.20.3",
- "caniuse-lite": "^1.0.30001335",
+ "browserslist": "^4.21.3",
+ "caniuse-lite": "^1.0.30001373",
"fraction.js": "^4.2.0",
"normalize-range": "^0.1.2",
"picocolors": "^1.0.0",
@@ -20236,9 +20250,9 @@
}
},
"axe-core": {
- "version": "4.4.2",
- "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.2.tgz",
- "integrity": "sha512-LVAaGp/wkkgYJcjmHsoKx4juT1aQvJyPcW09MLCjVTh3V2cc6PnyempiLMNH5iMdfIX/zdbjUx2KDjMLCTdPeA=="
+ "version": "4.4.3",
+ "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.4.3.tgz",
+ "integrity": "sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w=="
},
"axobject-query": {
"version": "2.2.0",
@@ -20360,13 +20374,13 @@
}
},
"babel-plugin-macros": {
- "version": "2.8.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz",
- "integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
+ "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
"requires": {
- "@babel/runtime": "^7.7.2",
- "cosmiconfig": "^6.0.0",
- "resolve": "^1.12.0"
+ "@babel/runtime": "^7.12.5",
+ "cosmiconfig": "^7.0.0",
+ "resolve": "^1.19.0"
}
},
"babel-plugin-named-asset-import": {
@@ -20376,30 +20390,30 @@
"requires": {}
},
"babel-plugin-polyfill-corejs2": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
- "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz",
+ "integrity": "sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==",
"requires": {
- "@babel/compat-data": "^7.13.11",
- "@babel/helper-define-polyfill-provider": "^0.3.1",
+ "@babel/compat-data": "^7.17.7",
+ "@babel/helper-define-polyfill-provider": "^0.3.2",
"semver": "^6.1.1"
}
},
"babel-plugin-polyfill-corejs3": {
- "version": "0.5.2",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
- "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz",
+ "integrity": "sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==",
"requires": {
- "@babel/helper-define-polyfill-provider": "^0.3.1",
+ "@babel/helper-define-polyfill-provider": "^0.3.2",
"core-js-compat": "^3.21.0"
}
},
"babel-plugin-polyfill-regenerator": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
- "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz",
+ "integrity": "sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==",
"requires": {
- "@babel/helper-define-polyfill-provider": "^0.3.1"
+ "@babel/helper-define-polyfill-provider": "^0.3.2"
}
},
"babel-plugin-transform-react-remove-prop-types": {
@@ -20456,30 +20470,6 @@
"@babel/runtime": "^7.16.3",
"babel-plugin-macros": "^3.1.0",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24"
- },
- "dependencies": {
- "babel-plugin-macros": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz",
- "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==",
- "requires": {
- "@babel/runtime": "^7.12.5",
- "cosmiconfig": "^7.0.0",
- "resolve": "^1.19.0"
- }
- },
- "cosmiconfig": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
- "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
- "requires": {
- "@types/parse-json": "^4.0.0",
- "import-fresh": "^3.2.1",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0",
- "yaml": "^1.10.0"
- }
- }
}
},
"balanced-match": {
@@ -20604,14 +20594,14 @@
"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
},
"browserslist": {
- "version": "4.21.0",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz",
- "integrity": "sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==",
+ "version": "4.21.3",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
+ "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
"requires": {
- "caniuse-lite": "^1.0.30001358",
- "electron-to-chromium": "^1.4.164",
- "node-releases": "^2.0.5",
- "update-browserslist-db": "^1.0.0"
+ "caniuse-lite": "^1.0.30001370",
+ "electron-to-chromium": "^1.4.202",
+ "node-releases": "^2.0.6",
+ "update-browserslist-db": "^1.0.5"
}
},
"bser": {
@@ -20682,9 +20672,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001358",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz",
- "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw=="
+ "version": "1.0.30001378",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001378.tgz",
+ "integrity": "sha512-JVQnfoO7FK7WvU4ZkBRbPjaot4+YqxogSDosHv0Hv5mWpUESmN+UubMU6L/hGz8QlQ2aY5U0vR6MOs6j/CXpNA=="
},
"case-sensitive-paths-webpack-plugin": {
"version": "2.4.0",
@@ -20713,11 +20703,6 @@
"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
},
- "charcodes": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz",
- "integrity": "sha512-Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ=="
- },
"check-types": {
"version": "11.1.2",
"resolved": "https://registry.npmjs.org/check-types/-/check-types-11.1.2.tgz",
@@ -20764,9 +20749,9 @@
"integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA=="
},
"clean-css": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz",
- "integrity": "sha512-YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ==",
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",
+ "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",
"requires": {
"source-map": "~0.6.0"
},
@@ -20789,9 +20774,9 @@
}
},
"clsx": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz",
- "integrity": "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
+ "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="
},
"co": {
"version": "4.6.0",
@@ -20827,9 +20812,9 @@
"integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
},
"colord": {
- "version": "2.9.2",
- "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
- "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ=="
+ "version": "2.9.3",
+ "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+ "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
},
"colorette": {
"version": "2.0.19",
@@ -20912,9 +20897,9 @@
"integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="
},
"connect-history-api-fallback": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
- "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+ "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA=="
},
"content-disposition": {
"version": "0.5.4",
@@ -20955,16 +20940,16 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
},
"core-js": {
- "version": "3.23.2",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.23.2.tgz",
- "integrity": "sha512-ELJOWxNrJfOH/WK4VJ3Qd+fOqZuOuDNDJz0xG6Bt4mGg2eO/UT9CljCrbqDGovjLKUrGajEEBcoTOc0w+yBYeQ=="
+ "version": "3.24.1",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
+ "integrity": "sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg=="
},
"core-js-compat": {
- "version": "3.23.2",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.23.2.tgz",
- "integrity": "sha512-lrgZvxFwbQp9v7E8mX0rJ+JX7Bvh4eGULZXA1IAyjlsnWvCdw6TF8Tg6xtaSUSJMrSrMaLdpmk+V54LM1dvfOA==",
+ "version": "3.24.1",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.24.1.tgz",
+ "integrity": "sha512-XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw==",
"requires": {
- "browserslist": "^4.20.4",
+ "browserslist": "^4.21.3",
"semver": "7.0.0"
},
"dependencies": {
@@ -20976,9 +20961,9 @@
}
},
"core-js-pure": {
- "version": "3.23.2",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.23.2.tgz",
- "integrity": "sha512-t6u7H4Ff/yZNk+zqTr74UjCcZ3k8ApBryeLLV4rYQd9aF3gqmjjGjjR44ENfeBMH8VVvSynIjAJ0mUuFhzQtrA=="
+ "version": "3.24.1",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.24.1.tgz",
+ "integrity": "sha512-r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg=="
},
"core-util-is": {
"version": "1.0.3",
@@ -20986,15 +20971,15 @@
"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
},
"cosmiconfig": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
- "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+ "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
"requires": {
"@types/parse-json": "^4.0.0",
- "import-fresh": "^3.1.0",
+ "import-fresh": "^3.2.1",
"parse-json": "^5.0.0",
"path-type": "^4.0.0",
- "yaml": "^1.7.2"
+ "yaml": "^1.10.0"
}
},
"cross-fetch": {
@@ -21167,9 +21152,9 @@
"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
},
"cssdb": {
- "version": "6.6.3",
- "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-6.6.3.tgz",
- "integrity": "sha512-7GDvDSmE+20+WcSMhP17Q1EVWUrLlbxxpMDqG731n8P99JhnQZHR9YvtjPvEHfjFUjvQJvdpKCjlKOX+xe4UVA=="
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.0.0.tgz",
+ "integrity": "sha512-HmRYATZ4Gf8naf6sZmwKEyf7MXAC0ZxjsamtNNgmuWpQgoO973zsE/1JMIohEYsSi5e3n7vQauCLv7TWSrOlrw=="
},
"cssesc": {
"version": "3.0.0",
@@ -21177,9 +21162,9 @@
"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
},
"cssnano": {
- "version": "5.1.12",
- "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.12.tgz",
- "integrity": "sha512-TgvArbEZu0lk/dvg2ja+B7kYoD7BBCmn3+k58xD0qjrGHsFzXY/wKTo9M5egcUCabPol05e/PVoIu79s2JN4WQ==",
+ "version": "5.1.13",
+ "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.13.tgz",
+ "integrity": "sha512-S2SL2ekdEz6w6a2epXn4CmMKU4K3KpcyXLKfAYc9UQQqJRkD/2eLUG0vJ3Db/9OvO5GuAdgXw3pFbR6abqghDQ==",
"requires": {
"cssnano-preset-default": "^5.2.12",
"lilconfig": "^2.0.3",
@@ -21326,9 +21311,9 @@
}
},
"decimal.js": {
- "version": "10.3.1",
- "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
- "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
+ "version": "10.4.0",
+ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.0.tgz",
+ "integrity": "sha512-Nv6ENEzyPQ6AItkGwLE2PGKinZZ9g59vSh2BeH6NqPu0OTKZ5ruJsVqh/orbAnqXc9pBbgXAIrc2EyaCj8NpGg=="
},
"dedent": {
"version": "0.7.0",
@@ -21589,9 +21574,9 @@
}
},
"electron-to-chromium": {
- "version": "1.4.167",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.167.tgz",
- "integrity": "sha512-lPHuHXBwpkr4RcfaZBKm6TKOWG/1N9mVggUpP4fY3l1JIUU2x4fkM8928smYdZ5lF+6KCTAxo1aK9JmqT+X71Q=="
+ "version": "1.4.224",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.224.tgz",
+ "integrity": "sha512-dOujC5Yzj0nOVE23iD5HKqrRSDj2SD7RazpZS/b/WX85MtO6/LzKDF4TlYZTBteB+7fvSg5JpWh0sN7fImNF8w=="
},
"emittery": {
"version": "0.8.1",
@@ -21614,9 +21599,9 @@
"integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="
},
"enhanced-resolve": {
- "version": "5.9.3",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz",
- "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==",
+ "version": "5.10.0",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
+ "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
"requires": {
"graceful-fs": "^4.2.4",
"tapable": "^2.2.0"
@@ -21772,12 +21757,13 @@
}
},
"eslint": {
- "version": "8.18.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz",
- "integrity": "sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==",
+ "version": "8.22.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz",
+ "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==",
"requires": {
"@eslint/eslintrc": "^1.3.0",
- "@humanwhocodes/config-array": "^0.9.2",
+ "@humanwhocodes/config-array": "^0.10.4",
+ "@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
@@ -21787,14 +21773,17 @@
"eslint-scope": "^7.1.1",
"eslint-utils": "^3.0.0",
"eslint-visitor-keys": "^3.3.0",
- "espree": "^9.3.2",
+ "espree": "^9.3.3",
"esquery": "^1.4.0",
"esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3",
"file-entry-cache": "^6.0.1",
+ "find-up": "^5.0.0",
"functional-red-black-tree": "^1.0.1",
"glob-parent": "^6.0.1",
"globals": "^13.15.0",
+ "globby": "^11.1.0",
+ "grapheme-splitter": "^1.0.4",
"ignore": "^5.2.0",
"import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4",
@@ -21849,9 +21838,9 @@
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"globals": {
- "version": "13.15.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
- "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
+ "version": "13.17.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz",
+ "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==",
"requires": {
"type-fest": "^0.20.2"
}
@@ -21925,12 +21914,11 @@
}
},
"eslint-module-utils": {
- "version": "2.7.3",
- "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz",
- "integrity": "sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==",
+ "version": "2.7.4",
+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz",
+ "integrity": "sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==",
"requires": {
- "debug": "^3.2.7",
- "find-up": "^2.1.0"
+ "debug": "^3.2.7"
},
"dependencies": {
"debug": {
@@ -21940,49 +21928,6 @@
"requires": {
"ms": "^2.1.1"
}
- },
- "find-up": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
- "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
- "requires": {
- "locate-path": "^2.0.0"
- }
- },
- "locate-path": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
- "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
- "requires": {
- "p-locate": "^2.0.0",
- "path-exists": "^3.0.0"
- }
- },
- "p-limit": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
- "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
- "requires": {
- "p-try": "^1.0.0"
- }
- },
- "p-locate": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
- "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
- "requires": {
- "p-limit": "^1.1.0"
- }
- },
- "p-try": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
- "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww=="
- },
- "path-exists": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
- "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="
}
}
},
@@ -22047,28 +21992,29 @@
}
},
"eslint-plugin-jsx-a11y": {
- "version": "6.5.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz",
- "integrity": "sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g==",
+ "version": "6.6.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz",
+ "integrity": "sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q==",
"requires": {
- "@babel/runtime": "^7.16.3",
+ "@babel/runtime": "^7.18.9",
"aria-query": "^4.2.2",
- "array-includes": "^3.1.4",
+ "array-includes": "^3.1.5",
"ast-types-flow": "^0.0.7",
- "axe-core": "^4.3.5",
+ "axe-core": "^4.4.3",
"axobject-query": "^2.2.0",
- "damerau-levenshtein": "^1.0.7",
+ "damerau-levenshtein": "^1.0.8",
"emoji-regex": "^9.2.2",
"has": "^1.0.3",
- "jsx-ast-utils": "^3.2.1",
+ "jsx-ast-utils": "^3.3.2",
"language-tags": "^1.0.5",
- "minimatch": "^3.0.4"
+ "minimatch": "^3.1.2",
+ "semver": "^6.3.0"
}
},
"eslint-plugin-react": {
- "version": "7.30.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.30.0.tgz",
- "integrity": "sha512-RgwH7hjW48BleKsYyHK5vUAvxtE9SMPDKmcPRQgtRCYaZA0XQPt5FSkrU3nhz5ifzMZcA8opwmRJ2cmOO8tr5A==",
+ "version": "7.30.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.30.1.tgz",
+ "integrity": "sha512-NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg==",
"requires": {
"array-includes": "^3.1.5",
"array.prototype.flatmap": "^1.3.0",
@@ -22113,9 +22059,9 @@
"requires": {}
},
"eslint-plugin-testing-library": {
- "version": "5.5.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.5.1.tgz",
- "integrity": "sha512-plLEkkbAKBjPxsLj7x4jNapcHAg2ernkQlKKrN2I8NrQwPISZHyCUNvg5Hv3EDqOQReToQb5bnqXYbkijJPE/g==",
+ "version": "5.6.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.6.0.tgz",
+ "integrity": "sha512-y63TRzPhGCMNsnUwMGJU1MFWc/3GvYw+nzobp9QiyNTTKsgAt5RKAOT1I34+XqVBpX1lC8bScoOjCkP7iRv0Mw==",
"requires": {
"@typescript-eslint/utils": "^5.13.0"
}
@@ -22186,9 +22132,9 @@
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
"jest-worker": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.1.tgz",
- "integrity": "sha512-Au7slXB08C6h+xbJPp7VIb6U0XX5Kc9uel/WFc6/rcTzGiaVCBRngBExSYuXSLFPULPSYU3cJ3ybS988lNFQhQ==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
+ "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
"requires": {
"@types/node": "*",
"merge-stream": "^2.0.0",
@@ -22222,11 +22168,11 @@
}
},
"espree": {
- "version": "9.3.2",
- "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
- "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
+ "version": "9.3.3",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz",
+ "integrity": "sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==",
"requires": {
- "acorn": "^8.7.1",
+ "acorn": "^8.8.0",
"acorn-jsx": "^5.3.2",
"eslint-visitor-keys": "^3.3.0"
}
@@ -22557,9 +22503,9 @@
}
},
"flatted": {
- "version": "3.2.5",
- "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
- "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz",
+ "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="
},
"follow-redirects": {
"version": "1.15.1",
@@ -22616,6 +22562,18 @@
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
+ "cosmiconfig": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz",
+ "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
+ "requires": {
+ "@types/parse-json": "^4.0.0",
+ "import-fresh": "^3.1.0",
+ "parse-json": "^5.0.0",
+ "path-type": "^4.0.0",
+ "yaml": "^1.7.2"
+ }
+ },
"fs-extra": {
"version": "9.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
@@ -22863,6 +22821,11 @@
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
"integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="
},
+ "grapheme-splitter": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz",
+ "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="
+ },
"gzip-size": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
@@ -23069,9 +23032,9 @@
}
},
"http-parser-js": {
- "version": "0.5.7",
- "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.7.tgz",
- "integrity": "sha512-8gQM8ZcewlONQLnik2AKzS13euQhaZcu4rK5QBSYOszW0T1upLW9VA2MdWvTvMmRo42HjXp7igFmdROoBCCrfg=="
+ "version": "0.5.8",
+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+ "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="
},
"http-proxy": {
"version": "1.18.1",
@@ -23120,19 +23083,19 @@
"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
},
"i18next": {
- "version": "21.8.10",
- "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.8.10.tgz",
- "integrity": "sha512-7xRb6y4QlSqZRZ3uA5BIEsLuZpmxpzHLizQyKjDDThOcvdfgICOX7aFoBnh4BSWcLtJamTqSweaOuK22A2xqkA==",
+ "version": "21.9.1",
+ "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.9.1.tgz",
+ "integrity": "sha512-ITbDrAjbRR73spZAiu6+ex5WNlHRr1mY+acDi2ioTHuUiviJqSz269Le1xHAf0QaQ6GgIHResUhQNcxGwa/PhA==",
"requires": {
"@babel/runtime": "^7.17.2"
}
},
"i18next-browser-languagedetector": {
- "version": "6.1.4",
- "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-6.1.4.tgz",
- "integrity": "sha512-wukWnFeU7rKIWT66VU5i8I+3Zc4wReGcuDK2+kuFhtoxBRGWGdvYI9UQmqNL/yQH1KogWwh+xGEaIPH8V/i2Zg==",
+ "version": "6.1.5",
+ "resolved": "https://registry.npmjs.org/i18next-browser-languagedetector/-/i18next-browser-languagedetector-6.1.5.tgz",
+ "integrity": "sha512-11t7b39oKeZe4uyMxLSPnfw28BCPNLZgUk7zyufex0zKXZ+Bv+JnmJgoB+IfQLZwDt1d71PM8vwBX1NCgliY3g==",
"requires": {
- "@babel/runtime": "^7.14.6"
+ "@babel/runtime": "^7.18.9"
}
},
"i18next-http-backend": {
@@ -23158,9 +23121,9 @@
"requires": {}
},
"idb": {
- "version": "6.1.5",
- "resolved": "https://registry.npmjs.org/idb/-/idb-6.1.5.tgz",
- "integrity": "sha512-IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw=="
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/idb/-/idb-7.0.2.tgz",
+ "integrity": "sha512-jjKrT1EnyZewQ/gCBb/eyiYrhGzws2FeY92Yx8qT9S9GeQAmo4JFVIiWRIfKW/6Ob9A+UDAOW9j9jn58fy2HIg=="
},
"identity-obj-proxy": {
"version": "3.0.0",
@@ -23273,9 +23236,9 @@
"integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
},
"is-core-module": {
- "version": "2.9.0",
- "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
- "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+ "version": "2.10.0",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz",
+ "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==",
"requires": {
"has": "^1.0.3"
}
@@ -23493,9 +23456,9 @@
}
},
"istanbul-reports": {
- "version": "3.1.4",
- "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz",
- "integrity": "sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==",
+ "version": "3.1.5",
+ "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz",
+ "integrity": "sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==",
"requires": {
"html-escaper": "^2.0.0",
"istanbul-lib-report": "^3.0.0"
@@ -24617,15 +24580,15 @@
},
"dependencies": {
"@jest/console": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.1.tgz",
- "integrity": "sha512-0RiUocPVFEm3WRMOStIHbRWllG6iW6E3/gUPnf4lkrVFyXIIDeCe+vlKeYyFOMhB2EPE6FLFCNADSOOQMaqvyA==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz",
+ "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==",
"requires": {
- "@jest/types": "^28.1.1",
+ "@jest/types": "^28.1.3",
"@types/node": "*",
"chalk": "^4.0.0",
- "jest-message-util": "^28.1.1",
- "jest-util": "^28.1.1",
+ "jest-message-util": "^28.1.3",
+ "jest-util": "^28.1.3",
"slash": "^3.0.0"
},
"dependencies": {
@@ -24637,22 +24600,22 @@
}
},
"@jest/test-result": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.1.tgz",
- "integrity": "sha512-hPmkugBktqL6rRzwWAtp1JtYT4VHwv8OQ+9lE5Gymj6dHzubI/oJHMUpPOt8NrdVWSrz9S7bHjJUmv2ggFoUNQ==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz",
+ "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==",
"requires": {
- "@jest/console": "^28.1.1",
- "@jest/types": "^28.1.1",
+ "@jest/console": "^28.1.3",
+ "@jest/types": "^28.1.3",
"@types/istanbul-lib-coverage": "^2.0.0",
"collect-v8-coverage": "^1.0.0"
}
},
"@jest/types": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.1.tgz",
- "integrity": "sha512-vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz",
+ "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==",
"requires": {
- "@jest/schemas": "^28.0.2",
+ "@jest/schemas": "^28.1.3",
"@types/istanbul-lib-coverage": "^2.0.0",
"@types/istanbul-reports": "^3.0.0",
"@types/node": "*",
@@ -24661,9 +24624,9 @@
}
},
"@types/yargs": {
- "version": "17.0.10",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz",
- "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==",
+ "version": "17.0.11",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz",
+ "integrity": "sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==",
"requires": {
"@types/yargs-parser": "*"
}
@@ -24709,17 +24672,17 @@
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
},
"jest-message-util": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.1.tgz",
- "integrity": "sha512-xoDOOT66fLfmTRiqkoLIU7v42mal/SqwDKvfmfiWAdJMSJiU+ozgluO7KbvoAgiwIrrGZsV7viETjc8GNrA/IQ==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz",
+ "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==",
"requires": {
"@babel/code-frame": "^7.12.13",
- "@jest/types": "^28.1.1",
+ "@jest/types": "^28.1.3",
"@types/stack-utils": "^2.0.0",
"chalk": "^4.0.0",
"graceful-fs": "^4.2.9",
"micromatch": "^4.0.4",
- "pretty-format": "^28.1.1",
+ "pretty-format": "^28.1.3",
"slash": "^3.0.0",
"stack-utils": "^2.0.3"
},
@@ -24737,11 +24700,11 @@
"integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw=="
},
"jest-util": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.1.tgz",
- "integrity": "sha512-FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz",
+ "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==",
"requires": {
- "@jest/types": "^28.1.1",
+ "@jest/types": "^28.1.3",
"@types/node": "*",
"chalk": "^4.0.0",
"ci-info": "^3.2.0",
@@ -24750,17 +24713,17 @@
}
},
"jest-watcher": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.1.tgz",
- "integrity": "sha512-RQIpeZ8EIJMxbQrXpJQYIIlubBnB9imEHsxxE41f54ZwcqWLysL/A0ZcdMirf+XsMn3xfphVQVV4EW0/p7i7Ug==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz",
+ "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==",
"requires": {
- "@jest/test-result": "^28.1.1",
- "@jest/types": "^28.1.1",
+ "@jest/test-result": "^28.1.3",
+ "@jest/types": "^28.1.3",
"@types/node": "*",
"ansi-escapes": "^4.2.1",
"chalk": "^4.0.0",
"emittery": "^0.10.2",
- "jest-util": "^28.1.1",
+ "jest-util": "^28.1.3",
"string-length": "^4.0.1"
},
"dependencies": {
@@ -24784,11 +24747,11 @@
}
},
"pretty-format": {
- "version": "28.1.1",
- "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz",
- "integrity": "sha512-wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw==",
+ "version": "28.1.3",
+ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz",
+ "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==",
"requires": {
- "@jest/schemas": "^28.0.2",
+ "@jest/schemas": "^28.1.3",
"ansi-regex": "^5.0.1",
"ansi-styles": "^5.0.0",
"react-is": "^18.0.0"
@@ -24801,11 +24764,6 @@
}
}
},
- "react-is": {
- "version": "18.2.0",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
- "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
- },
"slash": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
@@ -25049,17 +25007,17 @@
}
},
"jsonpointer": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.0.tgz",
- "integrity": "sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg=="
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
+ "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ=="
},
"jsx-ast-utils": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.1.tgz",
- "integrity": "sha512-pxrjmNpeRw5wwVeWyEAk7QJu2GnBO3uzPFmHCKJJFPKK2Cy0cWL23krGtLdnMmbIi6/FjlrQpPyfQI19ByPOhQ==",
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz",
+ "integrity": "sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw==",
"requires": {
"array-includes": "^3.1.5",
- "object.assign": "^4.1.2"
+ "object.assign": "^4.1.3"
}
},
"kind-of": {
@@ -25078,9 +25036,9 @@
"integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ=="
},
"language-subtag-registry": {
- "version": "0.3.21",
- "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.21.tgz",
- "integrity": "sha512-L0IqwlIXjilBVVYKFT37X9Ih11Um5NEl9cbJIuU/SwP/zEEAbBPOnEeeuxVMf45ydWQRDQN3Nqc96OgbH1K+Pg=="
+ "version": "0.3.22",
+ "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz",
+ "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w=="
},
"language-tags": {
"version": "1.0.5",
@@ -25105,9 +25063,9 @@
}
},
"lilconfig": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz",
- "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg=="
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz",
+ "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg=="
},
"lines-and-columns": {
"version": "1.2.4",
@@ -25226,9 +25184,9 @@
"integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="
},
"memfs": {
- "version": "3.4.6",
- "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.6.tgz",
- "integrity": "sha512-rH9mjopto6Wkr7RFuH9l9dk3qb2XGOcYKr7xMhaYqfzuJqOqhRrcFvfD7JMuPj6SLmPreh5+6eAuv36NFAU+Mw==",
+ "version": "3.4.7",
+ "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz",
+ "integrity": "sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==",
"requires": {
"fs-monkey": "^1.0.3"
}
@@ -25418,9 +25376,9 @@
"integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
},
"node-releases": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
- "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz",
+ "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="
},
"normalize-path": {
"version": "3.0.0",
@@ -25454,9 +25412,9 @@
}
},
"nwsapi": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
- "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.1.tgz",
+ "integrity": "sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg=="
},
"object-assign": {
"version": "4.1.1",
@@ -25479,13 +25437,13 @@
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
},
"object.assign": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
- "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+ "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
"requires": {
- "call-bind": "^1.0.0",
- "define-properties": "^1.1.3",
- "has-symbols": "^1.0.1",
+ "call-bind": "^1.0.2",
+ "define-properties": "^1.1.4",
+ "has-symbols": "^1.0.3",
"object-keys": "^1.1.1"
}
},
@@ -25820,9 +25778,9 @@
}
},
"postcss": {
- "version": "8.4.14",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
- "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+ "version": "8.4.16",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
+ "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
"requires": {
"nanoid": "^3.3.4",
"picocolors": "^1.0.0",
@@ -25830,9 +25788,9 @@
}
},
"postcss-attribute-case-insensitive": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.1.tgz",
- "integrity": "sha512-wrt2VndqSLJpyBRNz9OmJcgnhI9MaongeWgapdBuUMu2a/KNJ8SENesG4SdiTnQwGO9b1VKbTWYAfCPeokLqZQ==",
+ "version": "5.0.2",
+ "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz",
+ "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==",
"requires": {
"postcss-selector-parser": "^6.0.10"
}
@@ -25861,9 +25819,9 @@
}
},
"postcss-color-functional-notation": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.3.tgz",
- "integrity": "sha512-5fbr6FzFzjwHXKsVnkmEYrJYG8VNNzvD1tAXaPPWR97S6rhKI5uh2yOfV5TAzhDkZoq4h+chxEplFDc8GeyFtw==",
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz",
+ "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==",
"requires": {
"postcss-value-parser": "^4.2.0"
}
@@ -25877,9 +25835,9 @@
}
},
"postcss-color-rebeccapurple": {
- "version": "7.1.0",
- "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.0.tgz",
- "integrity": "sha512-1jtE5AKnZcKq4pjOrltFHcbEM2/IvtbD1OdhZ/wqds18//bh0UmQkffcCkzDJU+/vGodfIsVQeKn+45CJvX9Bw==",
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz",
+ "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==",
"requires": {
"postcss-value-parser": "^4.2.0"
}
@@ -25929,11 +25887,11 @@
}
},
"postcss-dir-pseudo-class": {
- "version": "6.0.4",
- "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.4.tgz",
- "integrity": "sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==",
+ "version": "6.0.5",
+ "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
+ "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==",
"requires": {
- "postcss-selector-parser": "^6.0.9"
+ "postcss-selector-parser": "^6.0.10"
}
},
"postcss-discard-comments": {
@@ -25961,9 +25919,9 @@
"requires": {}
},
"postcss-double-position-gradients": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.1.tgz",
- "integrity": "sha512-jM+CGkTs4FcG53sMPjrrGE0rIvLDdCrqMzgDC5fLI7JHDO7o6QG8C5TQBtExb13hdBdoH9C2QVbG4jo2y9lErQ==",
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
+ "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==",
"requires": {
"@csstools/postcss-progressive-custom-properties": "^1.1.0",
"postcss-value-parser": "^4.2.0"
@@ -26006,15 +25964,15 @@
"requires": {}
},
"postcss-gap-properties": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz",
- "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==",
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz",
+ "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==",
"requires": {}
},
"postcss-image-set-function": {
- "version": "4.0.6",
- "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.6.tgz",
- "integrity": "sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==",
+ "version": "4.0.7",
+ "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz",
+ "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==",
"requires": {
"postcss-value-parser": "^4.2.0"
}
@@ -26044,9 +26002,9 @@
}
},
"postcss-lab-function": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.0.tgz",
- "integrity": "sha512-Zb1EO9DGYfa3CP8LhINHCcTTCTLI+R3t7AX2mKsDzdgVQ/GkCpHOTgOr6HBHslP7XDdVbqgHW5vvRPMdVANQ8w==",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz",
+ "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==",
"requires": {
"@csstools/postcss-progressive-custom-properties": "^1.1.0",
"postcss-value-parser": "^4.2.0"
@@ -26071,18 +26029,6 @@
"semver": "^7.3.5"
},
"dependencies": {
- "cosmiconfig": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
- "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
- "requires": {
- "@types/parse-json": "^4.0.0",
- "import-fresh": "^3.2.1",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0",
- "yaml": "^1.10.0"
- }
- },
"semver": {
"version": "7.3.7",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
@@ -26202,9 +26148,9 @@
}
},
"postcss-nesting": {
- "version": "10.1.9",
- "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.9.tgz",
- "integrity": "sha512-WlnqQecNMT7eizBpWwAnQOIk7Zr0A+OZJccEwQoTwmcIsZCVdcjT1LjXj1hBk6zR3BDLZQYsb5KZj2HquZgvTw==",
+ "version": "10.1.10",
+ "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.10.tgz",
+ "integrity": "sha512-lqd7LXCq0gWc0wKXtoKDru5wEUNjm3OryLVNRZ8OnW8km6fSNUuFrjEhU3nklxXE2jvd4qrox566acgh+xQt8w==",
"requires": {
"@csstools/selector-specificity": "^2.0.0",
"postcss-selector-parser": "^6.0.10"
@@ -26307,10 +26253,12 @@
}
},
"postcss-overflow-shorthand": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz",
- "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==",
- "requires": {}
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz",
+ "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==",
+ "requires": {
+ "postcss-value-parser": "^4.2.0"
+ }
},
"postcss-page-break": {
"version": "3.0.4",
@@ -26319,71 +26267,73 @@
"requires": {}
},
"postcss-place": {
- "version": "7.0.4",
- "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.4.tgz",
- "integrity": "sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==",
+ "version": "7.0.5",
+ "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz",
+ "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==",
"requires": {
"postcss-value-parser": "^4.2.0"
}
},
"postcss-preset-env": {
- "version": "7.7.2",
- "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.7.2.tgz",
- "integrity": "sha512-1q0ih7EDsZmCb/FMDRvosna7Gsbdx8CvYO5hYT120hcp2ZAuOHpSzibujZ4JpIUcAC02PG6b+eftxqjTFh5BNA==",
+ "version": "7.8.0",
+ "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.0.tgz",
+ "integrity": "sha512-leqiqLOellpLKfbHkD06E04P6d9ZQ24mat6hu4NSqun7WG0UhspHR5Myiv/510qouCjoo4+YJtNOqg5xHaFnCA==",
"requires": {
- "@csstools/postcss-cascade-layers": "^1.0.4",
- "@csstools/postcss-color-function": "^1.1.0",
- "@csstools/postcss-font-format-keywords": "^1.0.0",
- "@csstools/postcss-hwb-function": "^1.0.1",
- "@csstools/postcss-ic-unit": "^1.0.0",
- "@csstools/postcss-is-pseudo-class": "^2.0.6",
- "@csstools/postcss-normalize-display-values": "^1.0.0",
- "@csstools/postcss-oklab-function": "^1.1.0",
+ "@csstools/postcss-cascade-layers": "^1.0.5",
+ "@csstools/postcss-color-function": "^1.1.1",
+ "@csstools/postcss-font-format-keywords": "^1.0.1",
+ "@csstools/postcss-hwb-function": "^1.0.2",
+ "@csstools/postcss-ic-unit": "^1.0.1",
+ "@csstools/postcss-is-pseudo-class": "^2.0.7",
+ "@csstools/postcss-nested-calc": "^1.0.0",
+ "@csstools/postcss-normalize-display-values": "^1.0.1",
+ "@csstools/postcss-oklab-function": "^1.1.1",
"@csstools/postcss-progressive-custom-properties": "^1.3.0",
- "@csstools/postcss-stepped-value-functions": "^1.0.0",
- "@csstools/postcss-trigonometric-functions": "^1.0.1",
- "@csstools/postcss-unset-value": "^1.0.1",
- "autoprefixer": "^10.4.7",
- "browserslist": "^4.21.0",
+ "@csstools/postcss-stepped-value-functions": "^1.0.1",
+ "@csstools/postcss-text-decoration-shorthand": "^1.0.0",
+ "@csstools/postcss-trigonometric-functions": "^1.0.2",
+ "@csstools/postcss-unset-value": "^1.0.2",
+ "autoprefixer": "^10.4.8",
+ "browserslist": "^4.21.3",
"css-blank-pseudo": "^3.0.3",
"css-has-pseudo": "^3.0.4",
"css-prefers-color-scheme": "^6.0.3",
- "cssdb": "^6.6.3",
- "postcss-attribute-case-insensitive": "^5.0.1",
+ "cssdb": "^7.0.0",
+ "postcss-attribute-case-insensitive": "^5.0.2",
"postcss-clamp": "^4.1.0",
- "postcss-color-functional-notation": "^4.2.3",
+ "postcss-color-functional-notation": "^4.2.4",
"postcss-color-hex-alpha": "^8.0.4",
- "postcss-color-rebeccapurple": "^7.1.0",
+ "postcss-color-rebeccapurple": "^7.1.1",
"postcss-custom-media": "^8.0.2",
"postcss-custom-properties": "^12.1.8",
"postcss-custom-selectors": "^6.0.3",
- "postcss-dir-pseudo-class": "^6.0.4",
- "postcss-double-position-gradients": "^3.1.1",
+ "postcss-dir-pseudo-class": "^6.0.5",
+ "postcss-double-position-gradients": "^3.1.2",
"postcss-env-function": "^4.0.6",
"postcss-focus-visible": "^6.0.4",
"postcss-focus-within": "^5.0.4",
"postcss-font-variant": "^5.0.0",
- "postcss-gap-properties": "^3.0.3",
- "postcss-image-set-function": "^4.0.6",
+ "postcss-gap-properties": "^3.0.5",
+ "postcss-image-set-function": "^4.0.7",
"postcss-initial": "^4.0.1",
- "postcss-lab-function": "^4.2.0",
+ "postcss-lab-function": "^4.2.1",
"postcss-logical": "^5.0.4",
"postcss-media-minmax": "^5.0.0",
- "postcss-nesting": "^10.1.9",
+ "postcss-nesting": "^10.1.10",
"postcss-opacity-percentage": "^1.1.2",
- "postcss-overflow-shorthand": "^3.0.3",
+ "postcss-overflow-shorthand": "^3.0.4",
"postcss-page-break": "^3.0.4",
- "postcss-place": "^7.0.4",
- "postcss-pseudo-class-any-link": "^7.1.5",
+ "postcss-place": "^7.0.5",
+ "postcss-pseudo-class-any-link": "^7.1.6",
"postcss-replace-overflow-wrap": "^4.0.0",
- "postcss-selector-not": "^6.0.0",
+ "postcss-selector-not": "^6.0.1",
"postcss-value-parser": "^4.2.0"
}
},
"postcss-pseudo-class-any-link": {
- "version": "7.1.5",
- "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.5.tgz",
- "integrity": "sha512-nSGKGScwFTaaV8Cyi27W9FegX3l3b7tmNxujxmykI/j3++cBAiq8fTUAU3ZK0s2aneN2T8cTUvKdNedzp3JIEA==",
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz",
+ "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==",
"requires": {
"postcss-selector-parser": "^6.0.10"
}
@@ -26412,9 +26362,9 @@
"requires": {}
},
"postcss-selector-not": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.0.tgz",
- "integrity": "sha512-i/HI/VNd3V9e1WOLCwJsf9nePBRXqcGtVibcJ9FsVo0agfDEfsLSlFt94aYjY35wUNcdG0KrvdyjEr7It50wLQ==",
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz",
+ "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==",
"requires": {
"postcss-selector-parser": "^6.0.10"
}
@@ -26523,6 +26473,11 @@
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
"integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="
+ },
+ "react-is": {
+ "version": "17.0.2",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+ "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
}
}
},
@@ -26582,9 +26537,9 @@
}
},
"psl": {
- "version": "1.8.0",
- "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
- "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+ "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="
},
"punycode": {
"version": "2.1.1",
@@ -26778,12 +26733,11 @@
"integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
},
"react-i18next": {
- "version": "11.17.2",
- "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.17.2.tgz",
- "integrity": "sha512-/HG4XSResWDY450cFmoUqLgCYDu8VYMFISGcMnZlxRSV05naj3+F7DoebwnPu6z/akA3Wd0Xe7KGTYdywL9z9g==",
+ "version": "11.18.4",
+ "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.4.tgz",
+ "integrity": "sha512-gK/AylAQC5DvCD5YLNCHW4PNzpCfrWIyVAXbSMl+/5QXzlDP8VdBoqE2s2niGHB+zIXwBV9hRXbDrVuupbgHcg==",
"requires": {
"@babel/runtime": "^7.14.5",
- "html-escaper": "^2.0.2",
"html-parse-stringify": "^3.0.1"
}
},
@@ -26796,9 +26750,9 @@
}
},
"react-is": {
- "version": "17.0.2",
- "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
- "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+ "version": "18.2.0",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
},
"react-refresh": {
"version": "0.11.0",
@@ -26888,9 +26842,9 @@
}
},
"react-transition-group": {
- "version": "4.4.2",
- "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
- "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==",
+ "version": "4.4.5",
+ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
+ "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
"requires": {
"@babel/runtime": "^7.5.5",
"dom-helpers": "^5.0.1",
@@ -26989,9 +26943,9 @@
"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
},
"regexpu-core": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
- "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz",
+ "integrity": "sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==",
"requires": {
"regenerate": "^1.4.2",
"regenerate-unicode-properties": "^10.0.1",
@@ -27140,9 +27094,9 @@
}
},
"rollup": {
- "version": "2.75.7",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz",
- "integrity": "sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==",
+ "version": "2.78.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.78.0.tgz",
+ "integrity": "sha512-4+YfbQC9QEVvKTanHhIAFVUFSRsezvQF8vFOJwtGfb9Bb+r014S+qryr9PSmw8x6sMnPkmFBGAvIFVQxvJxjtg==",
"requires": {
"fsevents": "~2.3.2"
}
@@ -27849,9 +27803,9 @@
"integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
},
"tailwindcss": {
- "version": "3.1.4",
- "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.4.tgz",
- "integrity": "sha512-NrxbFV4tYsga/hpWbRyUfIaBrNMXDxx5BsHgBS4v5tlyjf+sDsgBg5m9OxjrXIqAS/uR9kicxLKP+bEHI7BSeQ==",
+ "version": "3.1.8",
+ "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.8.tgz",
+ "integrity": "sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==",
"requires": {
"arg": "^5.0.2",
"chokidar": "^3.5.3",
@@ -27862,7 +27816,7 @@
"fast-glob": "^3.2.11",
"glob-parent": "^6.0.2",
"is-glob": "^4.0.3",
- "lilconfig": "^2.0.5",
+ "lilconfig": "^2.0.6",
"normalize-path": "^3.0.0",
"object-hash": "^3.0.0",
"picocolors": "^1.0.0",
@@ -27874,7 +27828,7 @@
"postcss-selector-parser": "^6.0.10",
"postcss-value-parser": "^4.2.0",
"quick-lru": "^5.1.1",
- "resolve": "^1.22.0"
+ "resolve": "^1.22.1"
},
"dependencies": {
"color-name": {
@@ -27940,15 +27894,15 @@
}
},
"terser-webpack-plugin": {
- "version": "5.3.3",
- "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz",
- "integrity": "sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==",
+ "version": "5.3.5",
+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.5.tgz",
+ "integrity": "sha512-AOEDLDxD2zylUGf/wxHxklEkOe2/r+seuyOWujejFrIxHf11brA1/dWQNIgXa1c6/Wkxgu7zvv0JhOWfc2ELEA==",
"requires": {
- "@jridgewell/trace-mapping": "^0.3.7",
+ "@jridgewell/trace-mapping": "^0.3.14",
"jest-worker": "^27.4.5",
"schema-utils": "^3.1.1",
"serialize-javascript": "^6.0.0",
- "terser": "^5.7.2"
+ "terser": "^5.14.1"
}
},
"test-exclude": {
@@ -28182,9 +28136,9 @@
"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
},
"update-browserslist-db": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz",
- "integrity": "sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==",
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz",
+ "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==",
"requires": {
"escalade": "^3.1.1",
"picocolors": "^1.0.0"
@@ -28308,20 +28262,20 @@
"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
},
"webpack": {
- "version": "5.73.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz",
- "integrity": "sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==",
+ "version": "5.74.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
+ "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
"requires": {
"@types/eslint-scope": "^3.7.3",
"@types/estree": "^0.0.51",
"@webassemblyjs/ast": "1.11.1",
"@webassemblyjs/wasm-edit": "1.11.1",
"@webassemblyjs/wasm-parser": "1.11.1",
- "acorn": "^8.4.1",
+ "acorn": "^8.7.1",
"acorn-import-assertions": "^1.7.6",
"browserslist": "^4.14.5",
"chrome-trace-event": "^1.0.2",
- "enhanced-resolve": "^5.9.3",
+ "enhanced-resolve": "^5.10.0",
"es-module-lexer": "^0.9.0",
"eslint-scope": "5.1.1",
"events": "^3.2.0",
@@ -28334,10 +28288,15 @@
"schema-utils": "^3.1.0",
"tapable": "^2.1.1",
"terser-webpack-plugin": "^5.1.3",
- "watchpack": "^2.3.1",
+ "watchpack": "^2.4.0",
"webpack-sources": "^3.2.3"
},
"dependencies": {
+ "@types/estree": {
+ "version": "0.0.51",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
+ "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="
+ },
"eslint-scope": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -28404,9 +28363,9 @@
}
},
"webpack-dev-server": {
- "version": "4.9.2",
- "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz",
- "integrity": "sha512-H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q==",
+ "version": "4.10.0",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.10.0.tgz",
+ "integrity": "sha512-7dezwAs+k6yXVFZ+MaL8VnE+APobiO3zvpp3rBHe/HmWQ+avwh0Q3d0xxacOiBybZZ3syTZw9HXzpa3YNbAZDQ==",
"requires": {
"@types/bonjour": "^3.5.9",
"@types/connect-history-api-fallback": "^1.3.5",
@@ -28420,7 +28379,7 @@
"chokidar": "^3.5.3",
"colorette": "^2.0.10",
"compression": "^1.7.4",
- "connect-history-api-fallback": "^1.6.0",
+ "connect-history-api-fallback": "^2.0.0",
"default-gateway": "^6.0.3",
"express": "^4.17.3",
"graceful-fs": "^4.2.6",
@@ -28475,9 +28434,9 @@
}
},
"ws": {
- "version": "8.8.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
- "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
+ "version": "8.8.1",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
+ "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
"requires": {}
}
}
@@ -28597,26 +28556,26 @@
"integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
},
"workbox-background-sync": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.3.tgz",
- "integrity": "sha512-0DD/V05FAcek6tWv9XYj2w5T/plxhDSpclIcAGjA/b7t/6PdaRkQ7ZgtAX6Q/L7kV7wZ8uYRJUoH11VjNipMZw==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz",
+ "integrity": "sha512-0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g==",
"requires": {
- "idb": "^6.1.4",
- "workbox-core": "6.5.3"
+ "idb": "^7.0.1",
+ "workbox-core": "6.5.4"
}
},
"workbox-broadcast-update": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.3.tgz",
- "integrity": "sha512-4AwCIA5DiDrYhlN+Miv/fp5T3/whNmSL+KqhTwRBTZIL6pvTgE4lVuRzAt1JltmqyMcQ3SEfCdfxczuI4kwFQg==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz",
+ "integrity": "sha512-I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw==",
"requires": {
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"workbox-build": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.3.tgz",
- "integrity": "sha512-8JNHHS7u13nhwIYCDea9MNXBNPHXCs5KDZPKI/ZNTr3f4sMGoD7hgFGecbyjX1gw4z6e9bMpMsOEJNyH5htA/w==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.5.4.tgz",
+ "integrity": "sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA==",
"requires": {
"@apideck/better-ajv-errors": "^0.3.1",
"@babel/core": "^7.11.1",
@@ -28640,27 +28599,27 @@
"strip-comments": "^2.0.1",
"tempy": "^0.6.0",
"upath": "^1.2.0",
- "workbox-background-sync": "6.5.3",
- "workbox-broadcast-update": "6.5.3",
- "workbox-cacheable-response": "6.5.3",
- "workbox-core": "6.5.3",
- "workbox-expiration": "6.5.3",
- "workbox-google-analytics": "6.5.3",
- "workbox-navigation-preload": "6.5.3",
- "workbox-precaching": "6.5.3",
- "workbox-range-requests": "6.5.3",
- "workbox-recipes": "6.5.3",
- "workbox-routing": "6.5.3",
- "workbox-strategies": "6.5.3",
- "workbox-streams": "6.5.3",
- "workbox-sw": "6.5.3",
- "workbox-window": "6.5.3"
+ "workbox-background-sync": "6.5.4",
+ "workbox-broadcast-update": "6.5.4",
+ "workbox-cacheable-response": "6.5.4",
+ "workbox-core": "6.5.4",
+ "workbox-expiration": "6.5.4",
+ "workbox-google-analytics": "6.5.4",
+ "workbox-navigation-preload": "6.5.4",
+ "workbox-precaching": "6.5.4",
+ "workbox-range-requests": "6.5.4",
+ "workbox-recipes": "6.5.4",
+ "workbox-routing": "6.5.4",
+ "workbox-strategies": "6.5.4",
+ "workbox-streams": "6.5.4",
+ "workbox-sw": "6.5.4",
+ "workbox-window": "6.5.4"
},
"dependencies": {
"@apideck/better-ajv-errors": {
- "version": "0.3.4",
- "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.4.tgz",
- "integrity": "sha512-Ic2d8ZT6HJiSikGVQvSklaFyw1OUv4g8sDOxa0PXSlbmN/3gL5IO1WYY9DOwTDqOFmjWoqG1yaaKnPDqYCE9KA==",
+ "version": "0.3.6",
+ "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz",
+ "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==",
"requires": {
"json-schema": "^0.4.0",
"jsonpointer": "^5.0.0",
@@ -28728,117 +28687,117 @@
}
},
"workbox-cacheable-response": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.3.tgz",
- "integrity": "sha512-6JE/Zm05hNasHzzAGKDkqqgYtZZL2H06ic2GxuRLStA4S/rHUfm2mnLFFXuHAaGR1XuuYyVCEey1M6H3PdZ7SQ==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz",
+ "integrity": "sha512-DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug==",
"requires": {
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"workbox-core": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.3.tgz",
- "integrity": "sha512-Bb9ey5n/M9x+l3fBTlLpHt9ASTzgSGj6vxni7pY72ilB/Pb3XtN+cZ9yueboVhD5+9cNQrC9n/E1fSrqWsUz7Q=="
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.5.4.tgz",
+ "integrity": "sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q=="
},
"workbox-expiration": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.3.tgz",
- "integrity": "sha512-jzYopYR1zD04ZMdlbn/R2Ik6ixiXbi15c9iX5H8CTi6RPDz7uhvMLZPKEndZTpfgmUk8mdmT9Vx/AhbuCl5Sqw==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.5.4.tgz",
+ "integrity": "sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ==",
"requires": {
- "idb": "^6.1.4",
- "workbox-core": "6.5.3"
+ "idb": "^7.0.1",
+ "workbox-core": "6.5.4"
}
},
"workbox-google-analytics": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.3.tgz",
- "integrity": "sha512-3GLCHotz5umoRSb4aNQeTbILETcrTVEozSfLhHSBaegHs1PnqCmN0zbIy2TjTpph2AGXiNwDrWGF0AN+UgDNTw==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz",
+ "integrity": "sha512-8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg==",
"requires": {
- "workbox-background-sync": "6.5.3",
- "workbox-core": "6.5.3",
- "workbox-routing": "6.5.3",
- "workbox-strategies": "6.5.3"
+ "workbox-background-sync": "6.5.4",
+ "workbox-core": "6.5.4",
+ "workbox-routing": "6.5.4",
+ "workbox-strategies": "6.5.4"
}
},
"workbox-navigation-preload": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.3.tgz",
- "integrity": "sha512-bK1gDFTc5iu6lH3UQ07QVo+0ovErhRNGvJJO/1ngknT0UQ702nmOUhoN9qE5mhuQSrnK+cqu7O7xeaJ+Rd9Tmg==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz",
+ "integrity": "sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng==",
"requires": {
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"workbox-precaching": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.3.tgz",
- "integrity": "sha512-sjNfgNLSsRX5zcc63H/ar/hCf+T19fRtTqvWh795gdpghWb5xsfEkecXEvZ8biEi1QD7X/ljtHphdaPvXDygMQ==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.5.4.tgz",
+ "integrity": "sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg==",
"requires": {
- "workbox-core": "6.5.3",
- "workbox-routing": "6.5.3",
- "workbox-strategies": "6.5.3"
+ "workbox-core": "6.5.4",
+ "workbox-routing": "6.5.4",
+ "workbox-strategies": "6.5.4"
}
},
"workbox-range-requests": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.3.tgz",
- "integrity": "sha512-pGCP80Bpn/0Q0MQsfETSfmtXsQcu3M2QCJwSFuJ6cDp8s2XmbUXkzbuQhCUzKR86ZH2Vex/VUjb2UaZBGamijA==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz",
+ "integrity": "sha512-Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg==",
"requires": {
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"workbox-recipes": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.3.tgz",
- "integrity": "sha512-IcgiKYmbGiDvvf3PMSEtmwqxwfQ5zwI7OZPio3GWu4PfehA8jI8JHI3KZj+PCfRiUPZhjQHJ3v1HbNs+SiSkig==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.5.4.tgz",
+ "integrity": "sha512-QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA==",
"requires": {
- "workbox-cacheable-response": "6.5.3",
- "workbox-core": "6.5.3",
- "workbox-expiration": "6.5.3",
- "workbox-precaching": "6.5.3",
- "workbox-routing": "6.5.3",
- "workbox-strategies": "6.5.3"
+ "workbox-cacheable-response": "6.5.4",
+ "workbox-core": "6.5.4",
+ "workbox-expiration": "6.5.4",
+ "workbox-precaching": "6.5.4",
+ "workbox-routing": "6.5.4",
+ "workbox-strategies": "6.5.4"
}
},
"workbox-routing": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.3.tgz",
- "integrity": "sha512-DFjxcuRAJjjt4T34RbMm3MCn+xnd36UT/2RfPRfa8VWJGItGJIn7tG+GwVTdHmvE54i/QmVTJepyAGWtoLPTmg==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.5.4.tgz",
+ "integrity": "sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg==",
"requires": {
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"workbox-strategies": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.3.tgz",
- "integrity": "sha512-MgmGRrDVXs7rtSCcetZgkSZyMpRGw8HqL2aguszOc3nUmzGZsT238z/NN9ZouCxSzDu3PQ3ZSKmovAacaIhu1w==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.5.4.tgz",
+ "integrity": "sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw==",
"requires": {
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"workbox-streams": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.3.tgz",
- "integrity": "sha512-vN4Qi8o+b7zj1FDVNZ+PlmAcy1sBoV7SC956uhqYvZ9Sg1fViSbOpydULOssVJ4tOyKRifH/eoi6h99d+sJ33w==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.5.4.tgz",
+ "integrity": "sha512-FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg==",
"requires": {
- "workbox-core": "6.5.3",
- "workbox-routing": "6.5.3"
+ "workbox-core": "6.5.4",
+ "workbox-routing": "6.5.4"
}
},
"workbox-sw": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.3.tgz",
- "integrity": "sha512-BQBzm092w+NqdIEF2yhl32dERt9j9MDGUTa2Eaa+o3YKL4Qqw55W9yQC6f44FdAHdAJrJvp0t+HVrfh8AiGj8A=="
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.5.4.tgz",
+ "integrity": "sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA=="
},
"workbox-webpack-plugin": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.3.tgz",
- "integrity": "sha512-Es8Xr02Gi6Kc3zaUwR691ZLy61hz3vhhs5GztcklQ7kl5k2qAusPh0s6LF3wEtlpfs9ZDErnmy5SErwoll7jBA==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.5.4.tgz",
+ "integrity": "sha512-LmWm/zoaahe0EGmMTrSLUi+BjyR3cdGEfU3fS6PN1zKFYbqAKuQ+Oy/27e4VSXsyIwAw8+QDfk1XHNGtZu9nQg==",
"requires": {
"fast-json-stable-stringify": "^2.1.0",
"pretty-bytes": "^5.4.1",
"upath": "^1.2.0",
"webpack-sources": "^1.4.3",
- "workbox-build": "6.5.3"
+ "workbox-build": "6.5.4"
},
"dependencies": {
"source-map": {
@@ -28858,12 +28817,12 @@
}
},
"workbox-window": {
- "version": "6.5.3",
- "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.3.tgz",
- "integrity": "sha512-GnJbx1kcKXDtoJBVZs/P7ddP0Yt52NNy4nocjBpYPiRhMqTpJCNrSL+fGHZ/i/oP6p/vhE8II0sA6AZGKGnssw==",
+ "version": "6.5.4",
+ "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.5.4.tgz",
+ "integrity": "sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug==",
"requires": {
"@types/trusted-types": "^2.0.2",
- "workbox-core": "6.5.3"
+ "workbox-core": "6.5.4"
}
},
"wrap-ansi": {
@@ -28916,9 +28875,9 @@
}
},
"ws": {
- "version": "7.5.8",
- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz",
- "integrity": "sha512-ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw==",
+ "version": "7.5.9",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+ "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
"requires": {}
},
"xml-name-validator": {
From 3aa0eb7d1d7d30651cb80e6e58fcd2de67cf8532 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Thu, 18 Aug 2022 20:32:51 -0400
Subject: [PATCH 13/63] Release notes
---
docs/releases.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/docs/releases.md b/docs/releases.md
index 3ae44d05..7dd24fc5 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -35,6 +35,7 @@ Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up s
* Subscription display name for the web app ([#348](https://github.com/binwiederhier/ntfy/pull/348))
* Allow setting socket permissions via `--listen-unix-mode` ([#356](https://github.com/binwiederhier/ntfy/pull/356), thanks to [@koro666](https://github.com/koro666))
+* CLI: Allow default username/password in `client.yml` ([#372](https://github.com/binwiederhier/ntfy/pull/372), thanks to [@wunter8](https://github.com/wunter8))
**Bugs:**
From 4277d6e4a603c8123f4e6e882c1e3aead1af6dce Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Thu, 18 Aug 2022 21:04:30 -0400
Subject: [PATCH 14/63] Remove unnecessary else branch
---
cmd/subscribe.go | 4 ----
1 file changed, 4 deletions(-)
diff --git a/cmd/subscribe.go b/cmd/subscribe.go
index 2c737870..51d9de82 100644
--- a/cmd/subscribe.go
+++ b/cmd/subscribe.go
@@ -180,15 +180,11 @@ func doSubscribe(c *cli.Context, cl *client.Client, conf *client.Config, topic,
user = s.User
} else if conf.DefaultUser != "" {
user = conf.DefaultUser
- } else {
- user = ""
}
if s.Password != "" {
password = s.Password
} else if conf.DefaultPassword != "" {
password = conf.DefaultPassword
- } else {
- password = ""
}
if user != "" && password != "" {
topicOptions = append(topicOptions, client.WithBasicAuth(user, password))
From 85b2a674aeb0019217c401ff79e1b1378e943dc4 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sat, 20 Aug 2022 22:22:18 -0400
Subject: [PATCH 15/63] WIP: Integrations page with links to projects
---
docs/integrations.md | 66 ++++++++++++++++++++++++++++++++++++++++++++
mkdocs.yml | 1 +
2 files changed, 67 insertions(+)
create mode 100644 docs/integrations.md
diff --git a/docs/integrations.md b/docs/integrations.md
new file mode 100644
index 00000000..8ad81e1e
--- /dev/null
+++ b/docs/integrations.md
@@ -0,0 +1,66 @@
+# Integrations + community projects
+
+There are quite a few projects that work with ntfy, integrate ntfy, or have been built around ntfy. It's super exciting to see what you guys have come up with. Feel free to [create a pull request on GitHub](https://github.com/binwiederhier/ntfy/issues) to add your own project here.
+
+## Public ntfy servers
+
+| URL | Country |
+|-----------------------------------------------|:---------:|
+| [ntfy.sh](https://ntfy.sh/) (*Official*) | 🇺🇸 |
+| [ntfy.tedomum.net](https://ntfy.tedomum.net/) | 🇫🇷 🇪🇺 |
+| [ntfy.jae.fi](https://ntfy.jae.fi/) | 🇫🇮 🇪🇺 |
+
+## Apps that support ntfy (via [UnifiedPush](https://unifiedpush.org/users/apps/))
+- [Tusky](https://tusky.app/) (Fediverse client)
+- [Fedilab](https://fedilab.app/) (Fediverse client)
+- [Element](https://f-droid.org/packages/im.vector.app/) (Matrix client)
+- [SchildiChat](https://schildi.chat/android/) (Matrix client)
+- [FindMyDevice](https://gitlab.com/Nulide/findmydevice/)
+- [Tox Push Message App](https://github.com/zoff99/tox_push_msg_app)
+
+## Official integrations
+
+- [Apprise](https://github.com/caronc/apprise/wiki/Notify_ntfy)
+- [Robusta](https://docs.robusta.dev/master/catalog/sinks/webhook.html) - open source platform for Kubernetes troubleshooting
+- [borgmatic](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#third-party-monitoring-services) - configuration-driven backup software for servers and workstations
+
+## Libraries
+
+- [ntfy-php-library](https://github.com/VerifiedJoseph/ntfy-php-library) - PHP library for sending messages using a ntfy server
+- [ntfy-notifier](https://github.com/DAcodedBEAT/ntfy-notifier) - Symfony Notifier integration for ntfy
+- [ntfpy](https://github.com/Nevalicjus/ntfpy) - Python API Wrapper for ntfy.sh
+- [pyntfy](https://github.com/DP44/pyntfy) - A Python module for interacting with ntfy notifications
+- [vntfy](https://github.com/lmangani/vntfy) - Barebone V client for ntfy
+- [ntfy-middleman](https://github.com/nachotp/ntfy-middleman) - Wraps APIs and send notifications using ntfy.sh on schedule (Python)
+
+## CLIs and graphical user interfaces
+
+- [ntfy.sh.sh](https://github.com/mininmobile/ntfy.sh.sh) - Run scripts on ntfy.sh events
+- [ntfy Desktop client](https://github.com/mininmobile/ntfy-desktop) - Cross-platform desktop application for ntfy
+- [ntfy svelte front-end](https://github.com/novatorem/Ntfy) - Front-end built with svelte
+- [wio-ntfy-ticker](https://github.com/nachotp/wio-ntfy-ticker) - Ticker display for a ntfy.sh topic
+- [ntfysh-windows](https://github.com/lucas-bortoli/ntfysh-windows) - A ntfy client for Windows Desktop
+- [ntfyr](https://github.com/haxwithaxe/ntfyr) - A simple commandline tool to send notifications to ntfy
+
+## Scripts and other things
+
+- [Grafana-to-ntfy](https://github.com/kittyandrew/grafana-to-ntfy) - Grafana-to-ntfy alerts channel (Rust)
+- [ntfy-long-zsh-command](https://github.com/robfox92/ntfy-long-zsh-command) - Notifies you once a long-running command completes (zsh)
+- [ntfy-shellscripts](https://github.com/nickexyz/ntfy-shellscripts) - A few scripts for the ntfy project (Shell)
+- [QuickStatus](https://github.com/corneliusroot/QuickStatus) - A shell script to alert to any immediate problems upon login (Shell)
+- [ntfy.el](https://github.com/shombando/ntfy) - Send notifications from Emacs (Emacs)
+- [backup-projects](https://gist.github.com/anthonyaxenov/826ba65abbabd5b00196bc3e6af76002) - Stupidly simple backup script for own projects (Shell)
+- [grav-plugin-whistleblower](https://github.com/Himmlisch-Studios/grav-plugin-whistleblower) - Grav CMS plugin to get notifications via ntfy (PHP)
+- [ntfy-server-status](https://github.com/filip2cz/ntfy-server-status) - Checking if server is online and reporting through ntfy (C)
+- [borg-based backup](https://github.com/davidhi7/backup) - Simple borg-based backup script with notifications based on ntfy.sh or Discord webhooks (Python/Shell)
+
+## Blog + forum posts
+
+- [4 cool new projects to try in Copr](https://fedoramagazine.org/4-cool-new-projects-to-try-in-copr-for-august-2022/) - 8/2022
+- [Easy notifications from R](https://sometimesir.com/posts/easy-notifications-from-r/) - 6/2022
+- [无需注册的通知服务ntfy](https://wbsu2003.4everland.app/2022/05/30/%E6%97%A0%E9%9C%80%E6%B3%A8%E5%86%8C%E7%9A%84%E9%80%9A%E7%9F%A5%E6%9C%8D%E5%8A%A1ntfy/) - 5/2022
+- [Updated review post (Jan-Lukas Else)](https://jlelse.blog/thoughts/2022/04/ntfy) - 4/2022
+- [Lemmy post (Jakob)](https://lemmy.eus/post/15541) - 1/2022
+- [Short ntfy review (Jan-Lukas Else)](https://jlelse.blog/links/2021/12/ntfy-sh) - 12/2021
+- [Free MacroDroid webhook alternative (FrameXX)](https://www.macrodroidforum.com/index.php?threads/ntfy-sh-free-macrodroid-webhook-alternative.1505/) - 12/2021
+- [ntfy otro sistema de notificaciones pub-sub simple basado en HTTP](https://ugeek.github.io/blog/post/2021-11-05-ntfy-sh-otro-sistema-de-notificaciones-pub-sub-simple-basado-en-http.html) - 11/2021
diff --git a/mkdocs.yml b/mkdocs.yml
index 4398d4ec..5a13edee 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -85,6 +85,7 @@ nav:
- "Other things":
- "FAQs": faq.md
- "Examples": examples.md
+ - "Integrations + projects": integrations.md
- "Release notes": releases.md
- "Deprecation notices": deprecations.md
- "Emojis 🥳 🎉": emojis.md
From fb7a2455faa755215407dd72a00c100e9e7c45de Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sun, 21 Aug 2022 10:58:20 -0400
Subject: [PATCH 16/63] More projects
---
docs/integrations.md | 63 +++++++++++++++++++++++++++++++-------------
1 file changed, 45 insertions(+), 18 deletions(-)
diff --git a/docs/integrations.md b/docs/integrations.md
index 8ad81e1e..32395347 100644
--- a/docs/integrations.md
+++ b/docs/integrations.md
@@ -2,6 +2,8 @@
There are quite a few projects that work with ntfy, integrate ntfy, or have been built around ntfy. It's super exciting to see what you guys have come up with. Feel free to [create a pull request on GitHub](https://github.com/binwiederhier/ntfy/issues) to add your own project here.
+I've added a ⭐ to projects or posts that have a significant following, or had a lot of interaction by the community.
+
## Public ntfy servers
| URL | Country |
@@ -10,30 +12,33 @@ There are quite a few projects that work with ntfy, integrate ntfy, or have been
| [ntfy.tedomum.net](https://ntfy.tedomum.net/) | 🇫🇷 🇪🇺 |
| [ntfy.jae.fi](https://ntfy.jae.fi/) | 🇫🇮 🇪🇺 |
-## Apps that support ntfy (via [UnifiedPush](https://unifiedpush.org/users/apps/))
-- [Tusky](https://tusky.app/) (Fediverse client)
-- [Fedilab](https://fedilab.app/) (Fediverse client)
-- [Element](https://f-droid.org/packages/im.vector.app/) (Matrix client)
-- [SchildiChat](https://schildi.chat/android/) (Matrix client)
-- [FindMyDevice](https://gitlab.com/Nulide/findmydevice/)
-- [Tox Push Message App](https://github.com/zoff99/tox_push_msg_app)
-
## Official integrations
-- [Apprise](https://github.com/caronc/apprise/wiki/Notify_ntfy)
-- [Robusta](https://docs.robusta.dev/master/catalog/sinks/webhook.html) - open source platform for Kubernetes troubleshooting
-- [borgmatic](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#third-party-monitoring-services) - configuration-driven backup software for servers and workstations
+- [Apprise](https://github.com/caronc/apprise/wiki/Notify_ntfy) ⭐ - Push Notifications that work with just about every platform
+- [Uptime Kuma](https://uptime.kuma.pet/) ⭐ - A self-hosted monitoring tool
+- [Robusta](https://docs.robusta.dev/master/catalog/sinks/webhook.html) ⭐ - open source platform for Kubernetes troubleshooting
+- [borgmatic](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#third-party-monitoring-services) ⭐ - configuration-driven backup software for servers and workstations
+- [Radarr](https://radarr.video/) ⭐ - Movie collection manager for Usenet and BitTorrent users
+
+## [UnifiedPush](https://unifiedpush.org/users/apps/) integrations
+
+- [Element](https://f-droid.org/packages/im.vector.app/) ⭐ - Matrix client
+- [SchildiChat](https://schildi.chat/android/) ⭐ - Matrix client
+- [Tusky](https://tusky.app/) ⭐ - Fediverse client
+- [Fedilab](https://fedilab.app/) - Fediverse client
+- [FindMyDevice](https://gitlab.com/Nulide/findmydevice/) - Find your Device with an SMS or online with the help of FMDServer
+- [Tox Push Message App](https://github.com/zoff99/tox_push_msg_app) - Tox Push Message App
## Libraries
-- [ntfy-php-library](https://github.com/VerifiedJoseph/ntfy-php-library) - PHP library for sending messages using a ntfy server
-- [ntfy-notifier](https://github.com/DAcodedBEAT/ntfy-notifier) - Symfony Notifier integration for ntfy
-- [ntfpy](https://github.com/Nevalicjus/ntfpy) - Python API Wrapper for ntfy.sh
-- [pyntfy](https://github.com/DP44/pyntfy) - A Python module for interacting with ntfy notifications
-- [vntfy](https://github.com/lmangani/vntfy) - Barebone V client for ntfy
+- [ntfy-php-library](https://github.com/VerifiedJoseph/ntfy-php-library) - PHP library for sending messages using a ntfy server (PHP)
+- [ntfy-notifier](https://github.com/DAcodedBEAT/ntfy-notifier) - Symfony Notifier integration for ntfy (PHP)
+- [ntfpy](https://github.com/Nevalicjus/ntfpy) - API Wrapper for ntfy.sh (Python)
+- [pyntfy](https://github.com/DP44/pyntfy) - A module for interacting with ntfy notifications (Python)
+- [vntfy](https://github.com/lmangani/vntfy) - Barebone V client for ntfy (V)
- [ntfy-middleman](https://github.com/nachotp/ntfy-middleman) - Wraps APIs and send notifications using ntfy.sh on schedule (Python)
-## CLIs and graphical user interfaces
+## CLIs + GUIs
- [ntfy.sh.sh](https://github.com/mininmobile/ntfy.sh.sh) - Run scripts on ntfy.sh events
- [ntfy Desktop client](https://github.com/mininmobile/ntfy-desktop) - Cross-platform desktop application for ntfy
@@ -41,8 +46,9 @@ There are quite a few projects that work with ntfy, integrate ntfy, or have been
- [wio-ntfy-ticker](https://github.com/nachotp/wio-ntfy-ticker) - Ticker display for a ntfy.sh topic
- [ntfysh-windows](https://github.com/lucas-bortoli/ntfysh-windows) - A ntfy client for Windows Desktop
- [ntfyr](https://github.com/haxwithaxe/ntfyr) - A simple commandline tool to send notifications to ntfy
+- [ntfy.py](https://github.com/ioqy/ntfy-client-python) - ntfy.py is a simple nfty.sh client for sending notifications
-## Scripts and other things
+## Projects + scripts
- [Grafana-to-ntfy](https://github.com/kittyandrew/grafana-to-ntfy) - Grafana-to-ntfy alerts channel (Rust)
- [ntfy-long-zsh-command](https://github.com/robfox92/ntfy-long-zsh-command) - Notifies you once a long-running command completes (zsh)
@@ -53,14 +59,35 @@ There are quite a few projects that work with ntfy, integrate ntfy, or have been
- [grav-plugin-whistleblower](https://github.com/Himmlisch-Studios/grav-plugin-whistleblower) - Grav CMS plugin to get notifications via ntfy (PHP)
- [ntfy-server-status](https://github.com/filip2cz/ntfy-server-status) - Checking if server is online and reporting through ntfy (C)
- [borg-based backup](https://github.com/davidhi7/backup) - Simple borg-based backup script with notifications based on ntfy.sh or Discord webhooks (Python/Shell)
+- [ntfy.sh *arr script](https://github.com/agent-squirrel/nfty-arr-script) - Quick and hacky script to get sonarr/radarr to notify the ntfy.sh service (Shell)
+- [siteeagle](https://github.com/tpanum/siteeagle) - A small Python script to monitor websites and notify changes (Python)
+- [send_to_phone](https://github.com/whipped-cream/send_to_phone) - Scripts to upload a file to Transfer.sh and ping ntfy with the download link (Python)
+- [ntfy Discord bot](https://github.com/R0dn3yS/ntfy-bot) - WIP ntfy discord bot (TypeScript)
+- [ntfy Discord bot](https://github.com/binwiederhier/ntfy-bot) - ntfy Discord bot (Go)
+- [Bettarr Notifications](https://github.com/NiNiyas/Bettarr-Notifications) - Better Notifications for Sonarr and Radarr (Python)
+- [Notify me the intruders](https://github.com/nothingbutlucas/notify_me_the_intruders) - Notify you if they are intruders or new connections on your network (Shell)
+- [Send GitHub Action to ntfy](https://github.com/NiNiyas/ntfy-action) - Send GitHub Action workflow notifications to ntfy (JS)
+- [ntfy alertmanager bridge](https://github.com/aTable/ntfy_alertmanager_bridge) - Basic alertmanager bridge to ntfy (JS)
+- [restreamchat2ntfy](https://github.com/kurohuku7/restreamchat2ntfy) - Send restream.io chat to ntfy to check on the Meta Quest (JS)
+- [k8s-ntfy-deployment-service](https://github.com/Christian42/k8s-ntfy-deployment-service) - Automatic Kubernetes (k8s) ntfy deployment
## Blog + forum posts
- [4 cool new projects to try in Copr](https://fedoramagazine.org/4-cool-new-projects-to-try-in-copr-for-august-2022/) - 8/2022
- [Easy notifications from R](https://sometimesir.com/posts/easy-notifications-from-r/) - 6/2022
+- [ntfy is finally coming to iOS, and Matrix/UnifiedPush gateway support](https://www.reddit.com/r/selfhosted/comments/vdzvxi/ntfy_is_finally_coming_to_ios_with_full/) ⭐ - 6/2022
- [无需注册的通知服务ntfy](https://wbsu2003.4everland.app/2022/05/30/%E6%97%A0%E9%9C%80%E6%B3%A8%E5%86%8C%E7%9A%84%E9%80%9A%E7%9F%A5%E6%9C%8D%E5%8A%A1ntfy/) - 5/2022
+- [Install guide (with Docker)](https://chowdera.com/2022/150/202205301257379077.html) - 5/2022
- [Updated review post (Jan-Lukas Else)](https://jlelse.blog/thoughts/2022/04/ntfy) - 4/2022
+- [Reddit feature update post](https://www.reddit.com/r/selfhosted/comments/uetlso/ntfy_is_a_tool_to_send_push_notifications_to_your/) ⭐ - 4/2022
+- [無料で簡単に通知の送受信ができつつオープンソースでセルフホストも可能な「ntfy」を使ってみた (Gigazine)](https://gigazine.net/news/20220404-ntfy-push-notification/) - 4/2022
+- [Pocketmags ntfy review](https://pocketmags.com/us/linux-format-magazine/march-2022/articles/1104187/ntfy) - 3/2022
+- [Reddit web app release post](https://www.reddit.com/r/selfhosted/comments/tc0p0u/say_hello_to_the_brand_new_ntfysh_web_app_push/) ⭐ - 3/2022
- [Lemmy post (Jakob)](https://lemmy.eus/post/15541) - 1/2022
+- [Reddit UnifiedPush release post](https://www.reddit.com/r/selfhosted/comments/s5jylf/my_open_source_notification_android_app_and/) ⭐ - 1/2022
+- [ntfy: send notifications from your computer to your phone](https://rs1.es/tutorials/2022/01/19/ntfy-send-notifications-phone.html) - 1/2022
- [Short ntfy review (Jan-Lukas Else)](https://jlelse.blog/links/2021/12/ntfy-sh) - 12/2021
- [Free MacroDroid webhook alternative (FrameXX)](https://www.macrodroidforum.com/index.php?threads/ntfy-sh-free-macrodroid-webhook-alternative.1505/) - 12/2021
- [ntfy otro sistema de notificaciones pub-sub simple basado en HTTP](https://ugeek.github.io/blog/post/2021-11-05-ntfy-sh-otro-sistema-de-notificaciones-pub-sub-simple-basado-en-http.html) - 11/2021
+- [Show HN: A tool to send push notifications to your phone, written in Go](https://news.ycombinator.com/item?id=29715464) ⭐ - 12/2021
+- [Reddit selfhostable post](https://www.reddit.com/r/selfhosted/comments/qxlsm9/my_open_source_notification_android_app_and/) ⭐ - 11/2021
From 0d5362f0e4a0039fff592c2f223ae764cf92590d Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sun, 21 Aug 2022 11:00:01 -0400
Subject: [PATCH 17/63] Bump versions
---
go.mod | 4 +--
go.sum | 4 +++
web/package-lock.json | 72 +++++++++++++++++++++----------------------
3 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/go.mod b/go.mod
index f4f3ceab..58c4131f 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ require (
github.com/urfave/cli/v2 v2.11.2
golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8
golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7 // indirect
- golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
+ golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9
google.golang.org/api v0.93.0
@@ -51,7 +51,7 @@ require (
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/appengine/v2 v2.0.2 // indirect
- google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1 // indirect
+ google.golang.org/genproto v0.0.0-20220819174105-e9f053255caa // indirect
google.golang.org/grpc v1.48.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
index 8cd0b699..bff5b995 100644
--- a/go.sum
+++ b/go.sum
@@ -414,6 +414,8 @@ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDE
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
+golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -719,6 +721,8 @@ google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljW
google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1 h1:C2UVWqrgLYKrT5nh5oU6hLRm1AeEklCK5eloQA1NtFY=
google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220819174105-e9f053255caa h1:Ux9yJCyf598uEniFPSyp8g1jtGTt77m+lzYyVgrWQaQ=
+google.golang.org/genproto v0.0.0-20220819174105-e9f053255caa/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
diff --git a/web/package-lock.json b/web/package-lock.json
index 255c6be0..e3d57cd5 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -3819,9 +3819,9 @@
}
},
"node_modules/@types/eslint": {
- "version": "8.4.5",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz",
- "integrity": "sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ==",
+ "version": "8.4.6",
+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz",
+ "integrity": "sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==",
"dependencies": {
"@types/estree": "*",
"@types/json-schema": "*"
@@ -3920,9 +3920,9 @@
"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
},
"node_modules/@types/node": {
- "version": "18.7.6",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.6.tgz",
- "integrity": "sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A=="
+ "version": "18.7.8",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.8.tgz",
+ "integrity": "sha512-/YP55EMK2341JkODUb8DM9O0x1SIz2aBvyF33Uf1c76St3VpsMXEIW0nxuKkq/5cxnbz0RD9cfwNZHEAZQD3ag=="
},
"node_modules/@types/parse-json": {
"version": "4.0.0",
@@ -5397,9 +5397,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001378",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001378.tgz",
- "integrity": "sha512-JVQnfoO7FK7WvU4ZkBRbPjaot4+YqxogSDosHv0Hv5mWpUESmN+UubMU6L/hGz8QlQ2aY5U0vR6MOs6j/CXpNA==",
+ "version": "1.0.30001380",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001380.tgz",
+ "integrity": "sha512-OO+pPubxx16lkI7TVrbFpde8XHz66SMwstl1YWpg6uMGw56XnhYVwtPIjvX4kYpzwMwQKr4DDce394E03dQPGg==",
"funding": [
{
"type": "opencollective",
@@ -6649,9 +6649,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.4.224",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.224.tgz",
- "integrity": "sha512-dOujC5Yzj0nOVE23iD5HKqrRSDj2SD7RazpZS/b/WX85MtO6/LzKDF4TlYZTBteB+7fvSg5JpWh0sN7fImNF8w=="
+ "version": "1.4.225",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.225.tgz",
+ "integrity": "sha512-ICHvGaCIQR3P88uK8aRtx8gmejbVJyC6bB4LEC3anzBrIzdzC7aiZHY4iFfXhN4st6I7lMO0x4sgBHf/7kBvRw=="
},
"node_modules/emittery": {
"version": "0.8.1",
@@ -7905,9 +7905,9 @@
}
},
"node_modules/flatted": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz",
- "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
},
"node_modules/follow-redirects": {
"version": "1.15.1",
@@ -14551,9 +14551,9 @@
}
},
"node_modules/rollup": {
- "version": "2.78.0",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.78.0.tgz",
- "integrity": "sha512-4+YfbQC9QEVvKTanHhIAFVUFSRsezvQF8vFOJwtGfb9Bb+r014S+qryr9PSmw8x6sMnPkmFBGAvIFVQxvJxjtg==",
+ "version": "2.78.1",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.78.1.tgz",
+ "integrity": "sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg==",
"bin": {
"rollup": "dist/bin/rollup"
},
@@ -19457,9 +19457,9 @@
}
},
"@types/eslint": {
- "version": "8.4.5",
- "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz",
- "integrity": "sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ==",
+ "version": "8.4.6",
+ "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.6.tgz",
+ "integrity": "sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==",
"requires": {
"@types/estree": "*",
"@types/json-schema": "*"
@@ -19558,9 +19558,9 @@
"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
},
"@types/node": {
- "version": "18.7.6",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.6.tgz",
- "integrity": "sha512-EdxgKRXgYsNITy5mjjXjVE/CS8YENSdhiagGrLqjG0pvA2owgJ6i4l7wy/PFZGC0B1/H20lWKN7ONVDNYDZm7A=="
+ "version": "18.7.8",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.8.tgz",
+ "integrity": "sha512-/YP55EMK2341JkODUb8DM9O0x1SIz2aBvyF33Uf1c76St3VpsMXEIW0nxuKkq/5cxnbz0RD9cfwNZHEAZQD3ag=="
},
"@types/parse-json": {
"version": "4.0.0",
@@ -20672,9 +20672,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001378",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001378.tgz",
- "integrity": "sha512-JVQnfoO7FK7WvU4ZkBRbPjaot4+YqxogSDosHv0Hv5mWpUESmN+UubMU6L/hGz8QlQ2aY5U0vR6MOs6j/CXpNA=="
+ "version": "1.0.30001380",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001380.tgz",
+ "integrity": "sha512-OO+pPubxx16lkI7TVrbFpde8XHz66SMwstl1YWpg6uMGw56XnhYVwtPIjvX4kYpzwMwQKr4DDce394E03dQPGg=="
},
"case-sensitive-paths-webpack-plugin": {
"version": "2.4.0",
@@ -21574,9 +21574,9 @@
}
},
"electron-to-chromium": {
- "version": "1.4.224",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.224.tgz",
- "integrity": "sha512-dOujC5Yzj0nOVE23iD5HKqrRSDj2SD7RazpZS/b/WX85MtO6/LzKDF4TlYZTBteB+7fvSg5JpWh0sN7fImNF8w=="
+ "version": "1.4.225",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.225.tgz",
+ "integrity": "sha512-ICHvGaCIQR3P88uK8aRtx8gmejbVJyC6bB4LEC3anzBrIzdzC7aiZHY4iFfXhN4st6I7lMO0x4sgBHf/7kBvRw=="
},
"emittery": {
"version": "0.8.1",
@@ -22503,9 +22503,9 @@
}
},
"flatted": {
- "version": "3.2.6",
- "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz",
- "integrity": "sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="
+ "version": "3.2.7",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
},
"follow-redirects": {
"version": "1.15.1",
@@ -27094,9 +27094,9 @@
}
},
"rollup": {
- "version": "2.78.0",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.78.0.tgz",
- "integrity": "sha512-4+YfbQC9QEVvKTanHhIAFVUFSRsezvQF8vFOJwtGfb9Bb+r014S+qryr9PSmw8x6sMnPkmFBGAvIFVQxvJxjtg==",
+ "version": "2.78.1",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.78.1.tgz",
+ "integrity": "sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg==",
"requires": {
"fsevents": "~2.3.2"
}
From ec64b412a87cb48295963195c8ad3cc6448191bd Mon Sep 17 00:00:00 2001
From: Christophe Henry <contact@c-henry.fr>
Date: Thu, 18 Aug 2022 23:12:38 +0200
Subject: [PATCH 18/63] Document Matrix pushkey error + set log level to
warnings for Matrix errors
---
server/server_matrix.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/server_matrix.go b/server/server_matrix.go
index 2113c5ac..ebc29133 100644
--- a/server/server_matrix.go
+++ b/server/server_matrix.go
@@ -124,7 +124,7 @@ func newRequestFromMatrixJSON(r *http.Request, baseURL string, messageLimit int)
}
pushKey := m.Notification.Devices[0].PushKey // We ignore other devices for now, see discussion in #316
if !strings.HasPrefix(pushKey, baseURL+"/") {
- return nil, &errMatrix{pushKey: pushKey, err: errHTTPBadRequestMatrixPushkeyBaseURLMismatch}
+ return nil, &errMatrix{pushKey: pushKey, err: wrapErrHTTP(errHTTPBadRequestMatrixPushkeyBaseURLMismatch, "; received pushKey: %s, configured base url: %s", pushKey, baseURL)}
}
newRequest, err := http.NewRequest(http.MethodPost, pushKey, io.NopCloser(bytes.NewReader(body.PeekedBytes)))
if err != nil {
From b0d58a618e2f83403cfe863b4bcd3b2c5db2d155 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sun, 21 Aug 2022 21:32:53 -0400
Subject: [PATCH 19/63] Fix test
---
server/server_matrix.go | 2 +-
server/server_matrix_test.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/server_matrix.go b/server/server_matrix.go
index ebc29133..7204bfac 100644
--- a/server/server_matrix.go
+++ b/server/server_matrix.go
@@ -124,7 +124,7 @@ func newRequestFromMatrixJSON(r *http.Request, baseURL string, messageLimit int)
}
pushKey := m.Notification.Devices[0].PushKey // We ignore other devices for now, see discussion in #316
if !strings.HasPrefix(pushKey, baseURL+"/") {
- return nil, &errMatrix{pushKey: pushKey, err: wrapErrHTTP(errHTTPBadRequestMatrixPushkeyBaseURLMismatch, "; received pushKey: %s, configured base url: %s", pushKey, baseURL)}
+ return nil, &errMatrix{pushKey: pushKey, err: wrapErrHTTP(errHTTPBadRequestMatrixPushkeyBaseURLMismatch, "received push key: %s, configured base URL: %s", pushKey, baseURL)}
}
newRequest, err := http.NewRequest(http.MethodPost, pushKey, io.NopCloser(bytes.NewReader(body.PeekedBytes)))
if err != nil {
diff --git a/server/server_matrix_test.go b/server/server_matrix_test.go
index 9129d6c4..b2f9b1d5 100644
--- a/server/server_matrix_test.go
+++ b/server/server_matrix_test.go
@@ -56,7 +56,7 @@ func TestMatrix_NewRequestFromMatrixJSON_MismatchingPushKey(t *testing.T) {
_, err := newRequestFromMatrixJSON(r, baseURL, maxLength)
matrixErr, ok := err.(*errMatrix)
require.True(t, ok)
- require.Equal(t, errHTTPBadRequestMatrixPushkeyBaseURLMismatch, matrixErr.err)
+ require.Equal(t, "invalid request: push key must be prefixed with base URL, received push key: https://ntfy.example.com/upABCDEFGHI?up=1, configured base URL: https://ntfy.sh", matrixErr.err.Error())
require.Equal(t, "https://ntfy.example.com/upABCDEFGHI?up=1", matrixErr.pushKey)
}
From 3f85e0a0c838c63d4027fc36909ff85823a3dbe1 Mon Sep 17 00:00:00 2001
From: "Philipp C. Heckel" <philipp.heckel@gmail.com>
Date: Sun, 21 Aug 2022 21:41:03 -0400
Subject: [PATCH 20/63] Update README.md
---
README.md | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/README.md b/README.md
index 4fa2f326..2590759c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,12 @@
+---
+
+## 👶 Baby break!
+(8/2022) Hey folks, my daughter is about to be born, so I'll be taking some time off from working on ntfy. I'll likely return to working on features and bugs in a few weeks. I hope you understand. I may post some pictures in [#387](https://github.com/binwiederhier/ntfy/issues/387) 🥰
+
+---
+
# ntfy.sh | Send push notifications to your phone or desktop via PUT/POST
[](https://github.com/binwiederhier/ntfy/releases/latest)
[](https://pkg.go.dev/heckel.io/ntfy)
From a22fd4db1cf7a102abe8804b6147ab3c1652faec Mon Sep 17 00:00:00 2001
From: "Philipp C. Heckel" <philipp.heckel@gmail.com>
Date: Sat, 27 Aug 2022 07:22:27 -0400
Subject: [PATCH 21/63] Create FUNDING.yml
---
.github/FUNDING.yml | 1 +
1 file changed, 1 insertion(+)
create mode 100644 .github/FUNDING.yml
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..d1cf5011
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [binwiederhier]
From 54f762558a51b1ce6f030eda7b2064db2e196877 Mon Sep 17 00:00:00 2001
From: "Philipp C. Heckel" <philipp.heckel@gmail.com>
Date: Sat, 27 Aug 2022 08:33:13 -0400
Subject: [PATCH 22/63] Delete FUNDING.yml
---
.github/FUNDING.yml | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 .github/FUNDING.yml
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index d1cf5011..00000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-github: [binwiederhier]
From 6935d83ab3ae6065cc44f736e22d0dfeeffc502f Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sun, 28 Aug 2022 21:51:56 -0400
Subject: [PATCH 23/63] Links
---
docs/integrations.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/docs/integrations.md b/docs/integrations.md
index 32395347..16536cf3 100644
--- a/docs/integrations.md
+++ b/docs/integrations.md
@@ -73,7 +73,9 @@ I've added a ⭐ to projects or posts that have a significant following, or had
## Blog + forum posts
-- [4 cool new projects to try in Copr](https://fedoramagazine.org/4-cool-new-projects-to-try-in-copr-for-august-2022/) - 8/2022
+- [Self hosted Mobile Push Notifications using NTFY | Thejesh GN](https://thejeshgn.com/2022/08/23/self-hosted-mobile-push-notifications-using-ntfy/) - 8/2022
+- [Fedora Magazine | 4 cool new projects to try in Copr](https://fedoramagazine.org/4-cool-new-projects-to-try-in-copr-for-august-2022/) - 8/2022
+- [Docker로 오픈소스 푸시알람 프로젝트 ntfy.sh 설치 및 사용하기.(Feat. Uptimekuma)](https://svrforum.com/svr/398979) - 8/2022
- [Easy notifications from R](https://sometimesir.com/posts/easy-notifications-from-r/) - 6/2022
- [ntfy is finally coming to iOS, and Matrix/UnifiedPush gateway support](https://www.reddit.com/r/selfhosted/comments/vdzvxi/ntfy_is_finally_coming_to_ios_with_full/) ⭐ - 6/2022
- [无需注册的通知服务ntfy](https://wbsu2003.4everland.app/2022/05/30/%E6%97%A0%E9%9C%80%E6%B3%A8%E5%86%8C%E7%9A%84%E9%80%9A%E7%9F%A5%E6%9C%8D%E5%8A%A1ntfy/) - 5/2022
From 925017f0405d3dcea8eda459c634a2e42aa84703 Mon Sep 17 00:00:00 2001
From: joephein <joeph@moravia.com>
Date: Wed, 31 Aug 2022 08:43:24 +0200
Subject: [PATCH 24/63] Added UptimeRobot example
---
docs/examples.md | 37 ++++++++++++++++++++++++++
docs/static/img/uptimerobot-setup.jpg | Bin 0 -> 55162 bytes
docs/static/img/uptimerobot-test.jpg | Bin 0 -> 27471 bytes
3 files changed, 37 insertions(+)
create mode 100644 docs/static/img/uptimerobot-setup.jpg
create mode 100644 docs/static/img/uptimerobot-test.jpg
diff --git a/docs/examples.md b/docs/examples.md
index cc52ebd5..beb18518 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -449,6 +449,43 @@ You can now test the notifications and apply them to monitors:
<a href="../static/img/uptimekuma-ios-up.jpg"><img src="../static/img/uptimekuma-ios-up.jpg"/></a>
</div>
+## UptimeRobot
+Go to your [UptimeRobot](https://github.com/uptimerobot) My Settings > Alert Contacts > Add Alert Contact
+Select **Alert Contact Type** = Webhook. Then set your desired **Friendly Name** (e.g. "ntfy-sh-UP"), **URL to Notify**, **POST value** and select checkbox **Send as JSON (application/json)**. Make sure to send the JSON POST request to ntfy.domain.com without the topic name in the url and include the "topic" name in the JSON body.
+
+<div id="uptimerobot-monitor-setup" class="screenshots">
+ <a href="../static/img/uptimerobot-setup.jpg"><img src="../static/img/uptimerobot-setup.jpg"/></a>
+</div>
+
+```
+{
+ "topic":"myTopic",
+ "title": "*monitorFriendlyName* *alertTypeFriendlyName*",
+ "message": "*alertDetails*",
+ "tags": ["green_circle"],
+ "priority": 3,
+ "click": https://uptimerobot.com/dashboard#*monitorID*
+}
+```
+You can create two Alert Contacts each with a different icon and priority, for example:
+
+```
+{
+ "topic":"myTopic",
+ "title": "*monitorFriendlyName* *alertTypeFriendlyName*",
+ "message": "*alertDetails*",
+ "tags": ["red_circle"],
+ "priority": 3,
+ "click": https://uptimerobot.com/dashboard#*monitorID*
+}
+```
+You can now add the Alerts Contact(s) to monitors and test the notifications:
+
+<div id="uptimerobot-monitor-screenshots" class="screenshots">
+ <a href="../static/img/uptimerobot-test.jpg"><img src="../static/img/uptimerobot-test.jpg"/></a>
+</div>
+
+
## Apprise
ntfy is integrated natively into [Apprise](https://github.com/caronc/apprise) (also check out the
[Apprise/ntfy wiki page](https://github.com/caronc/apprise/wiki/Notify_ntfy)).
diff --git a/docs/static/img/uptimerobot-setup.jpg b/docs/static/img/uptimerobot-setup.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..232d536609ea451fa2c5829bc7a1dc66ef624ace
GIT binary patch
literal 55162
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
literal 0
HcmV?d00001
diff --git a/docs/static/img/uptimerobot-test.jpg b/docs/static/img/uptimerobot-test.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d2fbfaecd05ad5cb4528689a2a3609c349c2a8c8
GIT binary patch
literal 27471
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
H{xSP+P&jlx
literal 0
HcmV?d00001
From 6db2908d693d369ea568fe02ca4dfabf5c117678 Mon Sep 17 00:00:00 2001
From: joephein <joeph@moravia.com>
Date: Wed, 31 Aug 2022 08:47:22 +0200
Subject: [PATCH 25/63] Fixed one more spelling issue in the new UptimeRobot
example
---
docs/examples.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/examples.md b/docs/examples.md
index beb18518..debe44de 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -479,7 +479,7 @@ You can create two Alert Contacts each with a different icon and priority, for e
"click": https://uptimerobot.com/dashboard#*monitorID*
}
```
-You can now add the Alerts Contact(s) to monitors and test the notifications:
+You can now add the Alerts Contact(s) to the monitors and test the notifications:
<div id="uptimerobot-monitor-screenshots" class="screenshots">
<a href="../static/img/uptimerobot-test.jpg"><img src="../static/img/uptimerobot-test.jpg"/></a>
From 5181acdd7c1f46875228fe09d75379917f495d50 Mon Sep 17 00:00:00 2001
From: joephein <joeph@moravia.com>
Date: Wed, 31 Aug 2022 08:48:42 +0200
Subject: [PATCH 26/63] Stylistic improvement
---
docs/examples.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/examples.md b/docs/examples.md
index debe44de..e8f5fa75 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -479,7 +479,7 @@ You can create two Alert Contacts each with a different icon and priority, for e
"click": https://uptimerobot.com/dashboard#*monitorID*
}
```
-You can now add the Alerts Contact(s) to the monitors and test the notifications:
+You can now add the created Alerts Contact(s) to the monitor(s) and test the notifications:
<div id="uptimerobot-monitor-screenshots" class="screenshots">
<a href="../static/img/uptimerobot-test.jpg"><img src="../static/img/uptimerobot-test.jpg"/></a>
From 62c8cafff996ad7e607bfc67f8bb8fc2028b6af8 Mon Sep 17 00:00:00 2001
From: Connor Lanigan <dev@connorlanigan.com>
Date: Wed, 31 Aug 2022 22:19:37 +0200
Subject: [PATCH 27/63] docs: Mismatched quotation mark
---
docs/publish.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/publish.md b/docs/publish.md
index b1bb09f8..10bc273f 100644
--- a/docs/publish.md
+++ b/docs/publish.md
@@ -1166,7 +1166,7 @@ Alternatively, the same actions can be defined as **JSON array**, if the notific
method: 'POST',
body: JSON.stringify({
topic: "myhome",
- message": "You left the house. Turn down the A/C?",
+ message: "You left the house. Turn down the A/C?",
actions: [
{
action: "view",
From e60e770419e568d19068d6a0f6c98b96972b93eb Mon Sep 17 00:00:00 2001
From: la-ninpre <leobrekalini@gmail.com>
Date: Wed, 31 Aug 2022 23:26:43 +0300
Subject: [PATCH 28/63] cmd: unify unix-specific code
---
cmd/publish_linux.go | 8 --------
cmd/{publish_darwin.go => publish_unix.go} | 2 ++
cmd/{subscribe_linux.go => subscribe_unix.go} | 2 ++
3 files changed, 4 insertions(+), 8 deletions(-)
delete mode 100644 cmd/publish_linux.go
rename cmd/{publish_darwin.go => publish_unix.go} (69%)
rename cmd/{subscribe_linux.go => subscribe_unix.go} (89%)
diff --git a/cmd/publish_linux.go b/cmd/publish_linux.go
deleted file mode 100644
index 2ff32cc6..00000000
--- a/cmd/publish_linux.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package cmd
-
-import "syscall"
-
-func processExists(pid int) bool {
- err := syscall.Kill(pid, syscall.Signal(0))
- return err == nil
-}
diff --git a/cmd/publish_darwin.go b/cmd/publish_unix.go
similarity index 69%
rename from cmd/publish_darwin.go
rename to cmd/publish_unix.go
index 2ff32cc6..67bf2168 100644
--- a/cmd/publish_darwin.go
+++ b/cmd/publish_unix.go
@@ -1,3 +1,5 @@
+// +build darwin linux dragonfly freebsd netbsd openbsd
+
package cmd
import "syscall"
diff --git a/cmd/subscribe_linux.go b/cmd/subscribe_unix.go
similarity index 89%
rename from cmd/subscribe_linux.go
rename to cmd/subscribe_unix.go
index 346606bd..7c02a944 100644
--- a/cmd/subscribe_linux.go
+++ b/cmd/subscribe_unix.go
@@ -1,3 +1,5 @@
+// +build linux dragonfly freebsd netbsd openbsd
+
package cmd
const (
From 2fb93b1eb72afa93e24b1016aec2feb050709826 Mon Sep 17 00:00:00 2001
From: la-ninpre <leobrekalini@gmail.com>
Date: Thu, 1 Sep 2022 00:49:08 +0300
Subject: [PATCH 29/63] cmd: add go1.18 build directives
---
cmd/publish_unix.go | 1 +
cmd/subscribe_unix.go | 1 +
2 files changed, 2 insertions(+)
diff --git a/cmd/publish_unix.go b/cmd/publish_unix.go
index 67bf2168..3ce22ffc 100644
--- a/cmd/publish_unix.go
+++ b/cmd/publish_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || linux || dragonfly || freebsd || netbsd || openbsd
// +build darwin linux dragonfly freebsd netbsd openbsd
package cmd
diff --git a/cmd/subscribe_unix.go b/cmd/subscribe_unix.go
index 7c02a944..6e5128dc 100644
--- a/cmd/subscribe_unix.go
+++ b/cmd/subscribe_unix.go
@@ -1,3 +1,4 @@
+//go:build linux || dragonfly || freebsd || netbsd || openbsd
// +build linux dragonfly freebsd netbsd openbsd
package cmd
From 4ea1e233610e78a6ad6b7af6bef1f2dce9b673f5 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sat, 3 Sep 2022 15:34:34 -0400
Subject: [PATCH 30/63] Docker install docs
---
docs/install.md | 5 +++++
docs/releases.md | 3 +++
2 files changed, 8 insertions(+)
diff --git a/docs/install.md b/docs/install.md
index 4a2bc7ac..efbd2fb2 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -228,6 +228,11 @@ The server exposes its web UI and the API on port 80, so you need to expose that
[message cache](config.md#message-cache), you also need to map a volume to `/var/cache/ntfy`. To change other settings,
you should map `/etc/ntfy`, so you can edit `/etc/ntfy/server.yml`.
+!!! info
+ Note that the Docker image **does not contain a `/etc/ntfy/server.yml` file**. If you'd like to use a config file,
+ please manually create one outside the image and map it as a volume, e.g. via `-v /etc/ntfy:/etc/ntfy`. You may
+ use the [`server.yml` file on GitHub](https://github.com/binwiederhier/ntfy/blob/main/server/server.yml) as a template.
+
Basic usage (no cache or additional config):
```
docker run -p 80:80 -it binwiederhier/ntfy serve
diff --git a/docs/releases.md b/docs/releases.md
index 7dd24fc5..c52a9d6f 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -42,10 +42,13 @@ Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up s
* `ntfy user` commands don't work with `auth_file` but works with `auth-file` ([#344](https://github.com/binwiederhier/ntfy/issues/344), thanks to [@Histalek](https://github.com/Histalek) for reporting)
* Ignore new draft HTTP `Priority` header ([#351](https://github.com/binwiederhier/ntfy/issues/351), thanks to [@ksurl](https://github.com/ksurl) for reporting)
* Delete expired attachments based on mod time instead of DB entry to avoid races (no ticket)
+* Better logging for Matrix push key errors ([#384](https://github.com/binwiederhier/ntfy/pull/384), thanks to [@christophehenry](https://github.com/christophehenry))
**Documentation:**
* Fix some PowerShell publish docs ([#345](https://github.com/binwiederhier/ntfy/pull/345), thanks to [@noahpeltier](https://github.com/noahpeltier))
+* Clarified Docker install instructions ([#361](https://github.com/binwiederhier/ntfy/issues/361), thanks to [@barart](https://github.com/barart) for reporting)
+* Mismatched quotation marks ([#392](https://github.com/binwiederhier/ntfy/pull/392)], thanks to [@connorlanigan](https://github.com/connorlanigan))
-->
From 601f01bc49b85e190c49ac656b9571153cf0bc55 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sat, 3 Sep 2022 16:01:28 -0400
Subject: [PATCH 31/63] UptimeRobot docs, release notes
---
docs/examples.md | 4 ++--
docs/integrations.md | 3 +++
docs/releases.md | 9 +++++----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/docs/examples.md b/docs/examples.md
index e8f5fa75..3f58d943 100644
--- a/docs/examples.md
+++ b/docs/examples.md
@@ -457,7 +457,7 @@ Select **Alert Contact Type** = Webhook. Then set your desired **Friendly Name**
<a href="../static/img/uptimerobot-setup.jpg"><img src="../static/img/uptimerobot-setup.jpg"/></a>
</div>
-```
+``` json
{
"topic":"myTopic",
"title": "*monitorFriendlyName* *alertTypeFriendlyName*",
@@ -469,7 +469,7 @@ Select **Alert Contact Type** = Webhook. Then set your desired **Friendly Name**
```
You can create two Alert Contacts each with a different icon and priority, for example:
-```
+``` json
{
"topic":"myTopic",
"title": "*monitorFriendlyName* *alertTypeFriendlyName*",
diff --git a/docs/integrations.md b/docs/integrations.md
index 16536cf3..2bbff53f 100644
--- a/docs/integrations.md
+++ b/docs/integrations.md
@@ -12,6 +12,9 @@ I've added a ⭐ to projects or posts that have a significant following, or had
| [ntfy.tedomum.net](https://ntfy.tedomum.net/) | 🇫🇷 🇪🇺 |
| [ntfy.jae.fi](https://ntfy.jae.fi/) | 🇫🇮 🇪🇺 |
+Thanks to everyone running a public server. **You guys rock!** To the users: Be aware that server operators can log your
+messages until I finally finish implementing end-to-end encryption.
+
## Official integrations
- [Apprise](https://github.com/caronc/apprise/wiki/Notify_ntfy) ⭐ - Push Notifications that work with just about every platform
diff --git a/docs/releases.md b/docs/releases.md
index c52a9d6f..5b64ab3d 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -28,6 +28,7 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up some Android tickets, and fixing them! You rock!
+-->
## ntfy server v1.28.0 (UNRELEASED)
@@ -41,17 +42,17 @@ Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up s
* `ntfy user` commands don't work with `auth_file` but works with `auth-file` ([#344](https://github.com/binwiederhier/ntfy/issues/344), thanks to [@Histalek](https://github.com/Histalek) for reporting)
* Ignore new draft HTTP `Priority` header ([#351](https://github.com/binwiederhier/ntfy/issues/351), thanks to [@ksurl](https://github.com/ksurl) for reporting)
-* Delete expired attachments based on mod time instead of DB entry to avoid races (no ticket)
+* Delete expired attachments based on mod time instead of DB entry to avoid races (no ticket)
* Better logging for Matrix push key errors ([#384](https://github.com/binwiederhier/ntfy/pull/384), thanks to [@christophehenry](https://github.com/christophehenry))
**Documentation:**
+* Added [integrations + projects page](https://ntfy.sh/docs/integrations/) (**so many integrations, whoa!**)
+* Added example for [UptimeRobot](https://ntfy.sh/docs/examples/#uptimerobot)
* Fix some PowerShell publish docs ([#345](https://github.com/binwiederhier/ntfy/pull/345), thanks to [@noahpeltier](https://github.com/noahpeltier))
-* Clarified Docker install instructions ([#361](https://github.com/binwiederhier/ntfy/issues/361), thanks to [@barart](https://github.com/barart) for reporting)
+* Clarified Docker install instructions ([#361](https://github.com/binwiederhier/ntfy/issues/361), thanks to [@barart](https://github.com/barart) for reporting)
* Mismatched quotation marks ([#392](https://github.com/binwiederhier/ntfy/pull/392)], thanks to [@connorlanigan](https://github.com/connorlanigan))
--->
-
## ntfy server v1.27.2
Released June 23, 2022
From 58e782b47503f4d87c0716853db2b7f2091b5a18 Mon Sep 17 00:00:00 2001
From: "Philipp C. Heckel" <philipp.heckel@gmail.com>
Date: Mon, 5 Sep 2022 14:29:38 -0400
Subject: [PATCH 32/63] Create FUNDING.yml
---
.github/FUNDING.yml | 1 +
1 file changed, 1 insertion(+)
create mode 100644 .github/FUNDING.yml
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..d1cf5011
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: [binwiederhier]
From cee46044cde5c5e385b5044c13cfa5b74f018782 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Mon, 5 Sep 2022 15:05:44 -0400
Subject: [PATCH 33/63] Donation FAQ
---
README.md | 10 ++++++++--
docs/faq.md | 8 +++-----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index 2590759c..ee043a42 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,9 @@
---
-## 👶 Baby break!
-(8/2022) Hey folks, my daughter is about to be born, so I'll be taking some time off from working on ntfy. I'll likely return to working on features and bugs in a few weeks. I hope you understand. I may post some pictures in [#387](https://github.com/binwiederhier/ntfy/issues/387) 🥰
+## 👶 Baby break - My baby girl was born!
+Hey folks, my daughter was born on 8/30/22, so I'll be taking some time off from working on ntfy. I'll likely return
+to working on features and bugs in a few weeks. I hope you understand. I posted some pictures in [#387](https://github.com/binwiederhier/ntfy/issues/387) 🥰
---
@@ -60,6 +61,11 @@ Or, if you'd like to help translate 🇩🇪 🇺🇸 🇧🇬, you can start im
<img src="https://hosted.weblate.org/widgets/ntfy/-/multi-blue.svg" alt="Translation status" />
</a>
+## Donations
+I have just very recently started accepting donations via [GitHub Sponsors](https://github.com/sponsors/binwiederhier).
+I would be humbled if you helped me carry the server and developer account costs. Even small donations are very much
+appreciated.
+
## License
Made with ❤️ by [Philipp C. Heckel](https://heckel.io).
The project is dual licensed under the [Apache License 2.0](LICENSE) and the [GPLv2 License](LICENSE.GPLv2).
diff --git a/docs/faq.md b/docs/faq.md
index cc3e59c0..a9e5d165 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -44,8 +44,6 @@ server and listens for incoming notifications. This consumes additional battery
but delivers notifications instantly.
## Where can I donate?
-Many people have asked (thanks for that!), but I am currently not accepting any donations. The cost is manageable
-($25/month for hosting, and $99/year for the Apple cert) right now, and I don't want to have to feel obligated to
-anyone by accepting their money.
-
-I may ask for donations in the future, though. After all, $400 per year isn't nothing...
+I have just very recently started accepting donations via [GitHub Sponsors](https://github.com/sponsors/binwiederhier).
+I would be humbled if you helped me carry the server and developer account costs. Even small donations are very much
+appreciated.
From f54dce4c3f867ae81ff920be27e28827833773e8 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Mon, 5 Sep 2022 15:12:04 -0400
Subject: [PATCH 34/63] Bump versions
---
go.mod | 20 +-
go.sum | 20 +
web/package-lock.json | 1434 +++++++++++++++++++++--------------------
3 files changed, 778 insertions(+), 696 deletions(-)
diff --git a/go.mod b/go.mod
index 58c4131f..ed311def 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.17
require (
cloud.google.com/go/firestore v1.6.1 // indirect
- cloud.google.com/go/storage v1.25.0 // indirect
+ cloud.google.com/go/storage v1.26.0 // indirect
github.com/BurntSushi/toml v1.2.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/emersion/go-smtp v0.15.0
@@ -13,13 +13,13 @@ require (
github.com/mattn/go-sqlite3 v1.14.15
github.com/olebedev/when v0.0.0-20211212231525-59bd4edcf9d6
github.com/stretchr/testify v1.7.0
- github.com/urfave/cli/v2 v2.11.2
- golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8
- golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7 // indirect
+ github.com/urfave/cli/v2 v2.14.1
+ golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
+ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9
- google.golang.org/api v0.93.0
+ google.golang.org/api v0.94.0
gopkg.in/yaml.v2 v2.4.0
)
@@ -28,7 +28,7 @@ require github.com/pkg/errors v0.9.1 // indirect
require firebase.google.com/go/v4 v4.8.0
require (
- cloud.google.com/go v0.103.0 // indirect
+ cloud.google.com/go v0.104.0 // indirect
cloud.google.com/go/compute v1.9.0 // indirect
cloud.google.com/go/iam v0.3.0 // indirect
github.com/AlekSi/pointer v1.2.0 // indirect
@@ -45,14 +45,14 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.opencensus.io v0.23.0 // indirect
- golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect
- golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 // indirect
+ golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
+ golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/appengine/v2 v2.0.2 // indirect
- google.golang.org/genproto v0.0.0-20220819174105-e9f053255caa // indirect
- google.golang.org/grpc v1.48.0 // indirect
+ google.golang.org/genproto v0.0.0-20220902135211-223410557253 // indirect
+ google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
diff --git a/go.sum b/go.sum
index bff5b995..ecf341c4 100644
--- a/go.sum
+++ b/go.sum
@@ -33,6 +33,8 @@ cloud.google.com/go v0.102.1 h1:vpK6iQWv/2uUeFJth4/cBHsQAGjn1iIE6AAlxipRaA0=
cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU=
cloud.google.com/go v0.103.0 h1:YXtxp9ymmZjlGzxV7VrYQ8aaQuAgcqxSy6YhDX4I458=
cloud.google.com/go v0.103.0/go.mod h1:vwLx1nqLrzLX/fpwSMOXmFIqBOyHsvHbnAdbGSJ+mKk=
+cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
+cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
@@ -73,6 +75,8 @@ cloud.google.com/go/storage v1.23.0 h1:wWRIaDURQA8xxHguFCshYepGlrWIrbBnAmc7wfg07
cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc=
cloud.google.com/go/storage v1.25.0 h1:D2Dn0PslpK7Z3B2AvuUHyIC762bDbGJdlmQlCBR71os=
cloud.google.com/go/storage v1.25.0/go.mod h1:Qys4JU+jeup3QnuKKAosWuxrD95C4MSqxfVDnSirDsI=
+cloud.google.com/go/storage v1.26.0 h1:lYAGjknyDJirSzfwUlkv4Nsnj7od7foxQNH/fqZqles=
+cloud.google.com/go/storage v1.26.0/go.mod h1:mk/N7YwIKEWyTvXAWQCIeiCTdLoRH6Pd5xmSnolQLTI=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
firebase.google.com/go/v4 v4.8.0 h1:ooJqjFEh1G6DQ5+wyb/RAXAgku0E2RzJeH6WauSpWSo=
firebase.google.com/go/v4 v4.8.0/go.mod h1:y+j6xX7BgBco/XaN+YExIBVm6pzvYutheDV3nprvbWc=
@@ -264,6 +268,8 @@ github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
github.com/urfave/cli/v2 v2.11.2 h1:FVfNg4m3vbjbBpLYxW//WjxUoHvJ9TlppXcqY9Q9ZfA=
github.com/urfave/cli/v2 v2.11.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
+github.com/urfave/cli/v2 v2.14.1 h1:0Sx+C9404t2+DPuIJ3UpZFOEFhNG3wPxMj7uZHyZKFA=
+github.com/urfave/cli/v2 v2.14.1/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -289,6 +295,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c=
golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -374,6 +382,8 @@ golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b h1:ZmngSVLe/wycRns9MKikG9OWIEjGcGAkacif7oYQaUY=
+golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -399,6 +409,8 @@ golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 h1:+jnHzr9VPj32ykQVai5DNa
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7 h1:dtndE8FcEta75/4kHF3AbpuWzV6f1LjnLrM4pe2SZrw=
golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 h1:2o1E+E8TpNLklK9nHiPiK1uzIYrIHt+cQx3ynCwq9V8=
+golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -485,6 +497,8 @@ golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6
golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 h1:Sx/u41w+OwrInGdEckYmEuU5gHoGSL4QbDz3S9s6j4U=
golang.org/x/sys v0.0.0-20220818161305-2296e01440c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
+golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM=
@@ -616,6 +630,8 @@ google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6F
google.golang.org/api v0.86.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
google.golang.org/api v0.93.0 h1:T2xt9gi0gHdxdnRkVQhT8mIvPaXKNsDNWz+L696M66M=
google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
+google.golang.org/api v0.94.0 h1:KtKM9ru3nzQioV1HLlUf1cR7vMYJIpgls5VhAYQXIwA=
+google.golang.org/api v0.94.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -723,6 +739,8 @@ google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1 h1:C2UVWqrgLYKrT5n
google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
google.golang.org/genproto v0.0.0-20220819174105-e9f053255caa h1:Ux9yJCyf598uEniFPSyp8g1jtGTt77m+lzYyVgrWQaQ=
google.golang.org/genproto v0.0.0-20220819174105-e9f053255caa/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220902135211-223410557253 h1:vXJMM8Shg7TGaYxZsQ++A/FOSlbDmDtWhS/o+3w/hj4=
+google.golang.org/genproto v0.0.0-20220902135211-223410557253/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -757,6 +775,8 @@ google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w=
google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw=
+google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
diff --git a/web/package-lock.json b/web/package-lock.json
index e3d57cd5..99542c21 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -52,28 +52,28 @@
}
},
"node_modules/@babel/compat-data": {
- "version": "7.18.8",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz",
- "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.0.tgz",
+ "integrity": "sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/core": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz",
- "integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.0.tgz",
+ "integrity": "sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ==",
"dependencies": {
"@ampproject/remapping": "^2.1.0",
"@babel/code-frame": "^7.18.6",
- "@babel/generator": "^7.18.10",
- "@babel/helper-compilation-targets": "^7.18.9",
- "@babel/helper-module-transforms": "^7.18.9",
- "@babel/helpers": "^7.18.9",
- "@babel/parser": "^7.18.10",
+ "@babel/generator": "^7.19.0",
+ "@babel/helper-compilation-targets": "^7.19.0",
+ "@babel/helper-module-transforms": "^7.19.0",
+ "@babel/helpers": "^7.19.0",
+ "@babel/parser": "^7.19.0",
"@babel/template": "^7.18.10",
- "@babel/traverse": "^7.18.10",
- "@babel/types": "^7.18.10",
+ "@babel/traverse": "^7.19.0",
+ "@babel/types": "^7.19.0",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -134,11 +134,11 @@
}
},
"node_modules/@babel/generator": {
- "version": "7.18.12",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz",
- "integrity": "sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+ "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
"dependencies": {
- "@babel/types": "^7.18.10",
+ "@babel/types": "^7.19.0",
"@jridgewell/gen-mapping": "^0.3.2",
"jsesc": "^2.5.1"
},
@@ -183,11 +183,11 @@
}
},
"node_modules/@babel/helper-compilation-targets": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz",
- "integrity": "sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz",
+ "integrity": "sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA==",
"dependencies": {
- "@babel/compat-data": "^7.18.8",
+ "@babel/compat-data": "^7.19.0",
"@babel/helper-validator-option": "^7.18.6",
"browserslist": "^4.20.2",
"semver": "^6.3.0"
@@ -200,13 +200,13 @@
}
},
"node_modules/@babel/helper-create-class-features-plugin": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz",
- "integrity": "sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
+ "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.18.6",
"@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-function-name": "^7.19.0",
"@babel/helper-member-expression-to-functions": "^7.18.9",
"@babel/helper-optimise-call-expression": "^7.18.6",
"@babel/helper-replace-supers": "^7.18.9",
@@ -220,9 +220,9 @@
}
},
"node_modules/@babel/helper-create-regexp-features-plugin": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz",
- "integrity": "sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
+ "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.18.6",
"regexpu-core": "^5.1.0"
@@ -270,12 +270,12 @@
}
},
"node_modules/@babel/helper-function-name": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz",
- "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+ "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
"dependencies": {
- "@babel/template": "^7.18.6",
- "@babel/types": "^7.18.9"
+ "@babel/template": "^7.18.10",
+ "@babel/types": "^7.19.0"
},
"engines": {
"node": ">=6.9.0"
@@ -315,18 +315,18 @@
}
},
"node_modules/@babel/helper-module-transforms": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz",
- "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
+ "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
"dependencies": {
"@babel/helper-environment-visitor": "^7.18.9",
"@babel/helper-module-imports": "^7.18.6",
"@babel/helper-simple-access": "^7.18.6",
"@babel/helper-split-export-declaration": "^7.18.6",
"@babel/helper-validator-identifier": "^7.18.6",
- "@babel/template": "^7.18.6",
- "@babel/traverse": "^7.18.9",
- "@babel/types": "^7.18.9"
+ "@babel/template": "^7.18.10",
+ "@babel/traverse": "^7.19.0",
+ "@babel/types": "^7.19.0"
},
"engines": {
"node": ">=6.9.0"
@@ -344,9 +344,9 @@
}
},
"node_modules/@babel/helper-plugin-utils": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz",
- "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
+ "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==",
"engines": {
"node": ">=6.9.0"
}
@@ -441,27 +441,27 @@
}
},
"node_modules/@babel/helper-wrap-function": {
- "version": "7.18.11",
- "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz",
- "integrity": "sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
+ "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
"dependencies": {
- "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-function-name": "^7.19.0",
"@babel/template": "^7.18.10",
- "@babel/traverse": "^7.18.11",
- "@babel/types": "^7.18.10"
+ "@babel/traverse": "^7.19.0",
+ "@babel/types": "^7.19.0"
},
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helpers": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz",
- "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
+ "integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
"dependencies": {
- "@babel/template": "^7.18.6",
- "@babel/traverse": "^7.18.9",
- "@babel/types": "^7.18.9"
+ "@babel/template": "^7.18.10",
+ "@babel/traverse": "^7.19.0",
+ "@babel/types": "^7.19.0"
},
"engines": {
"node": ">=6.9.0"
@@ -481,9 +481,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.18.11",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz",
- "integrity": "sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz",
+ "integrity": "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw==",
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -522,12 +522,12 @@
}
},
"node_modules/@babel/plugin-proposal-async-generator-functions": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz",
- "integrity": "sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.0.tgz",
+ "integrity": "sha512-nhEByMUTx3uZueJ/QkJuSlCfN4FGg+xy+vRsfGQGzSauq5ks2Deid2+05Q3KhfaUjvec1IGhw/Zm3cFm8JigTQ==",
"dependencies": {
"@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-remap-async-to-generator": "^7.18.9",
"@babel/plugin-syntax-async-generators": "^7.8.4"
},
@@ -570,15 +570,15 @@
}
},
"node_modules/@babel/plugin-proposal-decorators": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.10.tgz",
- "integrity": "sha512-wdGTwWF5QtpTY/gbBtQLAiCnoxfD4qMbN87NYZle1dOZ9Os8Y6zXcKrIaOU8W+TIvFUWVGG9tUgNww3CjXRVVw==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.0.tgz",
+ "integrity": "sha512-Bo5nOSjiJccjv00+BrDkmfeBLBi2B0qe8ygj24KdL8VdwtZz+710NCwehF+x/Ng+0mkHx5za2eAofmvVFLF4Fg==",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.18.9",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-create-class-features-plugin": "^7.19.0",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-replace-supers": "^7.18.9",
"@babel/helper-split-export-declaration": "^7.18.6",
- "@babel/plugin-syntax-decorators": "^7.18.6"
+ "@babel/plugin-syntax-decorators": "^7.19.0"
},
"engines": {
"node": ">=6.9.0"
@@ -821,11 +821,11 @@
}
},
"node_modules/@babel/plugin-syntax-decorators": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz",
- "integrity": "sha512-fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz",
+ "integrity": "sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.18.6"
+ "@babel/helper-plugin-utils": "^7.19.0"
},
"engines": {
"node": ">=6.9.0"
@@ -1087,15 +1087,16 @@
}
},
"node_modules/@babel/plugin-transform-classes": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz",
- "integrity": "sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
+ "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-compilation-targets": "^7.19.0",
"@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-function-name": "^7.19.0",
"@babel/helper-optimise-call-expression": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-replace-supers": "^7.18.9",
"@babel/helper-split-export-declaration": "^7.18.6",
"globals": "^11.1.0"
@@ -1122,9 +1123,9 @@
}
},
"node_modules/@babel/plugin-transform-destructuring": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz",
- "integrity": "sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==",
+ "version": "7.18.13",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz",
+ "integrity": "sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==",
"dependencies": {
"@babel/helper-plugin-utils": "^7.18.9"
},
@@ -1180,11 +1181,11 @@
}
},
"node_modules/@babel/plugin-transform-flow-strip-types": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.18.9.tgz",
- "integrity": "sha512-+G6rp2zRuOAInY5wcggsx4+QVao1qPM0osC9fTUVlAV3zOrzTCnrMAFVnR6+a3T8wz1wFIH7KhYMcMB3u1n80A==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz",
+ "integrity": "sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/plugin-syntax-flow": "^7.18.6"
},
"engines": {
@@ -1286,13 +1287,13 @@
}
},
"node_modules/@babel/plugin-transform-modules-systemjs": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz",
- "integrity": "sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz",
+ "integrity": "sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==",
"dependencies": {
"@babel/helper-hoist-variables": "^7.18.6",
- "@babel/helper-module-transforms": "^7.18.9",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-module-transforms": "^7.19.0",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-validator-identifier": "^7.18.6",
"babel-plugin-dynamic-import-node": "^2.3.3"
},
@@ -1319,12 +1320,12 @@
}
},
"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz",
- "integrity": "sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.0.tgz",
+ "integrity": "sha512-HDSuqOQzkU//kfGdiHBt71/hkDTApw4U/cMVgKgX7PqfB3LOaK+2GtCEsBu1dL9CkswDm0Gwehht1dCr421ULQ==",
"dependencies": {
- "@babel/helper-create-regexp-features-plugin": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.6"
+ "@babel/helper-create-regexp-features-plugin": "^7.19.0",
+ "@babel/helper-plugin-utils": "^7.19.0"
},
"engines": {
"node": ">=6.9.0"
@@ -1419,15 +1420,15 @@
}
},
"node_modules/@babel/plugin-transform-react-jsx": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.10.tgz",
- "integrity": "sha512-gCy7Iikrpu3IZjYZolFE4M1Sm+nrh1/6za2Ewj77Z+XirT4TsbJcvOFOyF+fRPwU6AKKK136CZxx6L8AbSFG6A==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz",
+ "integrity": "sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==",
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.18.6",
"@babel/helper-module-imports": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/plugin-syntax-jsx": "^7.18.6",
- "@babel/types": "^7.18.10"
+ "@babel/types": "^7.19.0"
},
"engines": {
"node": ">=6.9.0"
@@ -1528,11 +1529,11 @@
}
},
"node_modules/@babel/plugin-transform-spread": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz",
- "integrity": "sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
+ "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
"dependencies": {
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
},
"engines": {
@@ -1585,12 +1586,12 @@
}
},
"node_modules/@babel/plugin-transform-typescript": {
- "version": "7.18.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.12.tgz",
- "integrity": "sha512-2vjjam0cum0miPkenUbQswKowuxs/NjMwIKEq0zwegRxXk12C9YOF9STXnaUptITOtOJHKHpzvvWYOjbm6tc0w==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.0.tgz",
+ "integrity": "sha512-DOOIywxPpkQHXijXv+s9MDAyZcLp12oYRl3CMWZ6u7TjSoCBq/KqHR/nNFR3+i2xqheZxoF0H2XyL7B6xeSRuA==",
"dependencies": {
- "@babel/helper-create-class-features-plugin": "^7.18.9",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-create-class-features-plugin": "^7.19.0",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/plugin-syntax-typescript": "^7.18.6"
},
"engines": {
@@ -1630,17 +1631,17 @@
}
},
"node_modules/@babel/preset-env": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz",
- "integrity": "sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.0.tgz",
+ "integrity": "sha512-1YUju1TAFuzjIQqNM9WsF4U6VbD/8t3wEAlw3LFYuuEr+ywqLRcSXxFKz4DCEj+sN94l/XTDiUXYRrsvMpz9WQ==",
"dependencies": {
- "@babel/compat-data": "^7.18.8",
- "@babel/helper-compilation-targets": "^7.18.9",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/compat-data": "^7.19.0",
+ "@babel/helper-compilation-targets": "^7.19.0",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-validator-option": "^7.18.6",
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
- "@babel/plugin-proposal-async-generator-functions": "^7.18.10",
+ "@babel/plugin-proposal-async-generator-functions": "^7.19.0",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-class-static-block": "^7.18.6",
"@babel/plugin-proposal-dynamic-import": "^7.18.6",
@@ -1674,9 +1675,9 @@
"@babel/plugin-transform-async-to-generator": "^7.18.6",
"@babel/plugin-transform-block-scoped-functions": "^7.18.6",
"@babel/plugin-transform-block-scoping": "^7.18.9",
- "@babel/plugin-transform-classes": "^7.18.9",
+ "@babel/plugin-transform-classes": "^7.19.0",
"@babel/plugin-transform-computed-properties": "^7.18.9",
- "@babel/plugin-transform-destructuring": "^7.18.9",
+ "@babel/plugin-transform-destructuring": "^7.18.13",
"@babel/plugin-transform-dotall-regex": "^7.18.6",
"@babel/plugin-transform-duplicate-keys": "^7.18.9",
"@babel/plugin-transform-exponentiation-operator": "^7.18.6",
@@ -1686,9 +1687,9 @@
"@babel/plugin-transform-member-expression-literals": "^7.18.6",
"@babel/plugin-transform-modules-amd": "^7.18.6",
"@babel/plugin-transform-modules-commonjs": "^7.18.6",
- "@babel/plugin-transform-modules-systemjs": "^7.18.9",
+ "@babel/plugin-transform-modules-systemjs": "^7.19.0",
"@babel/plugin-transform-modules-umd": "^7.18.6",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.18.6",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.0",
"@babel/plugin-transform-new-target": "^7.18.6",
"@babel/plugin-transform-object-super": "^7.18.6",
"@babel/plugin-transform-parameters": "^7.18.8",
@@ -1696,14 +1697,14 @@
"@babel/plugin-transform-regenerator": "^7.18.6",
"@babel/plugin-transform-reserved-words": "^7.18.6",
"@babel/plugin-transform-shorthand-properties": "^7.18.6",
- "@babel/plugin-transform-spread": "^7.18.9",
+ "@babel/plugin-transform-spread": "^7.19.0",
"@babel/plugin-transform-sticky-regex": "^7.18.6",
"@babel/plugin-transform-template-literals": "^7.18.9",
"@babel/plugin-transform-typeof-symbol": "^7.18.9",
"@babel/plugin-transform-unicode-escapes": "^7.18.10",
"@babel/plugin-transform-unicode-regex": "^7.18.6",
"@babel/preset-modules": "^0.1.5",
- "@babel/types": "^7.18.10",
+ "@babel/types": "^7.19.0",
"babel-plugin-polyfill-corejs2": "^0.3.2",
"babel-plugin-polyfill-corejs3": "^0.5.3",
"babel-plugin-polyfill-regenerator": "^0.4.0",
@@ -1768,9 +1769,9 @@
}
},
"node_modules/@babel/runtime": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
- "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
+ "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
"dependencies": {
"regenerator-runtime": "^0.13.4"
},
@@ -1779,9 +1780,9 @@
}
},
"node_modules/@babel/runtime-corejs3": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.9.tgz",
- "integrity": "sha512-qZEWeccZCrHA2Au4/X05QW5CMdm4VjUDCrGq5gf1ZDcM4hRqreKrtwAn7yci9zfgAS9apvnsFXiGBHBAxZdK9A==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.19.0.tgz",
+ "integrity": "sha512-JyXXoCu1N8GLuKc2ii8y5RGma5FMpFeO2nAQIe0Yzrbq+rQnN+sFj47auLblR5ka6aHNGPDgv8G/iI2Grb0ldQ==",
"dependencies": {
"core-js-pure": "^3.20.2",
"regenerator-runtime": "^0.13.4"
@@ -1804,18 +1805,18 @@
}
},
"node_modules/@babel/traverse": {
- "version": "7.18.11",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz",
- "integrity": "sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.0.tgz",
+ "integrity": "sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA==",
"dependencies": {
"@babel/code-frame": "^7.18.6",
- "@babel/generator": "^7.18.10",
+ "@babel/generator": "^7.19.0",
"@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-function-name": "^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.18.11",
- "@babel/types": "^7.18.10",
+ "@babel/parser": "^7.19.0",
+ "@babel/types": "^7.19.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
},
@@ -1824,9 +1825,9 @@
}
},
"node_modules/@babel/types": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
- "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+ "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
"dependencies": {
"@babel/helper-string-parser": "^7.18.10",
"@babel/helper-validator-identifier": "^7.18.6",
@@ -2113,9 +2114,9 @@
}
},
"node_modules/@emotion/babel-plugin": {
- "version": "11.10.0",
- "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.0.tgz",
- "integrity": "sha512-xVnpDAAbtxL1dsuSelU5A7BnY/lftws0wUexNJZTPsvX/1tM4GZJbclgODhvW4E+NH7E5VFcH0bBn30NvniPJA==",
+ "version": "11.10.2",
+ "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.2.tgz",
+ "integrity": "sha512-xNQ57njWTFVfPAc3cjfuaPdsgLp5QOSuRsj9MA6ndEhH/AzuZM86qIQzt6rq+aGBwj3n5/TkLmU5lhAfdRmogA==",
"dependencies": {
"@babel/helper-module-imports": "^7.16.7",
"@babel/plugin-syntax-jsx": "^7.17.12",
@@ -2135,9 +2136,9 @@
}
},
"node_modules/@emotion/cache": {
- "version": "11.10.1",
- "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.1.tgz",
- "integrity": "sha512-uZTj3Yz5D69GE25iFZcIQtibnVCFsc/6+XIozyL3ycgWvEdif2uEw9wlUt6umjLr4Keg9K6xRPHmD8LGi+6p1A==",
+ "version": "11.10.3",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.3.tgz",
+ "integrity": "sha512-Psmp/7ovAa8appWh3g51goxu/z3iVms7JXOreq136D8Bbn6dYraPnmL6mdM8GThEx9vwSn92Fz+mGSjBzN8UPQ==",
"dependencies": {
"@emotion/memoize": "^0.8.0",
"@emotion/sheet": "^1.2.0",
@@ -2165,14 +2166,15 @@
"integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="
},
"node_modules/@emotion/react": {
- "version": "11.10.0",
- "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.0.tgz",
- "integrity": "sha512-K6z9zlHxxBXwN8TcpwBKcEsBsOw4JWCCmR+BeeOWgqp8GIU1yA2Odd41bwdAAr0ssbQrbJbVnndvv7oiv1bZeQ==",
+ "version": "11.10.4",
+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.4.tgz",
+ "integrity": "sha512-j0AkMpr6BL8gldJZ6XQsQ8DnS9TxEQu1R+OGmDZiWjBAJtCcbt0tS3I/YffoqHXxH6MjgI7KdMbYKw3MEiU9eA==",
"dependencies": {
"@babel/runtime": "^7.18.3",
"@emotion/babel-plugin": "^11.10.0",
"@emotion/cache": "^11.10.0",
"@emotion/serialize": "^1.1.0",
+ "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
"@emotion/utils": "^1.2.0",
"@emotion/weak-memoize": "^0.3.0",
"hoist-non-react-statics": "^3.3.1"
@@ -2208,14 +2210,15 @@
"integrity": "sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w=="
},
"node_modules/@emotion/styled": {
- "version": "11.10.0",
- "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.0.tgz",
- "integrity": "sha512-V9oaEH6V4KePeQpgUE83i8ht+4Ri3E8Djp/ZPJ4DQlqWhSKITvgzlR3/YQE2hdfP4Jw3qVRkANJz01LLqK9/TA==",
+ "version": "11.10.4",
+ "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.4.tgz",
+ "integrity": "sha512-pRl4R8Ez3UXvOPfc2bzIoV8u9P97UedgHS4FPX594ntwEuAMA114wlaHvOK24HB48uqfXiGlYIZYCxVJ1R1ttQ==",
"dependencies": {
"@babel/runtime": "^7.18.3",
"@emotion/babel-plugin": "^11.10.0",
"@emotion/is-prop-valid": "^1.2.0",
"@emotion/serialize": "^1.1.0",
+ "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
"@emotion/utils": "^1.2.0"
},
"peerDependencies": {
@@ -2237,6 +2240,14 @@
"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz",
"integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw=="
},
+ "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz",
+ "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==",
+ "peerDependencies": {
+ "react": ">=16.8.0"
+ }
+ },
"node_modules/@emotion/utils": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz",
@@ -2248,13 +2259,13 @@
"integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="
},
"node_modules/@eslint/eslintrc": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
- "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz",
+ "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==",
"dependencies": {
"ajv": "^6.12.4",
"debug": "^4.3.2",
- "espree": "^9.3.2",
+ "espree": "^9.4.0",
"globals": "^13.15.0",
"ignore": "^5.2.0",
"import-fresh": "^3.2.1",
@@ -2264,6 +2275,9 @@
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "url": "https://opencollective.com/eslint"
}
},
"node_modules/@eslint/eslintrc/node_modules/argparse": {
@@ -2329,6 +2343,18 @@
"url": "https://github.com/sponsors/nzakas"
}
},
+ "node_modules/@humanwhocodes/module-importer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+ "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
+ "engines": {
+ "node": ">=12.22"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/nzakas"
+ }
+ },
"node_modules/@humanwhocodes/object-schema": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
@@ -3075,14 +3101,14 @@
"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
},
"node_modules/@mui/base": {
- "version": "5.0.0-alpha.93",
- "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.93.tgz",
- "integrity": "sha512-IVUWO0NNlELDc9FD7mM+fWTS1/6n5sJYdIbXpLQ00NjWdVEYmTyRgUAZDlJJJrz+tbF0eeffx0kOsvJvyTZlsA==",
+ "version": "5.0.0-alpha.95",
+ "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.95.tgz",
+ "integrity": "sha512-fcxnDeO7rBwzP0buVdI5fn0aA7NQ/AeUV5RzIIH0kOXVVT21HB4JFf41Qhwd0PIq63PXxmc6Fs2mdlzMYuPo9g==",
"dependencies": {
- "@babel/runtime": "^7.17.2",
- "@emotion/is-prop-valid": "^1.1.3",
- "@mui/types": "^7.1.5",
- "@mui/utils": "^5.9.3",
+ "@babel/runtime": "^7.18.9",
+ "@emotion/is-prop-valid": "^1.2.0",
+ "@mui/types": "^7.2.0",
+ "@mui/utils": "^5.10.3",
"@popperjs/core": "^2.11.6",
"clsx": "^1.2.1",
"prop-types": "^15.8.1",
@@ -3107,20 +3133,20 @@
}
},
"node_modules/@mui/core-downloads-tracker": {
- "version": "5.10.1",
- "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.1.tgz",
- "integrity": "sha512-zyzLkVSqi+WuxG8UZrrOaWbhHkDK+MlHFjLpL+vqUVU6iSUaDYREu1xoLWEQsWOznT4oT2iEiGZLpQLgkn+WiA==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.3.tgz",
+ "integrity": "sha512-mX2S0d1oboKBbWQqWIgRmyALAEzh37yiknpD3mKx8bcoMKbp1VtqzIt0aeHP16Uhsd0eValDFILxLNHWi0oddQ==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/mui"
}
},
"node_modules/@mui/icons-material": {
- "version": "5.8.4",
- "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.8.4.tgz",
- "integrity": "sha512-9Z/vyj2szvEhGWDvb+gG875bOGm8b8rlHBKOD1+nA3PcgC3fV6W1AU6pfOorPeBfH2X4mb9Boe97vHvaSndQvA==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.10.3.tgz",
+ "integrity": "sha512-o0kbUlsWCBtCE0wP33cGKbyryCh7kpm2EECYMPDmWrLhbA+HUODXIdhiTFS26szp2xXo9HY1lEx0ufeJ+tddYw==",
"dependencies": {
- "@babel/runtime": "^7.17.2"
+ "@babel/runtime": "^7.18.9"
},
"engines": {
"node": ">=12.0.0"
@@ -3141,16 +3167,16 @@
}
},
"node_modules/@mui/material": {
- "version": "5.10.1",
- "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.1.tgz",
- "integrity": "sha512-E9fhskX6TwUdAzpL5+yoAzRxb6wY4oBqmBVlgUuLndSwPRYxXoGu+z74NxbDEkxUoHdb7vrDcRTswpB6ykDITQ==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.3.tgz",
+ "integrity": "sha512-g0lzHcqWHYeOEAxTzcwpM1I7b+wyiRTeXkEdRsspnOpZtb0H/1xg386tMFRGbxBJ4zfVGT+TWublofw7pyQkqw==",
"dependencies": {
- "@babel/runtime": "^7.17.2",
- "@mui/base": "5.0.0-alpha.93",
- "@mui/core-downloads-tracker": "^5.10.1",
- "@mui/system": "^5.10.1",
- "@mui/types": "^7.1.5",
- "@mui/utils": "^5.9.3",
+ "@babel/runtime": "^7.18.9",
+ "@mui/base": "5.0.0-alpha.95",
+ "@mui/core-downloads-tracker": "^5.10.3",
+ "@mui/system": "^5.10.3",
+ "@mui/types": "^7.2.0",
+ "@mui/utils": "^5.10.3",
"@types/react-transition-group": "^4.4.5",
"clsx": "^1.2.1",
"csstype": "^3.1.0",
@@ -3185,12 +3211,12 @@
}
},
"node_modules/@mui/private-theming": {
- "version": "5.9.3",
- "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.9.3.tgz",
- "integrity": "sha512-Ys3WO39WqoGciGX9k5AIi/k2zJhlydv4FzlEEwtw9OqdMaV0ydK/TdZekKzjP9sTI/JcdAP3H5DWtUaPLQJjWg==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.10.3.tgz",
+ "integrity": "sha512-LCYIKlkGz2BTSng2BFzzwSJBRZbChIUri2x2Nh8ryk2B1Ho7zpvE7ex6y39LlStG2Frf92NFC/V4YQbmMAjD5A==",
"dependencies": {
- "@babel/runtime": "^7.17.2",
- "@mui/utils": "^5.9.3",
+ "@babel/runtime": "^7.18.9",
+ "@mui/utils": "^5.10.3",
"prop-types": "^15.8.1"
},
"engines": {
@@ -3211,12 +3237,12 @@
}
},
"node_modules/@mui/styled-engine": {
- "version": "5.10.1",
- "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.1.tgz",
- "integrity": "sha512-xiQp6wvSLpMcRCOExbRSvkHf6gIQ/eeK7mx/Re6BtPPYIx6OerPwia+23uVIop/k4Bs5D+w7Rv2yXYJxo5rMSQ==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.3.tgz",
+ "integrity": "sha512-9Uz7eB8xXoiDvpJ9qBxZ/2xGO8xKfA2T23dw4AsQ69SQtGatrOLAapzP2lNr0tfB9xvKucclPFhRO5aLhDFOVQ==",
"dependencies": {
- "@babel/runtime": "^7.17.2",
- "@emotion/cache": "^11.9.3",
+ "@babel/runtime": "^7.18.9",
+ "@emotion/cache": "^11.10.3",
"csstype": "^3.1.0",
"prop-types": "^15.8.1"
},
@@ -3242,15 +3268,15 @@
}
},
"node_modules/@mui/system": {
- "version": "5.10.1",
- "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.1.tgz",
- "integrity": "sha512-Ix8LVAMtVrNtmncK0yc5llHWlZKCm9okbw8QMnWbI5UH+nI9qhtf+Aure4p5ei6dGKdil++lukar/GxCjfzRSg==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.3.tgz",
+ "integrity": "sha512-uLW/CIz3zk1jr5zH0ahOUqJIrpWP02Mv4emfrplh7Mh5JCb/oumhYaC/ALJJEjzUHKg9wwiyuM0pCwK/kSf1jQ==",
"dependencies": {
- "@babel/runtime": "^7.17.2",
- "@mui/private-theming": "^5.9.3",
- "@mui/styled-engine": "^5.10.1",
- "@mui/types": "^7.1.5",
- "@mui/utils": "^5.9.3",
+ "@babel/runtime": "^7.18.9",
+ "@mui/private-theming": "^5.10.3",
+ "@mui/styled-engine": "^5.10.3",
+ "@mui/types": "^7.2.0",
+ "@mui/utils": "^5.10.3",
"clsx": "^1.2.1",
"csstype": "^3.1.0",
"prop-types": "^15.8.1"
@@ -3281,9 +3307,9 @@
}
},
"node_modules/@mui/types": {
- "version": "7.1.5",
- "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.5.tgz",
- "integrity": "sha512-HnRXrxgHJYJcT8ZDdDCQIlqk0s0skOKD7eWs9mJgBUu70hyW4iA6Kiv3yspJR474RFH8hysKR65VVSzUSzkuwA==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.0.tgz",
+ "integrity": "sha512-lGXtFKe5lp3UxTBGqKI1l7G8sE2xBik8qCfrLHD5olwP/YU0/ReWoWT7Lp1//ri32dK39oPMrJN8TgbkCSbsNA==",
"peerDependencies": {
"@types/react": "*"
},
@@ -3294,11 +3320,11 @@
}
},
"node_modules/@mui/utils": {
- "version": "5.9.3",
- "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.9.3.tgz",
- "integrity": "sha512-l0N5bcrenE9hnwZ/jPecpIRqsDFHkPXoFUcmkgysaJwVZzJ3yQkGXB47eqmXX5yyGrSc6HksbbqXEaUya+siew==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.10.3.tgz",
+ "integrity": "sha512-4jXMDPfx6bpMVuheLaOpKTjpzw39ogAZLeaLj5+RJec3E37/hAZMYjURfblLfTWMMoGoqkY03mNsZaEwNobBow==",
"dependencies": {
- "@babel/runtime": "^7.17.2",
+ "@babel/runtime": "^7.18.9",
"@types/prop-types": "^15.7.5",
"@types/react-is": "^16.7.1 || ^17.0.0",
"prop-types": "^15.8.1",
@@ -3493,9 +3519,9 @@
"integrity": "sha512-LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA=="
},
"node_modules/@sinclair/typebox": {
- "version": "0.24.28",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.28.tgz",
- "integrity": "sha512-dgJd3HLOkLmz4Bw50eZx/zJwtBq65nms3N9VBYu5LTjJ883oBFkTyXRlCB/ZGGwqYpJJHA5zW2Ibhl5ngITfow=="
+ "version": "0.24.35",
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.35.tgz",
+ "integrity": "sha512-iN6ehuDndiTiDz2F+Orv/+oHJR+PrGv+38oghCddpsW4YEZl5qyLsWxSwYUWrKEOfjpGtXDFW6scJtjpzSLeSw=="
},
"node_modules/@sinonjs/commons": {
"version": "1.8.3",
@@ -3777,9 +3803,9 @@
}
},
"node_modules/@types/babel__traverse": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.0.tgz",
- "integrity": "sha512-v4Vwdko+pgymgS+A2UIaJru93zQd85vIGWObM5ekZNdXCKtDYqATlEYnWgfo86Q6I1Lh0oXnksDnMU1cwmlPDw==",
+ "version": "7.18.1",
+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.1.tgz",
+ "integrity": "sha512-FSdLaZh2UxaMuLp9lixWaHq/golWTRWOnRsAXzDTDSDOQLuZb1nsdCt6pJSPWSEQt2eFZ2YVk3oYhn+1kLMeMA==",
"dependencies": {
"@babel/types": "^7.3.0"
}
@@ -3920,9 +3946,9 @@
"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
},
"node_modules/@types/node": {
- "version": "18.7.8",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.8.tgz",
- "integrity": "sha512-/YP55EMK2341JkODUb8DM9O0x1SIz2aBvyF33Uf1c76St3VpsMXEIW0nxuKkq/5cxnbz0RD9cfwNZHEAZQD3ag=="
+ "version": "18.7.15",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.15.tgz",
+ "integrity": "sha512-XnjpaI8Bgc3eBag2Aw4t2Uj/49lLBSStHWfqKvIuXD7FIrZyMLWp8KuAFHAqxMZYTF9l08N1ctUn9YNybZJVmQ=="
},
"node_modules/@types/parse-json": {
"version": "4.0.0",
@@ -3955,9 +3981,9 @@
"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
},
"node_modules/@types/react": {
- "version": "18.0.17",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.17.tgz",
- "integrity": "sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==",
+ "version": "18.0.18",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.18.tgz",
+ "integrity": "sha512-6hI08umYs6NaiHFEEGioXnxJ+oEhY3eRz8VCUaudZmGdtvPviCJB8mgaMxaDWAdPSYd4eFavrPk2QIolwbLYrg==",
"dependencies": {
"@types/prop-types": "*",
"@types/scheduler": "*",
@@ -4055,13 +4081,13 @@
"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz",
- "integrity": "sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.2.tgz",
+ "integrity": "sha512-OwwR8LRwSnI98tdc2z7mJYgY60gf7I9ZfGjN5EjCwwns9bdTuQfAXcsjSB2wSQ/TVNYSGKf4kzVXbNGaZvwiXw==",
"dependencies": {
- "@typescript-eslint/scope-manager": "5.33.1",
- "@typescript-eslint/type-utils": "5.33.1",
- "@typescript-eslint/utils": "5.33.1",
+ "@typescript-eslint/scope-manager": "5.36.2",
+ "@typescript-eslint/type-utils": "5.36.2",
+ "@typescript-eslint/utils": "5.36.2",
"debug": "^4.3.4",
"functional-red-black-tree": "^1.0.1",
"ignore": "^5.2.0",
@@ -4101,11 +4127,11 @@
}
},
"node_modules/@typescript-eslint/experimental-utils": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.33.1.tgz",
- "integrity": "sha512-wk2o+4wojvKz/x3UCbsgjgXl0lyLPYQsfKP0MdRzj4jtsQr4bVtgWUWck6+N3GzThUTbUFyyKLduWPwePhh0xQ==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.36.2.tgz",
+ "integrity": "sha512-JtRmWb31KQoxGV6CHz8cI+9ki6cC7ciZepXYpCLxsdAtQlBrRBxh5Qpe/ZHyJFOT9j7gyXE+W0shWzRLPfuAFQ==",
"dependencies": {
- "@typescript-eslint/utils": "5.33.1"
+ "@typescript-eslint/utils": "5.36.2"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4119,13 +4145,13 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz",
- "integrity": "sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.36.2.tgz",
+ "integrity": "sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==",
"dependencies": {
- "@typescript-eslint/scope-manager": "5.33.1",
- "@typescript-eslint/types": "5.33.1",
- "@typescript-eslint/typescript-estree": "5.33.1",
+ "@typescript-eslint/scope-manager": "5.36.2",
+ "@typescript-eslint/types": "5.36.2",
+ "@typescript-eslint/typescript-estree": "5.36.2",
"debug": "^4.3.4"
},
"engines": {
@@ -4145,12 +4171,12 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz",
- "integrity": "sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz",
+ "integrity": "sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==",
"dependencies": {
- "@typescript-eslint/types": "5.33.1",
- "@typescript-eslint/visitor-keys": "5.33.1"
+ "@typescript-eslint/types": "5.36.2",
+ "@typescript-eslint/visitor-keys": "5.36.2"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4161,11 +4187,12 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz",
- "integrity": "sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.36.2.tgz",
+ "integrity": "sha512-rPQtS5rfijUWLouhy6UmyNquKDPhQjKsaKH0WnY6hl/07lasj8gPaH2UD8xWkePn6SC+jW2i9c2DZVDnL+Dokw==",
"dependencies": {
- "@typescript-eslint/utils": "5.33.1",
+ "@typescript-eslint/typescript-estree": "5.36.2",
+ "@typescript-eslint/utils": "5.36.2",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
@@ -4186,9 +4213,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz",
- "integrity": "sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.36.2.tgz",
+ "integrity": "sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ==",
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
@@ -4198,12 +4225,12 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz",
- "integrity": "sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz",
+ "integrity": "sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==",
"dependencies": {
- "@typescript-eslint/types": "5.33.1",
- "@typescript-eslint/visitor-keys": "5.33.1",
+ "@typescript-eslint/types": "5.36.2",
+ "@typescript-eslint/visitor-keys": "5.36.2",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -4238,14 +4265,14 @@
}
},
"node_modules/@typescript-eslint/utils": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz",
- "integrity": "sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.36.2.tgz",
+ "integrity": "sha512-uNcopWonEITX96v9pefk9DC1bWMdkweeSsewJ6GeC7L6j2t0SJywisgkr9wUTtXk90fi2Eljj90HSHm3OGdGRg==",
"dependencies": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.33.1",
- "@typescript-eslint/types": "5.33.1",
- "@typescript-eslint/typescript-estree": "5.33.1",
+ "@typescript-eslint/scope-manager": "5.36.2",
+ "@typescript-eslint/types": "5.36.2",
+ "@typescript-eslint/typescript-estree": "5.36.2",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
},
@@ -4281,11 +4308,11 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz",
- "integrity": "sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz",
+ "integrity": "sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==",
"dependencies": {
- "@typescript-eslint/types": "5.33.1",
+ "@typescript-eslint/types": "5.36.2",
"eslint-visitor-keys": "^3.3.0"
},
"engines": {
@@ -5238,9 +5265,9 @@
"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
},
"node_modules/bonjour-service": {
- "version": "1.0.13",
- "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.13.tgz",
- "integrity": "sha512-LWKRU/7EqDUC9CTAQtuZl5HzBALoCYwtLhffW3et7vZMwv3bWLpJf8bRYlMD5OCcDpTfnPgNCV4yo9ZIaJGMiA==",
+ "version": "1.0.14",
+ "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
+ "integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
"dependencies": {
"array-flatten": "^2.1.2",
"dns-equal": "^1.0.0",
@@ -5397,9 +5424,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001380",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001380.tgz",
- "integrity": "sha512-OO+pPubxx16lkI7TVrbFpde8XHz66SMwstl1YWpg6uMGw56XnhYVwtPIjvX4kYpzwMwQKr4DDce394E03dQPGg==",
+ "version": "1.0.30001390",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz",
+ "integrity": "sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g==",
"funding": [
{
"type": "opencollective",
@@ -5751,9 +5778,9 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
},
"node_modules/core-js": {
- "version": "3.24.1",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
- "integrity": "sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg==",
+ "version": "3.25.0",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz",
+ "integrity": "sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -5761,9 +5788,9 @@
}
},
"node_modules/core-js-compat": {
- "version": "3.24.1",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.24.1.tgz",
- "integrity": "sha512-XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw==",
+ "version": "3.25.0",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.0.tgz",
+ "integrity": "sha512-extKQM0g8/3GjFx9US12FAgx8KJawB7RCQ5y8ipYLbmfzEzmFRWdDjIlxDx82g7ygcNG85qMVUSRyABouELdow==",
"dependencies": {
"browserslist": "^4.21.3",
"semver": "7.0.0"
@@ -5782,9 +5809,9 @@
}
},
"node_modules/core-js-pure": {
- "version": "3.24.1",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.24.1.tgz",
- "integrity": "sha512-r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg==",
+ "version": "3.25.0",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.0.tgz",
+ "integrity": "sha512-IeHpLwk3uoci37yoI2Laty59+YqH9x5uR65/yiA0ARAJrTrN4YU0rmauLWfvqOuk77SlNJXj2rM6oT/dBD87+A==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -5858,9 +5885,9 @@
}
},
"node_modules/css-declaration-sorter": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz",
- "integrity": "sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og==",
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
+ "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
"engines": {
"node": "^10 || ^12 || >=14"
},
@@ -6084,9 +6111,9 @@
}
},
"node_modules/cssdb": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.0.0.tgz",
- "integrity": "sha512-HmRYATZ4Gf8naf6sZmwKEyf7MXAC0ZxjsamtNNgmuWpQgoO973zsE/1JMIohEYsSi5e3n7vQauCLv7TWSrOlrw==",
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.0.1.tgz",
+ "integrity": "sha512-pT3nzyGM78poCKLAEy2zWIVX2hikq6dIrjuZzLV98MumBg+xMTNYfHx7paUlfiRTgg91O/vR889CIf+qiv79Rw==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/csstools"
@@ -6649,9 +6676,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.4.225",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.225.tgz",
- "integrity": "sha512-ICHvGaCIQR3P88uK8aRtx8gmejbVJyC6bB4LEC3anzBrIzdzC7aiZHY4iFfXhN4st6I7lMO0x4sgBHf/7kBvRw=="
+ "version": "1.4.241",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.241.tgz",
+ "integrity": "sha512-e7Wsh4ilaioBZ5bMm6+F4V5c11dh56/5Jwz7Hl5Tu1J7cnB+Pqx5qIF2iC7HPpfyQMqGSvvLP5bBAIDd2gAtGw=="
},
"node_modules/emittery": {
"version": "0.8.1",
@@ -6722,15 +6749,15 @@
}
},
"node_modules/es-abstract": {
- "version": "1.20.1",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
- "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==",
+ "version": "1.20.2",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
+ "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
"dependencies": {
"call-bind": "^1.0.2",
"es-to-primitive": "^1.2.1",
"function-bind": "^1.1.1",
"function.prototype.name": "^1.1.5",
- "get-intrinsic": "^1.1.1",
+ "get-intrinsic": "^1.1.2",
"get-symbol-description": "^1.0.0",
"has": "^1.0.3",
"has-property-descriptors": "^1.0.0",
@@ -6742,9 +6769,9 @@
"is-shared-array-buffer": "^1.0.2",
"is-string": "^1.0.7",
"is-weakref": "^1.0.2",
- "object-inspect": "^1.12.0",
+ "object-inspect": "^1.12.2",
"object-keys": "^1.1.1",
- "object.assign": "^4.1.2",
+ "object.assign": "^4.1.4",
"regexp.prototype.flags": "^1.4.3",
"string.prototype.trimend": "^1.0.5",
"string.prototype.trimstart": "^1.0.5",
@@ -6893,13 +6920,14 @@
}
},
"node_modules/eslint": {
- "version": "8.22.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz",
- "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==",
+ "version": "8.23.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.0.tgz",
+ "integrity": "sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==",
"dependencies": {
- "@eslint/eslintrc": "^1.3.0",
+ "@eslint/eslintrc": "^1.3.1",
"@humanwhocodes/config-array": "^0.10.4",
"@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+ "@humanwhocodes/module-importer": "^1.0.1",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
@@ -6909,7 +6937,7 @@
"eslint-scope": "^7.1.1",
"eslint-utils": "^3.0.0",
"eslint-visitor-keys": "^3.3.0",
- "espree": "^9.3.3",
+ "espree": "^9.4.0",
"esquery": "^1.4.0",
"esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3",
@@ -6934,8 +6962,7 @@
"regexpp": "^3.2.0",
"strip-ansi": "^6.0.1",
"strip-json-comments": "^3.1.0",
- "text-table": "^0.2.0",
- "v8-compile-cache": "^2.0.3"
+ "text-table": "^0.2.0"
},
"bin": {
"eslint": "bin/eslint.js"
@@ -7132,9 +7159,9 @@
}
},
"node_modules/eslint-plugin-react": {
- "version": "7.30.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.30.1.tgz",
- "integrity": "sha512-NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg==",
+ "version": "7.31.6",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.6.tgz",
+ "integrity": "sha512-CXu4eu28sb8Sd2+cyUYsJVyDvpTlaXPG+bOzzpS9IzZKtye96AYX3ZmHQ6ayn/OAIQ/ufDJP8ElPWd63Pepn9w==",
"dependencies": {
"array-includes": "^3.1.5",
"array.prototype.flatmap": "^1.3.0",
@@ -7197,9 +7224,9 @@
}
},
"node_modules/eslint-plugin-testing-library": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.6.0.tgz",
- "integrity": "sha512-y63TRzPhGCMNsnUwMGJU1MFWc/3GvYw+nzobp9QiyNTTKsgAt5RKAOT1I34+XqVBpX1lC8bScoOjCkP7iRv0Mw==",
+ "version": "5.6.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.6.1.tgz",
+ "integrity": "sha512-url6n7SbPg77TM2MLy1XkcrQEWiS5nKcDiJgwOYz2qGCEMywM7gizPzLi3XalJPdpIkQAo2BJFQZC6jggsyCuQ==",
"dependencies": {
"@typescript-eslint/utils": "^5.13.0"
},
@@ -7469,9 +7496,9 @@
}
},
"node_modules/espree": {
- "version": "9.3.3",
- "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz",
- "integrity": "sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==",
+ "version": "9.4.0",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
+ "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
"dependencies": {
"acorn": "^8.8.0",
"acorn-jsx": "^5.3.2",
@@ -10887,9 +10914,9 @@
}
},
"node_modules/jest-watch-typeahead/node_modules/@types/yargs": {
- "version": "17.0.11",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz",
- "integrity": "sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==",
+ "version": "17.0.12",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.12.tgz",
+ "integrity": "sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ==",
"dependencies": {
"@types/yargs-parser": "*"
}
@@ -11961,9 +11988,9 @@
}
},
"node_modules/nwsapi": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.1.tgz",
- "integrity": "sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg=="
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
+ "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="
},
"node_modules/object-assign": {
"version": "4.1.1",
@@ -13719,9 +13746,9 @@
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
},
"node_modules/promise": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
- "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
+ "version": "8.2.0",
+ "resolved": "https://registry.npmjs.org/promise/-/promise-8.2.0.tgz",
+ "integrity": "sha512-+CMAlLHqwRYwBMXKCP+o8ns7DN+xHDUiI+0nArsiJ9y+kJVPLFxEaSw6Ha9s9H0tftxg2Yzl25wqj9G7m5wLZg==",
"dependencies": {
"asap": "~2.0.6"
}
@@ -13809,6 +13836,11 @@
"url": "https://github.com/sponsors/ljharb"
}
},
+ "node_modules/querystringify": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+ "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+ },
"node_modules/queue-microtask": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -14047,9 +14079,9 @@
"integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
},
"node_modules/react-i18next": {
- "version": "11.18.4",
- "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.4.tgz",
- "integrity": "sha512-gK/AylAQC5DvCD5YLNCHW4PNzpCfrWIyVAXbSMl+/5QXzlDP8VdBoqE2s2niGHB+zIXwBV9hRXbDrVuupbgHcg==",
+ "version": "11.18.5",
+ "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.5.tgz",
+ "integrity": "sha512-cKcyuuzIv0YUZ4l9WORflVNuhISPAqQShOAsxwFyYuJoCA7HlLmHm7XnvO6hfAGmGpDNRhJHoBX8hG49Cb2xZQ==",
"dependencies": {
"@babel/runtime": "^7.14.5",
"html-parse-stringify": "^3.0.1"
@@ -14551,9 +14583,9 @@
}
},
"node_modules/rollup": {
- "version": "2.78.1",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.78.1.tgz",
- "integrity": "sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg==",
+ "version": "2.79.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.0.tgz",
+ "integrity": "sha512-x4KsrCgwQ7ZJPcFA/SUu6QVcYlO7uRLfLAy0DSA4NS2eG8japdbpM50ToH7z4iObodRYOJ0soneF0iaQRJ6zhA==",
"bin": {
"rollup": "dist/bin/rollup"
},
@@ -15576,9 +15608,9 @@
}
},
"node_modules/terser": {
- "version": "5.14.2",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
- "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
+ "version": "5.15.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
+ "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
"dependencies": {
"@jridgewell/source-map": "^0.3.2",
"acorn": "^8.5.0",
@@ -15593,9 +15625,9 @@
}
},
"node_modules/terser-webpack-plugin": {
- "version": "5.3.5",
- "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.5.tgz",
- "integrity": "sha512-AOEDLDxD2zylUGf/wxHxklEkOe2/r+seuyOWujejFrIxHf11brA1/dWQNIgXa1c6/Wkxgu7zvv0JhOWfc2ELEA==",
+ "version": "5.3.6",
+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
+ "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
"dependencies": {
"@jridgewell/trace-mapping": "^0.3.14",
"jest-worker": "^27.4.5",
@@ -15699,22 +15731,23 @@
}
},
"node_modules/tough-cookie": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
- "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+ "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
"dependencies": {
"psl": "^1.1.33",
"punycode": "^2.1.1",
- "universalify": "^0.1.2"
+ "universalify": "^0.2.0",
+ "url-parse": "^1.5.3"
},
"engines": {
"node": ">=6"
}
},
"node_modules/tough-cookie/node_modules/universalify": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
- "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+ "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
"engines": {
"node": ">= 4.0.0"
}
@@ -15834,9 +15867,9 @@
}
},
"node_modules/typescript": {
- "version": "4.7.4",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
- "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
+ "version": "4.8.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
+ "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
"peer": true,
"bin": {
"tsc": "bin/tsc",
@@ -15938,9 +15971,9 @@
}
},
"node_modules/update-browserslist-db": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz",
- "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==",
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz",
+ "integrity": "sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg==",
"funding": [
{
"type": "opencollective",
@@ -15970,6 +16003,15 @@
"punycode": "^2.1.0"
}
},
+ "node_modules/url-parse": {
+ "version": "1.5.10",
+ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+ "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+ "dependencies": {
+ "querystringify": "^2.1.1",
+ "requires-port": "^1.0.0"
+ }
+ },
"node_modules/util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -16010,11 +16052,6 @@
"uuid": "dist/bin/uuid"
}
},
- "node_modules/v8-compile-cache": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
- "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
- },
"node_modules/v8-to-istanbul": {
"version": "8.1.1",
"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
@@ -16225,9 +16262,9 @@
}
},
"node_modules/webpack-dev-server": {
- "version": "4.10.0",
- "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.10.0.tgz",
- "integrity": "sha512-7dezwAs+k6yXVFZ+MaL8VnE+APobiO3zvpp3rBHe/HmWQ+avwh0Q3d0xxacOiBybZZ3syTZw9HXzpa3YNbAZDQ==",
+ "version": "4.10.1",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.10.1.tgz",
+ "integrity": "sha512-FIzMq3jbBarz3ld9l7rbM7m6Rj1lOsgq/DyLGMX/fPEB1UBUPtf5iL/4eNfhx8YYJTRlzfv107UfWSWcBK5Odw==",
"dependencies": {
"@types/bonjour": "^3.5.9",
"@types/connect-history-api-fallback": "^1.3.5",
@@ -16987,25 +17024,25 @@
}
},
"@babel/compat-data": {
- "version": "7.18.8",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz",
- "integrity": "sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.0.tgz",
+ "integrity": "sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw=="
},
"@babel/core": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz",
- "integrity": "sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.0.tgz",
+ "integrity": "sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ==",
"requires": {
"@ampproject/remapping": "^2.1.0",
"@babel/code-frame": "^7.18.6",
- "@babel/generator": "^7.18.10",
- "@babel/helper-compilation-targets": "^7.18.9",
- "@babel/helper-module-transforms": "^7.18.9",
- "@babel/helpers": "^7.18.9",
- "@babel/parser": "^7.18.10",
+ "@babel/generator": "^7.19.0",
+ "@babel/helper-compilation-targets": "^7.19.0",
+ "@babel/helper-module-transforms": "^7.19.0",
+ "@babel/helpers": "^7.19.0",
+ "@babel/parser": "^7.19.0",
"@babel/template": "^7.18.10",
- "@babel/traverse": "^7.18.10",
- "@babel/types": "^7.18.10",
+ "@babel/traverse": "^7.19.0",
+ "@babel/types": "^7.19.0",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -17045,11 +17082,11 @@
}
},
"@babel/generator": {
- "version": "7.18.12",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz",
- "integrity": "sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
+ "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==",
"requires": {
- "@babel/types": "^7.18.10",
+ "@babel/types": "^7.19.0",
"@jridgewell/gen-mapping": "^0.3.2",
"jsesc": "^2.5.1"
},
@@ -17084,24 +17121,24 @@
}
},
"@babel/helper-compilation-targets": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz",
- "integrity": "sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz",
+ "integrity": "sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA==",
"requires": {
- "@babel/compat-data": "^7.18.8",
+ "@babel/compat-data": "^7.19.0",
"@babel/helper-validator-option": "^7.18.6",
"browserslist": "^4.20.2",
"semver": "^6.3.0"
}
},
"@babel/helper-create-class-features-plugin": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz",
- "integrity": "sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
+ "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
"requires": {
"@babel/helper-annotate-as-pure": "^7.18.6",
"@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-function-name": "^7.19.0",
"@babel/helper-member-expression-to-functions": "^7.18.9",
"@babel/helper-optimise-call-expression": "^7.18.6",
"@babel/helper-replace-supers": "^7.18.9",
@@ -17109,9 +17146,9 @@
}
},
"@babel/helper-create-regexp-features-plugin": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz",
- "integrity": "sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
+ "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
"requires": {
"@babel/helper-annotate-as-pure": "^7.18.6",
"regexpu-core": "^5.1.0"
@@ -17144,12 +17181,12 @@
}
},
"@babel/helper-function-name": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz",
- "integrity": "sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
+ "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
"requires": {
- "@babel/template": "^7.18.6",
- "@babel/types": "^7.18.9"
+ "@babel/template": "^7.18.10",
+ "@babel/types": "^7.19.0"
}
},
"@babel/helper-hoist-variables": {
@@ -17177,18 +17214,18 @@
}
},
"@babel/helper-module-transforms": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz",
- "integrity": "sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.0.tgz",
+ "integrity": "sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==",
"requires": {
"@babel/helper-environment-visitor": "^7.18.9",
"@babel/helper-module-imports": "^7.18.6",
"@babel/helper-simple-access": "^7.18.6",
"@babel/helper-split-export-declaration": "^7.18.6",
"@babel/helper-validator-identifier": "^7.18.6",
- "@babel/template": "^7.18.6",
- "@babel/traverse": "^7.18.9",
- "@babel/types": "^7.18.9"
+ "@babel/template": "^7.18.10",
+ "@babel/traverse": "^7.19.0",
+ "@babel/types": "^7.19.0"
}
},
"@babel/helper-optimise-call-expression": {
@@ -17200,9 +17237,9 @@
}
},
"@babel/helper-plugin-utils": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz",
- "integrity": "sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
+ "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="
},
"@babel/helper-remap-async-to-generator": {
"version": "7.18.9",
@@ -17267,24 +17304,24 @@
"integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="
},
"@babel/helper-wrap-function": {
- "version": "7.18.11",
- "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz",
- "integrity": "sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
+ "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
"requires": {
- "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-function-name": "^7.19.0",
"@babel/template": "^7.18.10",
- "@babel/traverse": "^7.18.11",
- "@babel/types": "^7.18.10"
+ "@babel/traverse": "^7.19.0",
+ "@babel/types": "^7.19.0"
}
},
"@babel/helpers": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz",
- "integrity": "sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.19.0.tgz",
+ "integrity": "sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==",
"requires": {
- "@babel/template": "^7.18.6",
- "@babel/traverse": "^7.18.9",
- "@babel/types": "^7.18.9"
+ "@babel/template": "^7.18.10",
+ "@babel/traverse": "^7.19.0",
+ "@babel/types": "^7.19.0"
}
},
"@babel/highlight": {
@@ -17298,9 +17335,9 @@
}
},
"@babel/parser": {
- "version": "7.18.11",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz",
- "integrity": "sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ=="
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz",
+ "integrity": "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw=="
},
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
"version": "7.18.6",
@@ -17321,12 +17358,12 @@
}
},
"@babel/plugin-proposal-async-generator-functions": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz",
- "integrity": "sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.0.tgz",
+ "integrity": "sha512-nhEByMUTx3uZueJ/QkJuSlCfN4FGg+xy+vRsfGQGzSauq5ks2Deid2+05Q3KhfaUjvec1IGhw/Zm3cFm8JigTQ==",
"requires": {
"@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-remap-async-to-generator": "^7.18.9",
"@babel/plugin-syntax-async-generators": "^7.8.4"
}
@@ -17351,15 +17388,15 @@
}
},
"@babel/plugin-proposal-decorators": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.10.tgz",
- "integrity": "sha512-wdGTwWF5QtpTY/gbBtQLAiCnoxfD4qMbN87NYZle1dOZ9Os8Y6zXcKrIaOU8W+TIvFUWVGG9tUgNww3CjXRVVw==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.0.tgz",
+ "integrity": "sha512-Bo5nOSjiJccjv00+BrDkmfeBLBi2B0qe8ygj24KdL8VdwtZz+710NCwehF+x/Ng+0mkHx5za2eAofmvVFLF4Fg==",
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.18.9",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-create-class-features-plugin": "^7.19.0",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-replace-supers": "^7.18.9",
"@babel/helper-split-export-declaration": "^7.18.6",
- "@babel/plugin-syntax-decorators": "^7.18.6"
+ "@babel/plugin-syntax-decorators": "^7.19.0"
}
},
"@babel/plugin-proposal-dynamic-import": {
@@ -17509,11 +17546,11 @@
}
},
"@babel/plugin-syntax-decorators": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz",
- "integrity": "sha512-fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz",
+ "integrity": "sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==",
"requires": {
- "@babel/helper-plugin-utils": "^7.18.6"
+ "@babel/helper-plugin-utils": "^7.19.0"
}
},
"@babel/plugin-syntax-dynamic-import": {
@@ -17679,15 +17716,16 @@
}
},
"@babel/plugin-transform-classes": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz",
- "integrity": "sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
+ "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
"requires": {
"@babel/helper-annotate-as-pure": "^7.18.6",
+ "@babel/helper-compilation-targets": "^7.19.0",
"@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-function-name": "^7.18.9",
+ "@babel/helper-function-name": "^7.19.0",
"@babel/helper-optimise-call-expression": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-replace-supers": "^7.18.9",
"@babel/helper-split-export-declaration": "^7.18.6",
"globals": "^11.1.0"
@@ -17702,9 +17740,9 @@
}
},
"@babel/plugin-transform-destructuring": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz",
- "integrity": "sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==",
+ "version": "7.18.13",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.13.tgz",
+ "integrity": "sha512-TodpQ29XekIsex2A+YJPj5ax2plkGa8YYY6mFjCohk/IG9IY42Rtuj1FuDeemfg2ipxIFLzPeA83SIBnlhSIow==",
"requires": {
"@babel/helper-plugin-utils": "^7.18.9"
}
@@ -17736,11 +17774,11 @@
}
},
"@babel/plugin-transform-flow-strip-types": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.18.9.tgz",
- "integrity": "sha512-+G6rp2zRuOAInY5wcggsx4+QVao1qPM0osC9fTUVlAV3zOrzTCnrMAFVnR6+a3T8wz1wFIH7KhYMcMB3u1n80A==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz",
+ "integrity": "sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg==",
"requires": {
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/plugin-syntax-flow": "^7.18.6"
}
},
@@ -17800,13 +17838,13 @@
}
},
"@babel/plugin-transform-modules-systemjs": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz",
- "integrity": "sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.0.tgz",
+ "integrity": "sha512-x9aiR0WXAWmOWsqcsnrzGR+ieaTMVyGyffPVA7F8cXAGt/UxefYv6uSHZLkAFChN5M5Iy1+wjE+xJuPt22H39A==",
"requires": {
"@babel/helper-hoist-variables": "^7.18.6",
- "@babel/helper-module-transforms": "^7.18.9",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-module-transforms": "^7.19.0",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-validator-identifier": "^7.18.6",
"babel-plugin-dynamic-import-node": "^2.3.3"
}
@@ -17821,12 +17859,12 @@
}
},
"@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz",
- "integrity": "sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.0.tgz",
+ "integrity": "sha512-HDSuqOQzkU//kfGdiHBt71/hkDTApw4U/cMVgKgX7PqfB3LOaK+2GtCEsBu1dL9CkswDm0Gwehht1dCr421ULQ==",
"requires": {
- "@babel/helper-create-regexp-features-plugin": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.6"
+ "@babel/helper-create-regexp-features-plugin": "^7.19.0",
+ "@babel/helper-plugin-utils": "^7.19.0"
}
},
"@babel/plugin-transform-new-target": {
@@ -17879,15 +17917,15 @@
}
},
"@babel/plugin-transform-react-jsx": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.10.tgz",
- "integrity": "sha512-gCy7Iikrpu3IZjYZolFE4M1Sm+nrh1/6za2Ewj77Z+XirT4TsbJcvOFOyF+fRPwU6AKKK136CZxx6L8AbSFG6A==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz",
+ "integrity": "sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg==",
"requires": {
"@babel/helper-annotate-as-pure": "^7.18.6",
"@babel/helper-module-imports": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/plugin-syntax-jsx": "^7.18.6",
- "@babel/types": "^7.18.10"
+ "@babel/types": "^7.19.0"
}
},
"@babel/plugin-transform-react-jsx-development": {
@@ -17946,11 +17984,11 @@
}
},
"@babel/plugin-transform-spread": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz",
- "integrity": "sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
+ "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
"requires": {
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
}
},
@@ -17979,12 +18017,12 @@
}
},
"@babel/plugin-transform-typescript": {
- "version": "7.18.12",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.12.tgz",
- "integrity": "sha512-2vjjam0cum0miPkenUbQswKowuxs/NjMwIKEq0zwegRxXk12C9YOF9STXnaUptITOtOJHKHpzvvWYOjbm6tc0w==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.0.tgz",
+ "integrity": "sha512-DOOIywxPpkQHXijXv+s9MDAyZcLp12oYRl3CMWZ6u7TjSoCBq/KqHR/nNFR3+i2xqheZxoF0H2XyL7B6xeSRuA==",
"requires": {
- "@babel/helper-create-class-features-plugin": "^7.18.9",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/helper-create-class-features-plugin": "^7.19.0",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/plugin-syntax-typescript": "^7.18.6"
}
},
@@ -18006,17 +18044,17 @@
}
},
"@babel/preset-env": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz",
- "integrity": "sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.0.tgz",
+ "integrity": "sha512-1YUju1TAFuzjIQqNM9WsF4U6VbD/8t3wEAlw3LFYuuEr+ywqLRcSXxFKz4DCEj+sN94l/XTDiUXYRrsvMpz9WQ==",
"requires": {
- "@babel/compat-data": "^7.18.8",
- "@babel/helper-compilation-targets": "^7.18.9",
- "@babel/helper-plugin-utils": "^7.18.9",
+ "@babel/compat-data": "^7.19.0",
+ "@babel/helper-compilation-targets": "^7.19.0",
+ "@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-validator-option": "^7.18.6",
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
- "@babel/plugin-proposal-async-generator-functions": "^7.18.10",
+ "@babel/plugin-proposal-async-generator-functions": "^7.19.0",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-class-static-block": "^7.18.6",
"@babel/plugin-proposal-dynamic-import": "^7.18.6",
@@ -18050,9 +18088,9 @@
"@babel/plugin-transform-async-to-generator": "^7.18.6",
"@babel/plugin-transform-block-scoped-functions": "^7.18.6",
"@babel/plugin-transform-block-scoping": "^7.18.9",
- "@babel/plugin-transform-classes": "^7.18.9",
+ "@babel/plugin-transform-classes": "^7.19.0",
"@babel/plugin-transform-computed-properties": "^7.18.9",
- "@babel/plugin-transform-destructuring": "^7.18.9",
+ "@babel/plugin-transform-destructuring": "^7.18.13",
"@babel/plugin-transform-dotall-regex": "^7.18.6",
"@babel/plugin-transform-duplicate-keys": "^7.18.9",
"@babel/plugin-transform-exponentiation-operator": "^7.18.6",
@@ -18062,9 +18100,9 @@
"@babel/plugin-transform-member-expression-literals": "^7.18.6",
"@babel/plugin-transform-modules-amd": "^7.18.6",
"@babel/plugin-transform-modules-commonjs": "^7.18.6",
- "@babel/plugin-transform-modules-systemjs": "^7.18.9",
+ "@babel/plugin-transform-modules-systemjs": "^7.19.0",
"@babel/plugin-transform-modules-umd": "^7.18.6",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.18.6",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.0",
"@babel/plugin-transform-new-target": "^7.18.6",
"@babel/plugin-transform-object-super": "^7.18.6",
"@babel/plugin-transform-parameters": "^7.18.8",
@@ -18072,14 +18110,14 @@
"@babel/plugin-transform-regenerator": "^7.18.6",
"@babel/plugin-transform-reserved-words": "^7.18.6",
"@babel/plugin-transform-shorthand-properties": "^7.18.6",
- "@babel/plugin-transform-spread": "^7.18.9",
+ "@babel/plugin-transform-spread": "^7.19.0",
"@babel/plugin-transform-sticky-regex": "^7.18.6",
"@babel/plugin-transform-template-literals": "^7.18.9",
"@babel/plugin-transform-typeof-symbol": "^7.18.9",
"@babel/plugin-transform-unicode-escapes": "^7.18.10",
"@babel/plugin-transform-unicode-regex": "^7.18.6",
"@babel/preset-modules": "^0.1.5",
- "@babel/types": "^7.18.10",
+ "@babel/types": "^7.19.0",
"babel-plugin-polyfill-corejs2": "^0.3.2",
"babel-plugin-polyfill-corejs3": "^0.5.3",
"babel-plugin-polyfill-regenerator": "^0.4.0",
@@ -18123,17 +18161,17 @@
}
},
"@babel/runtime": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz",
- "integrity": "sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz",
+ "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==",
"requires": {
"regenerator-runtime": "^0.13.4"
}
},
"@babel/runtime-corejs3": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.9.tgz",
- "integrity": "sha512-qZEWeccZCrHA2Au4/X05QW5CMdm4VjUDCrGq5gf1ZDcM4hRqreKrtwAn7yci9zfgAS9apvnsFXiGBHBAxZdK9A==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.19.0.tgz",
+ "integrity": "sha512-JyXXoCu1N8GLuKc2ii8y5RGma5FMpFeO2nAQIe0Yzrbq+rQnN+sFj47auLblR5ka6aHNGPDgv8G/iI2Grb0ldQ==",
"requires": {
"core-js-pure": "^3.20.2",
"regenerator-runtime": "^0.13.4"
@@ -18150,26 +18188,26 @@
}
},
"@babel/traverse": {
- "version": "7.18.11",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz",
- "integrity": "sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.0.tgz",
+ "integrity": "sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA==",
"requires": {
"@babel/code-frame": "^7.18.6",
- "@babel/generator": "^7.18.10",
+ "@babel/generator": "^7.19.0",
"@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-function-name": "^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.18.11",
- "@babel/types": "^7.18.10",
+ "@babel/parser": "^7.19.0",
+ "@babel/types": "^7.19.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
}
},
"@babel/types": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz",
- "integrity": "sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==",
+ "version": "7.19.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz",
+ "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==",
"requires": {
"@babel/helper-string-parser": "^7.18.10",
"@babel/helper-validator-identifier": "^7.18.6",
@@ -18308,9 +18346,9 @@
"requires": {}
},
"@emotion/babel-plugin": {
- "version": "11.10.0",
- "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.0.tgz",
- "integrity": "sha512-xVnpDAAbtxL1dsuSelU5A7BnY/lftws0wUexNJZTPsvX/1tM4GZJbclgODhvW4E+NH7E5VFcH0bBn30NvniPJA==",
+ "version": "11.10.2",
+ "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.2.tgz",
+ "integrity": "sha512-xNQ57njWTFVfPAc3cjfuaPdsgLp5QOSuRsj9MA6ndEhH/AzuZM86qIQzt6rq+aGBwj3n5/TkLmU5lhAfdRmogA==",
"requires": {
"@babel/helper-module-imports": "^7.16.7",
"@babel/plugin-syntax-jsx": "^7.17.12",
@@ -18327,9 +18365,9 @@
}
},
"@emotion/cache": {
- "version": "11.10.1",
- "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.1.tgz",
- "integrity": "sha512-uZTj3Yz5D69GE25iFZcIQtibnVCFsc/6+XIozyL3ycgWvEdif2uEw9wlUt6umjLr4Keg9K6xRPHmD8LGi+6p1A==",
+ "version": "11.10.3",
+ "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.3.tgz",
+ "integrity": "sha512-Psmp/7ovAa8appWh3g51goxu/z3iVms7JXOreq136D8Bbn6dYraPnmL6mdM8GThEx9vwSn92Fz+mGSjBzN8UPQ==",
"requires": {
"@emotion/memoize": "^0.8.0",
"@emotion/sheet": "^1.2.0",
@@ -18357,14 +18395,15 @@
"integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="
},
"@emotion/react": {
- "version": "11.10.0",
- "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.0.tgz",
- "integrity": "sha512-K6z9zlHxxBXwN8TcpwBKcEsBsOw4JWCCmR+BeeOWgqp8GIU1yA2Odd41bwdAAr0ssbQrbJbVnndvv7oiv1bZeQ==",
+ "version": "11.10.4",
+ "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.4.tgz",
+ "integrity": "sha512-j0AkMpr6BL8gldJZ6XQsQ8DnS9TxEQu1R+OGmDZiWjBAJtCcbt0tS3I/YffoqHXxH6MjgI7KdMbYKw3MEiU9eA==",
"requires": {
"@babel/runtime": "^7.18.3",
"@emotion/babel-plugin": "^11.10.0",
"@emotion/cache": "^11.10.0",
"@emotion/serialize": "^1.1.0",
+ "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
"@emotion/utils": "^1.2.0",
"@emotion/weak-memoize": "^0.3.0",
"hoist-non-react-statics": "^3.3.1"
@@ -18388,14 +18427,15 @@
"integrity": "sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w=="
},
"@emotion/styled": {
- "version": "11.10.0",
- "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.0.tgz",
- "integrity": "sha512-V9oaEH6V4KePeQpgUE83i8ht+4Ri3E8Djp/ZPJ4DQlqWhSKITvgzlR3/YQE2hdfP4Jw3qVRkANJz01LLqK9/TA==",
+ "version": "11.10.4",
+ "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.4.tgz",
+ "integrity": "sha512-pRl4R8Ez3UXvOPfc2bzIoV8u9P97UedgHS4FPX594ntwEuAMA114wlaHvOK24HB48uqfXiGlYIZYCxVJ1R1ttQ==",
"requires": {
"@babel/runtime": "^7.18.3",
"@emotion/babel-plugin": "^11.10.0",
"@emotion/is-prop-valid": "^1.2.0",
"@emotion/serialize": "^1.1.0",
+ "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
"@emotion/utils": "^1.2.0"
}
},
@@ -18404,6 +18444,12 @@
"resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.8.0.tgz",
"integrity": "sha512-VINS5vEYAscRl2ZUDiT3uMPlrFQupiKgHz5AA4bCH1miKBg4qtwkim1qPmJj/4WG6TreYMY111rEFsjupcOKHw=="
},
+ "@emotion/use-insertion-effect-with-fallbacks": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz",
+ "integrity": "sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==",
+ "requires": {}
+ },
"@emotion/utils": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.2.0.tgz",
@@ -18415,13 +18461,13 @@
"integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="
},
"@eslint/eslintrc": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
- "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz",
+ "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==",
"requires": {
"ajv": "^6.12.4",
"debug": "^4.3.2",
- "espree": "^9.3.2",
+ "espree": "^9.4.0",
"globals": "^13.15.0",
"ignore": "^5.2.0",
"import-fresh": "^3.2.1",
@@ -18473,6 +18519,11 @@
"resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
"integrity": "sha512-rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA=="
},
+ "@humanwhocodes/module-importer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+ "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="
+ },
"@humanwhocodes/object-schema": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
@@ -19030,14 +19081,14 @@
"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
},
"@mui/base": {
- "version": "5.0.0-alpha.93",
- "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.93.tgz",
- "integrity": "sha512-IVUWO0NNlELDc9FD7mM+fWTS1/6n5sJYdIbXpLQ00NjWdVEYmTyRgUAZDlJJJrz+tbF0eeffx0kOsvJvyTZlsA==",
+ "version": "5.0.0-alpha.95",
+ "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.95.tgz",
+ "integrity": "sha512-fcxnDeO7rBwzP0buVdI5fn0aA7NQ/AeUV5RzIIH0kOXVVT21HB4JFf41Qhwd0PIq63PXxmc6Fs2mdlzMYuPo9g==",
"requires": {
- "@babel/runtime": "^7.17.2",
- "@emotion/is-prop-valid": "^1.1.3",
- "@mui/types": "^7.1.5",
- "@mui/utils": "^5.9.3",
+ "@babel/runtime": "^7.18.9",
+ "@emotion/is-prop-valid": "^1.2.0",
+ "@mui/types": "^7.2.0",
+ "@mui/utils": "^5.10.3",
"@popperjs/core": "^2.11.6",
"clsx": "^1.2.1",
"prop-types": "^15.8.1",
@@ -19045,29 +19096,29 @@
}
},
"@mui/core-downloads-tracker": {
- "version": "5.10.1",
- "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.1.tgz",
- "integrity": "sha512-zyzLkVSqi+WuxG8UZrrOaWbhHkDK+MlHFjLpL+vqUVU6iSUaDYREu1xoLWEQsWOznT4oT2iEiGZLpQLgkn+WiA=="
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.3.tgz",
+ "integrity": "sha512-mX2S0d1oboKBbWQqWIgRmyALAEzh37yiknpD3mKx8bcoMKbp1VtqzIt0aeHP16Uhsd0eValDFILxLNHWi0oddQ=="
},
"@mui/icons-material": {
- "version": "5.8.4",
- "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.8.4.tgz",
- "integrity": "sha512-9Z/vyj2szvEhGWDvb+gG875bOGm8b8rlHBKOD1+nA3PcgC3fV6W1AU6pfOorPeBfH2X4mb9Boe97vHvaSndQvA==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.10.3.tgz",
+ "integrity": "sha512-o0kbUlsWCBtCE0wP33cGKbyryCh7kpm2EECYMPDmWrLhbA+HUODXIdhiTFS26szp2xXo9HY1lEx0ufeJ+tddYw==",
"requires": {
- "@babel/runtime": "^7.17.2"
+ "@babel/runtime": "^7.18.9"
}
},
"@mui/material": {
- "version": "5.10.1",
- "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.1.tgz",
- "integrity": "sha512-E9fhskX6TwUdAzpL5+yoAzRxb6wY4oBqmBVlgUuLndSwPRYxXoGu+z74NxbDEkxUoHdb7vrDcRTswpB6ykDITQ==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.3.tgz",
+ "integrity": "sha512-g0lzHcqWHYeOEAxTzcwpM1I7b+wyiRTeXkEdRsspnOpZtb0H/1xg386tMFRGbxBJ4zfVGT+TWublofw7pyQkqw==",
"requires": {
- "@babel/runtime": "^7.17.2",
- "@mui/base": "5.0.0-alpha.93",
- "@mui/core-downloads-tracker": "^5.10.1",
- "@mui/system": "^5.10.1",
- "@mui/types": "^7.1.5",
- "@mui/utils": "^5.9.3",
+ "@babel/runtime": "^7.18.9",
+ "@mui/base": "5.0.0-alpha.95",
+ "@mui/core-downloads-tracker": "^5.10.3",
+ "@mui/system": "^5.10.3",
+ "@mui/types": "^7.2.0",
+ "@mui/utils": "^5.10.3",
"@types/react-transition-group": "^4.4.5",
"clsx": "^1.2.1",
"csstype": "^3.1.0",
@@ -19077,53 +19128,53 @@
}
},
"@mui/private-theming": {
- "version": "5.9.3",
- "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.9.3.tgz",
- "integrity": "sha512-Ys3WO39WqoGciGX9k5AIi/k2zJhlydv4FzlEEwtw9OqdMaV0ydK/TdZekKzjP9sTI/JcdAP3H5DWtUaPLQJjWg==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.10.3.tgz",
+ "integrity": "sha512-LCYIKlkGz2BTSng2BFzzwSJBRZbChIUri2x2Nh8ryk2B1Ho7zpvE7ex6y39LlStG2Frf92NFC/V4YQbmMAjD5A==",
"requires": {
- "@babel/runtime": "^7.17.2",
- "@mui/utils": "^5.9.3",
+ "@babel/runtime": "^7.18.9",
+ "@mui/utils": "^5.10.3",
"prop-types": "^15.8.1"
}
},
"@mui/styled-engine": {
- "version": "5.10.1",
- "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.1.tgz",
- "integrity": "sha512-xiQp6wvSLpMcRCOExbRSvkHf6gIQ/eeK7mx/Re6BtPPYIx6OerPwia+23uVIop/k4Bs5D+w7Rv2yXYJxo5rMSQ==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.3.tgz",
+ "integrity": "sha512-9Uz7eB8xXoiDvpJ9qBxZ/2xGO8xKfA2T23dw4AsQ69SQtGatrOLAapzP2lNr0tfB9xvKucclPFhRO5aLhDFOVQ==",
"requires": {
- "@babel/runtime": "^7.17.2",
- "@emotion/cache": "^11.9.3",
+ "@babel/runtime": "^7.18.9",
+ "@emotion/cache": "^11.10.3",
"csstype": "^3.1.0",
"prop-types": "^15.8.1"
}
},
"@mui/system": {
- "version": "5.10.1",
- "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.1.tgz",
- "integrity": "sha512-Ix8LVAMtVrNtmncK0yc5llHWlZKCm9okbw8QMnWbI5UH+nI9qhtf+Aure4p5ei6dGKdil++lukar/GxCjfzRSg==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.3.tgz",
+ "integrity": "sha512-uLW/CIz3zk1jr5zH0ahOUqJIrpWP02Mv4emfrplh7Mh5JCb/oumhYaC/ALJJEjzUHKg9wwiyuM0pCwK/kSf1jQ==",
"requires": {
- "@babel/runtime": "^7.17.2",
- "@mui/private-theming": "^5.9.3",
- "@mui/styled-engine": "^5.10.1",
- "@mui/types": "^7.1.5",
- "@mui/utils": "^5.9.3",
+ "@babel/runtime": "^7.18.9",
+ "@mui/private-theming": "^5.10.3",
+ "@mui/styled-engine": "^5.10.3",
+ "@mui/types": "^7.2.0",
+ "@mui/utils": "^5.10.3",
"clsx": "^1.2.1",
"csstype": "^3.1.0",
"prop-types": "^15.8.1"
}
},
"@mui/types": {
- "version": "7.1.5",
- "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.1.5.tgz",
- "integrity": "sha512-HnRXrxgHJYJcT8ZDdDCQIlqk0s0skOKD7eWs9mJgBUu70hyW4iA6Kiv3yspJR474RFH8hysKR65VVSzUSzkuwA==",
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.2.0.tgz",
+ "integrity": "sha512-lGXtFKe5lp3UxTBGqKI1l7G8sE2xBik8qCfrLHD5olwP/YU0/ReWoWT7Lp1//ri32dK39oPMrJN8TgbkCSbsNA==",
"requires": {}
},
"@mui/utils": {
- "version": "5.9.3",
- "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.9.3.tgz",
- "integrity": "sha512-l0N5bcrenE9hnwZ/jPecpIRqsDFHkPXoFUcmkgysaJwVZzJ3yQkGXB47eqmXX5yyGrSc6HksbbqXEaUya+siew==",
+ "version": "5.10.3",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.10.3.tgz",
+ "integrity": "sha512-4jXMDPfx6bpMVuheLaOpKTjpzw39ogAZLeaLj5+RJec3E37/hAZMYjURfblLfTWMMoGoqkY03mNsZaEwNobBow==",
"requires": {
- "@babel/runtime": "^7.17.2",
+ "@babel/runtime": "^7.18.9",
"@types/prop-types": "^15.7.5",
"@types/react-is": "^16.7.1 || ^17.0.0",
"prop-types": "^15.8.1",
@@ -19235,9 +19286,9 @@
"integrity": "sha512-LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA=="
},
"@sinclair/typebox": {
- "version": "0.24.28",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.28.tgz",
- "integrity": "sha512-dgJd3HLOkLmz4Bw50eZx/zJwtBq65nms3N9VBYu5LTjJ883oBFkTyXRlCB/ZGGwqYpJJHA5zW2Ibhl5ngITfow=="
+ "version": "0.24.35",
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.35.tgz",
+ "integrity": "sha512-iN6ehuDndiTiDz2F+Orv/+oHJR+PrGv+38oghCddpsW4YEZl5qyLsWxSwYUWrKEOfjpGtXDFW6scJtjpzSLeSw=="
},
"@sinonjs/commons": {
"version": "1.8.3",
@@ -19415,9 +19466,9 @@
}
},
"@types/babel__traverse": {
- "version": "7.18.0",
- "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.0.tgz",
- "integrity": "sha512-v4Vwdko+pgymgS+A2UIaJru93zQd85vIGWObM5ekZNdXCKtDYqATlEYnWgfo86Q6I1Lh0oXnksDnMU1cwmlPDw==",
+ "version": "7.18.1",
+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.1.tgz",
+ "integrity": "sha512-FSdLaZh2UxaMuLp9lixWaHq/golWTRWOnRsAXzDTDSDOQLuZb1nsdCt6pJSPWSEQt2eFZ2YVk3oYhn+1kLMeMA==",
"requires": {
"@babel/types": "^7.3.0"
}
@@ -19558,9 +19609,9 @@
"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
},
"@types/node": {
- "version": "18.7.8",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.8.tgz",
- "integrity": "sha512-/YP55EMK2341JkODUb8DM9O0x1SIz2aBvyF33Uf1c76St3VpsMXEIW0nxuKkq/5cxnbz0RD9cfwNZHEAZQD3ag=="
+ "version": "18.7.15",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.15.tgz",
+ "integrity": "sha512-XnjpaI8Bgc3eBag2Aw4t2Uj/49lLBSStHWfqKvIuXD7FIrZyMLWp8KuAFHAqxMZYTF9l08N1ctUn9YNybZJVmQ=="
},
"@types/parse-json": {
"version": "4.0.0",
@@ -19593,9 +19644,9 @@
"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
},
"@types/react": {
- "version": "18.0.17",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.17.tgz",
- "integrity": "sha512-38ETy4tL+rn4uQQi7mB81G7V1g0u2ryquNmsVIOKUAEIDK+3CUjZ6rSRpdvS99dNBnkLFL83qfmtLacGOTIhwQ==",
+ "version": "18.0.18",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.18.tgz",
+ "integrity": "sha512-6hI08umYs6NaiHFEEGioXnxJ+oEhY3eRz8VCUaudZmGdtvPviCJB8mgaMxaDWAdPSYd4eFavrPk2QIolwbLYrg==",
"requires": {
"@types/prop-types": "*",
"@types/scheduler": "*",
@@ -19693,13 +19744,13 @@
"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
},
"@typescript-eslint/eslint-plugin": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.33.1.tgz",
- "integrity": "sha512-S1iZIxrTvKkU3+m63YUOxYPKaP+yWDQrdhxTglVDVEVBf+aCSw85+BmJnyUaQQsk5TXFG/LpBu9fa+LrAQ91fQ==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.2.tgz",
+ "integrity": "sha512-OwwR8LRwSnI98tdc2z7mJYgY60gf7I9ZfGjN5EjCwwns9bdTuQfAXcsjSB2wSQ/TVNYSGKf4kzVXbNGaZvwiXw==",
"requires": {
- "@typescript-eslint/scope-manager": "5.33.1",
- "@typescript-eslint/type-utils": "5.33.1",
- "@typescript-eslint/utils": "5.33.1",
+ "@typescript-eslint/scope-manager": "5.36.2",
+ "@typescript-eslint/type-utils": "5.36.2",
+ "@typescript-eslint/utils": "5.36.2",
"debug": "^4.3.4",
"functional-red-black-tree": "^1.0.1",
"ignore": "^5.2.0",
@@ -19719,55 +19770,56 @@
}
},
"@typescript-eslint/experimental-utils": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.33.1.tgz",
- "integrity": "sha512-wk2o+4wojvKz/x3UCbsgjgXl0lyLPYQsfKP0MdRzj4jtsQr4bVtgWUWck6+N3GzThUTbUFyyKLduWPwePhh0xQ==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.36.2.tgz",
+ "integrity": "sha512-JtRmWb31KQoxGV6CHz8cI+9ki6cC7ciZepXYpCLxsdAtQlBrRBxh5Qpe/ZHyJFOT9j7gyXE+W0shWzRLPfuAFQ==",
"requires": {
- "@typescript-eslint/utils": "5.33.1"
+ "@typescript-eslint/utils": "5.36.2"
}
},
"@typescript-eslint/parser": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.33.1.tgz",
- "integrity": "sha512-IgLLtW7FOzoDlmaMoXdxG8HOCByTBXrB1V2ZQYSEV1ggMmJfAkMWTwUjjzagS6OkfpySyhKFkBw7A9jYmcHpZA==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.36.2.tgz",
+ "integrity": "sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==",
"requires": {
- "@typescript-eslint/scope-manager": "5.33.1",
- "@typescript-eslint/types": "5.33.1",
- "@typescript-eslint/typescript-estree": "5.33.1",
+ "@typescript-eslint/scope-manager": "5.36.2",
+ "@typescript-eslint/types": "5.36.2",
+ "@typescript-eslint/typescript-estree": "5.36.2",
"debug": "^4.3.4"
}
},
"@typescript-eslint/scope-manager": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.33.1.tgz",
- "integrity": "sha512-8ibcZSqy4c5m69QpzJn8XQq9NnqAToC8OdH/W6IXPXv83vRyEDPYLdjAlUx8h/rbusq6MkW4YdQzURGOqsn3CA==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz",
+ "integrity": "sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==",
"requires": {
- "@typescript-eslint/types": "5.33.1",
- "@typescript-eslint/visitor-keys": "5.33.1"
+ "@typescript-eslint/types": "5.36.2",
+ "@typescript-eslint/visitor-keys": "5.36.2"
}
},
"@typescript-eslint/type-utils": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.33.1.tgz",
- "integrity": "sha512-X3pGsJsD8OiqhNa5fim41YtlnyiWMF/eKsEZGsHID2HcDqeSC5yr/uLOeph8rNF2/utwuI0IQoAK3fpoxcLl2g==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.36.2.tgz",
+ "integrity": "sha512-rPQtS5rfijUWLouhy6UmyNquKDPhQjKsaKH0WnY6hl/07lasj8gPaH2UD8xWkePn6SC+jW2i9c2DZVDnL+Dokw==",
"requires": {
- "@typescript-eslint/utils": "5.33.1",
+ "@typescript-eslint/typescript-estree": "5.36.2",
+ "@typescript-eslint/utils": "5.36.2",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
}
},
"@typescript-eslint/types": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.33.1.tgz",
- "integrity": "sha512-7K6MoQPQh6WVEkMrMW5QOA5FO+BOwzHSNd0j3+BlBwd6vtzfZceJ8xJ7Um2XDi/O3umS8/qDX6jdy2i7CijkwQ=="
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.36.2.tgz",
+ "integrity": "sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ=="
},
"@typescript-eslint/typescript-estree": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.33.1.tgz",
- "integrity": "sha512-JOAzJ4pJ+tHzA2pgsWQi4804XisPHOtbvwUyqsuuq8+y5B5GMZs7lI1xDWs6V2d7gE/Ez5bTGojSK12+IIPtXA==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz",
+ "integrity": "sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==",
"requires": {
- "@typescript-eslint/types": "5.33.1",
- "@typescript-eslint/visitor-keys": "5.33.1",
+ "@typescript-eslint/types": "5.36.2",
+ "@typescript-eslint/visitor-keys": "5.36.2",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -19786,14 +19838,14 @@
}
},
"@typescript-eslint/utils": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.33.1.tgz",
- "integrity": "sha512-uphZjkMaZ4fE8CR4dU7BquOV6u0doeQAr8n6cQenl/poMaIyJtBu8eys5uk6u5HiDH01Mj5lzbJ5SfeDz7oqMQ==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.36.2.tgz",
+ "integrity": "sha512-uNcopWonEITX96v9pefk9DC1bWMdkweeSsewJ6GeC7L6j2t0SJywisgkr9wUTtXk90fi2Eljj90HSHm3OGdGRg==",
"requires": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.33.1",
- "@typescript-eslint/types": "5.33.1",
- "@typescript-eslint/typescript-estree": "5.33.1",
+ "@typescript-eslint/scope-manager": "5.36.2",
+ "@typescript-eslint/types": "5.36.2",
+ "@typescript-eslint/typescript-estree": "5.36.2",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
},
@@ -19815,11 +19867,11 @@
}
},
"@typescript-eslint/visitor-keys": {
- "version": "5.33.1",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.33.1.tgz",
- "integrity": "sha512-nwIxOK8Z2MPWltLKMLOEZwmfBZReqUdbEoHQXeCpa+sRVARe5twpJGHCB4dk9903Yaf0nMAlGbQfaAH92F60eg==",
+ "version": "5.36.2",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz",
+ "integrity": "sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==",
"requires": {
- "@typescript-eslint/types": "5.33.1",
+ "@typescript-eslint/types": "5.36.2",
"eslint-visitor-keys": "^3.3.0"
}
},
@@ -20556,9 +20608,9 @@
}
},
"bonjour-service": {
- "version": "1.0.13",
- "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.13.tgz",
- "integrity": "sha512-LWKRU/7EqDUC9CTAQtuZl5HzBALoCYwtLhffW3et7vZMwv3bWLpJf8bRYlMD5OCcDpTfnPgNCV4yo9ZIaJGMiA==",
+ "version": "1.0.14",
+ "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
+ "integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
"requires": {
"array-flatten": "^2.1.2",
"dns-equal": "^1.0.0",
@@ -20672,9 +20724,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001380",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001380.tgz",
- "integrity": "sha512-OO+pPubxx16lkI7TVrbFpde8XHz66SMwstl1YWpg6uMGw56XnhYVwtPIjvX4kYpzwMwQKr4DDce394E03dQPGg=="
+ "version": "1.0.30001390",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz",
+ "integrity": "sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g=="
},
"case-sensitive-paths-webpack-plugin": {
"version": "2.4.0",
@@ -20940,14 +20992,14 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
},
"core-js": {
- "version": "3.24.1",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz",
- "integrity": "sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg=="
+ "version": "3.25.0",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz",
+ "integrity": "sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA=="
},
"core-js-compat": {
- "version": "3.24.1",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.24.1.tgz",
- "integrity": "sha512-XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw==",
+ "version": "3.25.0",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.0.tgz",
+ "integrity": "sha512-extKQM0g8/3GjFx9US12FAgx8KJawB7RCQ5y8ipYLbmfzEzmFRWdDjIlxDx82g7ygcNG85qMVUSRyABouELdow==",
"requires": {
"browserslist": "^4.21.3",
"semver": "7.0.0"
@@ -20961,9 +21013,9 @@
}
},
"core-js-pure": {
- "version": "3.24.1",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.24.1.tgz",
- "integrity": "sha512-r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg=="
+ "version": "3.25.0",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.0.tgz",
+ "integrity": "sha512-IeHpLwk3uoci37yoI2Laty59+YqH9x5uR65/yiA0ARAJrTrN4YU0rmauLWfvqOuk77SlNJXj2rM6oT/dBD87+A=="
},
"core-util-is": {
"version": "1.0.3",
@@ -21014,9 +21066,9 @@
}
},
"css-declaration-sorter": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz",
- "integrity": "sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og==",
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
+ "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
"requires": {}
},
"css-has-pseudo": {
@@ -21152,9 +21204,9 @@
"integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
},
"cssdb": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.0.0.tgz",
- "integrity": "sha512-HmRYATZ4Gf8naf6sZmwKEyf7MXAC0ZxjsamtNNgmuWpQgoO973zsE/1JMIohEYsSi5e3n7vQauCLv7TWSrOlrw=="
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.0.1.tgz",
+ "integrity": "sha512-pT3nzyGM78poCKLAEy2zWIVX2hikq6dIrjuZzLV98MumBg+xMTNYfHx7paUlfiRTgg91O/vR889CIf+qiv79Rw=="
},
"cssesc": {
"version": "3.0.0",
@@ -21574,9 +21626,9 @@
}
},
"electron-to-chromium": {
- "version": "1.4.225",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.225.tgz",
- "integrity": "sha512-ICHvGaCIQR3P88uK8aRtx8gmejbVJyC6bB4LEC3anzBrIzdzC7aiZHY4iFfXhN4st6I7lMO0x4sgBHf/7kBvRw=="
+ "version": "1.4.241",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.241.tgz",
+ "integrity": "sha512-e7Wsh4ilaioBZ5bMm6+F4V5c11dh56/5Jwz7Hl5Tu1J7cnB+Pqx5qIF2iC7HPpfyQMqGSvvLP5bBAIDd2gAtGw=="
},
"emittery": {
"version": "0.8.1",
@@ -21629,15 +21681,15 @@
}
},
"es-abstract": {
- "version": "1.20.1",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz",
- "integrity": "sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==",
+ "version": "1.20.2",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
+ "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
"requires": {
"call-bind": "^1.0.2",
"es-to-primitive": "^1.2.1",
"function-bind": "^1.1.1",
"function.prototype.name": "^1.1.5",
- "get-intrinsic": "^1.1.1",
+ "get-intrinsic": "^1.1.2",
"get-symbol-description": "^1.0.0",
"has": "^1.0.3",
"has-property-descriptors": "^1.0.0",
@@ -21649,9 +21701,9 @@
"is-shared-array-buffer": "^1.0.2",
"is-string": "^1.0.7",
"is-weakref": "^1.0.2",
- "object-inspect": "^1.12.0",
+ "object-inspect": "^1.12.2",
"object-keys": "^1.1.1",
- "object.assign": "^4.1.2",
+ "object.assign": "^4.1.4",
"regexp.prototype.flags": "^1.4.3",
"string.prototype.trimend": "^1.0.5",
"string.prototype.trimstart": "^1.0.5",
@@ -21757,13 +21809,14 @@
}
},
"eslint": {
- "version": "8.22.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.22.0.tgz",
- "integrity": "sha512-ci4t0sz6vSRKdmkOGmprBo6fmI4PrphDFMy5JEq/fNS0gQkJM3rLmrqcp8ipMcdobH3KtUP40KniAE9W19S4wA==",
+ "version": "8.23.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.0.tgz",
+ "integrity": "sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==",
"requires": {
- "@eslint/eslintrc": "^1.3.0",
+ "@eslint/eslintrc": "^1.3.1",
"@humanwhocodes/config-array": "^0.10.4",
"@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
+ "@humanwhocodes/module-importer": "^1.0.1",
"ajv": "^6.10.0",
"chalk": "^4.0.0",
"cross-spawn": "^7.0.2",
@@ -21773,7 +21826,7 @@
"eslint-scope": "^7.1.1",
"eslint-utils": "^3.0.0",
"eslint-visitor-keys": "^3.3.0",
- "espree": "^9.3.3",
+ "espree": "^9.4.0",
"esquery": "^1.4.0",
"esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3",
@@ -21798,8 +21851,7 @@
"regexpp": "^3.2.0",
"strip-ansi": "^6.0.1",
"strip-json-comments": "^3.1.0",
- "text-table": "^0.2.0",
- "v8-compile-cache": "^2.0.3"
+ "text-table": "^0.2.0"
},
"dependencies": {
"ansi-styles": {
@@ -22012,9 +22064,9 @@
}
},
"eslint-plugin-react": {
- "version": "7.30.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.30.1.tgz",
- "integrity": "sha512-NbEvI9jtqO46yJA3wcRF9Mo0lF9T/jhdHqhCHXiXtD+Zcb98812wvokjWpU7Q4QH5edo6dmqrukxVvWWXHlsUg==",
+ "version": "7.31.6",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.6.tgz",
+ "integrity": "sha512-CXu4eu28sb8Sd2+cyUYsJVyDvpTlaXPG+bOzzpS9IzZKtye96AYX3ZmHQ6ayn/OAIQ/ufDJP8ElPWd63Pepn9w==",
"requires": {
"array-includes": "^3.1.5",
"array.prototype.flatmap": "^1.3.0",
@@ -22059,9 +22111,9 @@
"requires": {}
},
"eslint-plugin-testing-library": {
- "version": "5.6.0",
- "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.6.0.tgz",
- "integrity": "sha512-y63TRzPhGCMNsnUwMGJU1MFWc/3GvYw+nzobp9QiyNTTKsgAt5RKAOT1I34+XqVBpX1lC8bScoOjCkP7iRv0Mw==",
+ "version": "5.6.1",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.6.1.tgz",
+ "integrity": "sha512-url6n7SbPg77TM2MLy1XkcrQEWiS5nKcDiJgwOYz2qGCEMywM7gizPzLi3XalJPdpIkQAo2BJFQZC6jggsyCuQ==",
"requires": {
"@typescript-eslint/utils": "^5.13.0"
}
@@ -22168,9 +22220,9 @@
}
},
"espree": {
- "version": "9.3.3",
- "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz",
- "integrity": "sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==",
+ "version": "9.4.0",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz",
+ "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==",
"requires": {
"acorn": "^8.8.0",
"acorn-jsx": "^5.3.2",
@@ -24624,9 +24676,9 @@
}
},
"@types/yargs": {
- "version": "17.0.11",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz",
- "integrity": "sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==",
+ "version": "17.0.12",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.12.tgz",
+ "integrity": "sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ==",
"requires": {
"@types/yargs-parser": "*"
}
@@ -25412,9 +25464,9 @@
}
},
"nwsapi": {
- "version": "2.2.1",
- "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.1.tgz",
- "integrity": "sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg=="
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz",
+ "integrity": "sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="
},
"object-assign": {
"version": "4.1.1",
@@ -26487,9 +26539,9 @@
"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
},
"promise": {
- "version": "8.1.0",
- "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
- "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
+ "version": "8.2.0",
+ "resolved": "https://registry.npmjs.org/promise/-/promise-8.2.0.tgz",
+ "integrity": "sha512-+CMAlLHqwRYwBMXKCP+o8ns7DN+xHDUiI+0nArsiJ9y+kJVPLFxEaSw6Ha9s9H0tftxg2Yzl25wqj9G7m5wLZg==",
"requires": {
"asap": "~2.0.6"
}
@@ -26559,6 +26611,11 @@
"side-channel": "^1.0.4"
}
},
+ "querystringify": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+ "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
+ },
"queue-microtask": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -26733,9 +26790,9 @@
"integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
},
"react-i18next": {
- "version": "11.18.4",
- "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.4.tgz",
- "integrity": "sha512-gK/AylAQC5DvCD5YLNCHW4PNzpCfrWIyVAXbSMl+/5QXzlDP8VdBoqE2s2niGHB+zIXwBV9hRXbDrVuupbgHcg==",
+ "version": "11.18.5",
+ "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.5.tgz",
+ "integrity": "sha512-cKcyuuzIv0YUZ4l9WORflVNuhISPAqQShOAsxwFyYuJoCA7HlLmHm7XnvO6hfAGmGpDNRhJHoBX8hG49Cb2xZQ==",
"requires": {
"@babel/runtime": "^7.14.5",
"html-parse-stringify": "^3.0.1"
@@ -27094,9 +27151,9 @@
}
},
"rollup": {
- "version": "2.78.1",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.78.1.tgz",
- "integrity": "sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg==",
+ "version": "2.79.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.0.tgz",
+ "integrity": "sha512-x4KsrCgwQ7ZJPcFA/SUu6QVcYlO7uRLfLAy0DSA4NS2eG8japdbpM50ToH7z4iObodRYOJ0soneF0iaQRJ6zhA==",
"requires": {
"fsevents": "~2.3.2"
}
@@ -27876,9 +27933,9 @@
}
},
"terser": {
- "version": "5.14.2",
- "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz",
- "integrity": "sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==",
+ "version": "5.15.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.0.tgz",
+ "integrity": "sha512-L1BJiXVmheAQQy+as0oF3Pwtlo4s3Wi1X2zNZ2NxOB4wx9bdS9Vk67XQENLFdLYGCK/Z2di53mTj/hBafR+dTA==",
"requires": {
"@jridgewell/source-map": "^0.3.2",
"acorn": "^8.5.0",
@@ -27894,9 +27951,9 @@
}
},
"terser-webpack-plugin": {
- "version": "5.3.5",
- "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.5.tgz",
- "integrity": "sha512-AOEDLDxD2zylUGf/wxHxklEkOe2/r+seuyOWujejFrIxHf11brA1/dWQNIgXa1c6/Wkxgu7zvv0JhOWfc2ELEA==",
+ "version": "5.3.6",
+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
+ "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
"requires": {
"@jridgewell/trace-mapping": "^0.3.14",
"jest-worker": "^27.4.5",
@@ -27959,19 +28016,20 @@
"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="
},
"tough-cookie": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
- "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
+ "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
"requires": {
"psl": "^1.1.33",
"punycode": "^2.1.1",
- "universalify": "^0.1.2"
+ "universalify": "^0.2.0",
+ "url-parse": "^1.5.3"
},
"dependencies": {
"universalify": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
- "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+ "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
}
}
},
@@ -28067,9 +28125,9 @@
}
},
"typescript": {
- "version": "4.7.4",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz",
- "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==",
+ "version": "4.8.2",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
+ "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
"peer": true
},
"unbox-primitive": {
@@ -28136,9 +28194,9 @@
"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
},
"update-browserslist-db": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz",
- "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==",
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz",
+ "integrity": "sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg==",
"requires": {
"escalade": "^3.1.1",
"picocolors": "^1.0.0"
@@ -28152,6 +28210,15 @@
"punycode": "^2.1.0"
}
},
+ "url-parse": {
+ "version": "1.5.10",
+ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+ "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+ "requires": {
+ "querystringify": "^2.1.1",
+ "requires-port": "^1.0.0"
+ }
+ },
"util-deprecate": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -28183,11 +28250,6 @@
"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
},
- "v8-compile-cache": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
- "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
- },
"v8-to-istanbul": {
"version": "8.1.1",
"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
@@ -28363,9 +28425,9 @@
}
},
"webpack-dev-server": {
- "version": "4.10.0",
- "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.10.0.tgz",
- "integrity": "sha512-7dezwAs+k6yXVFZ+MaL8VnE+APobiO3zvpp3rBHe/HmWQ+avwh0Q3d0xxacOiBybZZ3syTZw9HXzpa3YNbAZDQ==",
+ "version": "4.10.1",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.10.1.tgz",
+ "integrity": "sha512-FIzMq3jbBarz3ld9l7rbM7m6Rj1lOsgq/DyLGMX/fPEB1UBUPtf5iL/4eNfhx8YYJTRlzfv107UfWSWcBK5Odw==",
"requires": {
"@types/bonjour": "^3.5.9",
"@types/connect-history-api-fallback": "^1.3.5",
From c84d10a6dfed2348f140c4823dca858b842c85e5 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Mon, 5 Sep 2022 15:17:00 -0400
Subject: [PATCH 35/63] Bump releases page
---
docs/releases.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/docs/releases.md b/docs/releases.md
index 5b64ab3d..d02c9670 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -37,6 +37,7 @@ Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up s
* Subscription display name for the web app ([#348](https://github.com/binwiederhier/ntfy/pull/348))
* Allow setting socket permissions via `--listen-unix-mode` ([#356](https://github.com/binwiederhier/ntfy/pull/356), thanks to [@koro666](https://github.com/koro666))
* CLI: Allow default username/password in `client.yml` ([#372](https://github.com/binwiederhier/ntfy/pull/372), thanks to [@wunter8](https://github.com/wunter8))
+* Build support for other Unix systems ([#393](https://github.com/binwiederhier/ntfy/pull/393), thanks to [@la-ninpre](https://github.com/la-ninpre))
**Bugs:**
From 97a55babe160438d9751476429c2df447644153d Mon Sep 17 00:00:00 2001
From: Vladimir Kopitsa <v.kopitsa@gmail.com>
Date: Thu, 8 Sep 2022 15:07:29 +0200
Subject: [PATCH 36/63] Added translation using Weblate (Ukrainian)
---
web/public/static/langs/uk.json | 1 +
1 file changed, 1 insertion(+)
create mode 100644 web/public/static/langs/uk.json
diff --git a/web/public/static/langs/uk.json b/web/public/static/langs/uk.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/web/public/static/langs/uk.json
@@ -0,0 +1 @@
+{}
From 42c0dbab65aeac386cdfb3b3f2c87d181ab1f176 Mon Sep 17 00:00:00 2001
From: Vladimir Kopitsa <v.kopitsa@gmail.com>
Date: Thu, 8 Sep 2022 13:10:56 +0000
Subject: [PATCH 37/63] Translated using Weblate (Ukrainian)
Currently translated at 100.0% (189 of 189 strings)
Translation: ntfy/Web app
Translate-URL: https://hosted.weblate.org/projects/ntfy/web/uk/
---
web/public/static/langs/uk.json | 192 +++++++++++++++++++++++++++++++-
1 file changed, 191 insertions(+), 1 deletion(-)
diff --git a/web/public/static/langs/uk.json b/web/public/static/langs/uk.json
index 0967ef42..9420b8d5 100644
--- a/web/public/static/langs/uk.json
+++ b/web/public/static/langs/uk.json
@@ -1 +1,191 @@
-{}
+{
+ "action_bar_logo_alt": "логотип ntfy",
+ "action_bar_settings": "Налаштування",
+ "message_bar_type_message": "Введіть повідомлення тут",
+ "message_bar_error_publishing": "Помилка публікації сповіщення",
+ "message_bar_show_dialog": "Показати діалогове вікно публікації",
+ "nav_topics_title": "Підписки на теми",
+ "nav_button_settings": "Налаштування",
+ "nav_button_documentation": "Документація",
+ "nav_button_subscribe": "Підписатися на тему",
+ "nav_button_muted": "Сповіщення вимкнено",
+ "nav_button_connecting": "підключення",
+ "alert_grant_title": "Сповіщення вимкнено",
+ "alert_grant_description": "Дозвольте браузеру показувати сповіщення.",
+ "alert_grant_button": "Дозволити",
+ "alert_not_supported_title": "Сповіщення не підтримуються",
+ "notifications_list_item": "Сповіщення",
+ "notifications_attachment_image": "Прикріплене зображення",
+ "notifications_attachment_open_title": "Перейти на {{url}}",
+ "notifications_attachment_open_button": "Відкрити вкладення",
+ "notifications_attachment_link_expires": "термін дії посилання закінчується {{date}}",
+ "notifications_actions_http_request_title": "Надіслати HTTP {{method}} на {{url}}",
+ "notifications_none_for_any_title": "Ви не отримали жодних сповіщень.",
+ "notifications_no_subscriptions_description": "Натисніть \"{{linktext}}\" посилання, щоб створити або підписатися на тему. Після цього ви зможете надсилати повідомлення за допомогою PUT або POST, і ви отримуватимете тут повідомлення.",
+ "notifications_more_details": "Додаткову інформацію можна знайти на <websiteLink>сайті</websiteLink> або в <docsLink>документації</docsLink>.",
+ "notifications_loading": "Завантаження сповіщень…",
+ "publish_dialog_title_topic": "Опублікувати в {{topic}}",
+ "publish_dialog_title_no_topic": "Опублікувати сповіщення",
+ "publish_dialog_progress_uploading": "Завантаження…",
+ "publish_dialog_message_published": "Сповіщення опубліковано",
+ "publish_dialog_attachment_limits_quota_reached": "перевищує квоту, залишилося {{remainingBytes}}",
+ "publish_dialog_priority_low": "Низький пріоритет",
+ "publish_dialog_topic_label": "Назва теми",
+ "publish_dialog_topic_placeholder": "Назва теми, наприклад phil_alerts",
+ "publish_dialog_topic_reset": "Скинути тему",
+ "publish_dialog_title_label": "Заголовок",
+ "publish_dialog_title_placeholder": "Заголовок сповіщення, наприклад Сповіщення про дисковий простір",
+ "publish_dialog_message_label": "Повідомлення",
+ "publish_dialog_message_placeholder": "Введіть повідомлення",
+ "publish_dialog_tags_label": "Теги",
+ "publish_dialog_tags_placeholder": "Список тегів розділений комою, наприклад warning, srv1-backup",
+ "publish_dialog_click_placeholder": "URL-адреса, яка відкривається після натискання сповіщення",
+ "publish_dialog_email_label": "Електронна пошта",
+ "publish_dialog_attach_placeholder": "Прикріпіть файл за URL-адресою, наприклад https://f-droid.org/F-Droid.apk",
+ "publish_dialog_attach_reset": "Видалити URL вкладення",
+ "publish_dialog_filename_placeholder": "Ім'я файлу вкладення",
+ "publish_dialog_delay_reset": "Видалити затримку доставлення",
+ "publish_dialog_chip_click_label": "Адреса",
+ "publish_dialog_chip_email_label": "Переслати на електронну пошту",
+ "publish_dialog_chip_topic_label": "Змінити тему",
+ "publish_dialog_attached_file_remove": "Видалити прикріплений файл",
+ "subscribe_dialog_subscribe_topic_placeholder": "Назва теми, наприклад phil_alerts",
+ "subscribe_dialog_subscribe_use_another_label": "Використовувати інший сервер",
+ "subscribe_dialog_subscribe_base_url_label": "URL служби",
+ "subscribe_dialog_login_password_label": "Пароль",
+ "subscribe_dialog_login_button_back": "Назад",
+ "subscribe_dialog_error_user_not_authorized": "{{username}} користувач не авторизований",
+ "prefs_notifications_sound_description_none": "Сповіщення не відтворюють жодного звуку при надходженні",
+ "prefs_notifications_sound_description_some": "Сповіщення відтворюють звук {{sound}}",
+ "prefs_notifications_min_priority_description_any": "Показати всі сповіщень, незалежно від пріоритету",
+ "prefs_notifications_min_priority_any": "Будь-який пріоритет",
+ "prefs_notifications_min_priority_default_and_higher": "Пріоритет за замовчуванням та високий",
+ "prefs_notifications_delete_after_title": "Видалити сповіщення",
+ "prefs_notifications_delete_after_never": "Ніколи",
+ "prefs_notifications_delete_after_one_day": "Через день",
+ "prefs_notifications_delete_after_one_week": "Через тиждень",
+ "prefs_notifications_delete_after_one_month": "Через місяць",
+ "prefs_notifications_delete_after_never_description": "Сповіщення ніколи не видаляються автоматично",
+ "prefs_notifications_delete_after_three_hours_description": "Сповіщення автоматично видаляються через три години",
+ "prefs_notifications_delete_after_one_day_description": "Сповіщення автоматично видаляються через один день",
+ "prefs_notifications_delete_after_one_week_description": "Сповіщення автоматично видаляються через тиждень",
+ "prefs_notifications_delete_after_one_month_description": "Сповіщення автоматично видаляються через місяць",
+ "prefs_users_title": "Керувати користувачами",
+ "prefs_users_table": "Таблиця користувачів",
+ "prefs_users_edit_button": "Редагувати користувача",
+ "prefs_users_dialog_button_save": "Зберегти",
+ "prefs_appearance_title": "Зовнішній вигляд",
+ "priority_default": "за замовчуванням",
+ "priority_high": "високий",
+ "priority_max": "макс",
+ "error_boundary_title": "Ой, ntfy впав",
+ "error_boundary_button_copy_stack_trace": "Копіювати трасування стека",
+ "action_bar_show_menu": "Показати меню",
+ "action_bar_toggle_action_menu": "Відкрити/закрити меню",
+ "action_bar_send_test_notification": "Надіслати тестове сповіщення",
+ "action_bar_clear_notifications": "Очистити всі сповіщення",
+ "action_bar_toggle_mute": "Вимкнути/увімкнути сповіщення",
+ "action_bar_unsubscribe": "Відписатися",
+ "message_bar_publish": "Опублікувати повідомлення",
+ "nav_button_all_notifications": "Усі сповіщення",
+ "alert_not_supported_description": "Ваш браузер не підтримує сповіщення.",
+ "notifications_list": "Список сповіщень",
+ "notifications_mark_read": "Позначити як прочитане",
+ "notifications_delete": "Видалити",
+ "notifications_tags": "Теги",
+ "nav_button_publish_message": "Опублікувати сповіщення",
+ "notifications_attachment_copy_url_title": "Копіювати URL-адресу вкладення",
+ "notifications_attachment_link_expired": "термін дії посилання для завантаження закінчився",
+ "publish_dialog_progress_uploading_detail": "Завантажується {{loaded}}/{{total}} ({{percent}}%) …",
+ "notifications_priority_x": "Пріоритет {{priority}}",
+ "notifications_attachment_copy_url_button": "Копіювати URL-адресу",
+ "notifications_copied_to_clipboard": "Скопійовано в буфер обміну",
+ "notifications_attachment_file_video": "відео файл",
+ "notifications_attachment_file_audio": "звуковий файл",
+ "publish_dialog_emoji_picker_show": "Виберіть емодзі",
+ "notifications_new_indicator": "Нове сповіщення",
+ "notifications_attachment_file_image": "файл зображення",
+ "notifications_attachment_file_document": "інший документ",
+ "notifications_click_copy_url_title": "Копіювати URL-адресу посилання",
+ "notifications_click_copy_url_button": "Копіювати посилання",
+ "notifications_actions_not_supported": "Дія не підтримується у браузері",
+ "notifications_attachment_file_app": "Файл програми Android",
+ "notifications_click_open_button": "Відкрити посилання",
+ "notifications_actions_open_url_title": "Перейти на {{url}}",
+ "notifications_none_for_topic_description": "Щоб надіслати сповіщення до цієї теми, просто надішліть PUT або POST на URL-адресу цієї теми.",
+ "notifications_no_subscriptions_title": "Схоже, у вас ще немає жодної підписки.",
+ "publish_dialog_drop_file_here": "Перетягніть файл сюди",
+ "notifications_none_for_topic_title": "Ви ще не отримували сповіщення на цю тему.",
+ "notifications_example": "Приклад",
+ "notifications_none_for_any_description": "Щоб надіслати сповіщення до теми, просто надішліть PUT або POST на URL-адресу теми. Ось приклад, використовуючи одну з ваших тем.",
+ "publish_dialog_attachment_limits_file_and_quota_reached": "перевищує {{fileSizeLimit}} розмір файлу, {{remainingBytes}} залишилося",
+ "publish_dialog_priority_default": "Пріоритет за замовчуванням",
+ "publish_dialog_attachment_limits_file_reached": "перевищує {{fileSizeLimit}} розмір файлу",
+ "publish_dialog_priority_min": "Мін. пріоритет",
+ "publish_dialog_priority_high": "Високий пріоритет",
+ "publish_dialog_priority_max": "Макс. пріоритет",
+ "publish_dialog_base_url_placeholder": "URL-адреса сервісу, наприклад https://example.com",
+ "publish_dialog_base_url_label": "URL служби",
+ "publish_dialog_other_features": "Інші можливості:",
+ "publish_dialog_chip_attach_file_label": "Прикріпити локальний файл",
+ "publish_dialog_priority_label": "Пріоритет",
+ "publish_dialog_click_label": "Натисніть URL",
+ "publish_dialog_click_reset": "Видалити URL-адресу для натискання",
+ "publish_dialog_email_placeholder": "Адреса для пересилання сповіщення, наприклад phil@example.com",
+ "publish_dialog_attach_label": "URL-адреса вкладення",
+ "publish_dialog_filename_label": "Ім'я файлу",
+ "publish_dialog_delay_label": "Затримка",
+ "publish_dialog_email_reset": "Видалити пересилання електронної пошти",
+ "publish_dialog_chip_attach_url_label": "Прикріпити файл за URL",
+ "publish_dialog_details_examples_description": "Приклади та докладний опис усіх функцій, зверніться до <docsLink>документації</docsLink>.",
+ "publish_dialog_button_cancel_sending": "Скасувати відправку",
+ "publish_dialog_attached_file_filename_placeholder": "Ім'я прикріпленого файлу",
+ "publish_dialog_delay_placeholder": "Затримка доставлення, наприклад {{unixTimestamp}}, {{relativeTime}} або \"{{naturalLanguage}}\" (лише англійською)",
+ "publish_dialog_button_send": "Надіслати",
+ "publish_dialog_checkbox_publish_another": "Опублікувати ще",
+ "publish_dialog_chip_delay_label": "Затримка доставлення",
+ "publish_dialog_button_cancel": "Скасувати",
+ "publish_dialog_attached_file_title": "Прикріплений файл:",
+ "subscribe_dialog_subscribe_description": "Теми можуть не бути захищені паролем, тому виберіть назву, яку нелегко вгадати. Після підписки ви можете PUT/POST сповіщення.",
+ "emoji_picker_search_placeholder": "Пошук емодзі",
+ "emoji_picker_search_clear": "Очистити пошук",
+ "subscribe_dialog_subscribe_title": "Підпишіться на тему",
+ "subscribe_dialog_login_username_label": "Ім'я користувача, наприклад phil",
+ "prefs_notifications_title": "Сповіщення",
+ "subscribe_dialog_subscribe_button_cancel": "Скасувати",
+ "subscribe_dialog_subscribe_button_subscribe": "Підписатися",
+ "subscribe_dialog_error_user_anonymous": "анонімний",
+ "subscribe_dialog_login_title": "Потрібна авторизація",
+ "subscribe_dialog_login_description": "Ця тема захищена паролем. Будь ласка, введіть ім'я користувача та пароль, щоб підписатися.",
+ "prefs_notifications_sound_title": "Звук сповіщення",
+ "subscribe_dialog_login_button_login": "Логін",
+ "prefs_notifications_sound_no_sound": "Без звука",
+ "prefs_notifications_sound_play": "Відтворення вибраного звуку",
+ "prefs_users_description": "Додайте/видаляйте користувачів для захищених тем. Зверніть увагу, що ім'я користувача та пароль зберігаються у локальному сховищі браузера.",
+ "prefs_notifications_min_priority_title": "Мінімальний пріоритет",
+ "prefs_notifications_min_priority_high_and_higher": "Високий пріоритет і вище",
+ "prefs_notifications_min_priority_description_x_or_higher": "Показувати сповіщення, якщо пріоритет {{number}} ({{name}}) або вище",
+ "prefs_notifications_min_priority_description_max": "Показувати сповіщення, якщо пріоритет 5 (макс.)",
+ "prefs_notifications_min_priority_low_and_higher": "Низький та високий пріоритет",
+ "prefs_notifications_min_priority_max_only": "Тільки максимальний пріоритет",
+ "prefs_users_table_base_url_header": "URL служби",
+ "prefs_users_dialog_password_label": "Пароль",
+ "prefs_notifications_delete_after_three_hours": "Через три години",
+ "prefs_users_add_button": "Додати користувача",
+ "prefs_users_dialog_title_edit": "Редагувати користувача",
+ "prefs_users_dialog_base_url_label": "URL-адреса служби, наприклад https://ntfy.sh",
+ "prefs_users_delete_button": "Видалити користувача",
+ "prefs_users_table_user_header": "Користувач",
+ "prefs_users_dialog_title_add": "Додати користувача",
+ "prefs_users_dialog_username_label": "Ім'я користувача, наприклад phil",
+ "prefs_users_dialog_button_cancel": "Скасувати",
+ "prefs_users_dialog_button_add": "Додати",
+ "prefs_appearance_language_title": "Мова",
+ "error_boundary_gathering_info": "Зберіть більше інформації…",
+ "priority_min": "мін",
+ "error_boundary_description": "Очевидно, цього не повинно статися. Дуже шкода.<br/>Якщо у вас є хвилина, <githubLink>повідомте про це на GitHub</githubLink> або повідомте нам через <discordLink>Discord</discordLink> або <matrixLink>Matrix</matrixLink> .",
+ "priority_low": "низький",
+ "error_boundary_stack_trace": "Трасування стека",
+ "error_boundary_unsupported_indexeddb_title": "Приватний перегляд не підтримується",
+ "error_boundary_unsupported_indexeddb_description": "Веб-програма ntfy потребує IndexedDB для роботи, а ваш браузер не підтримує IndexedDB у режимі приватного перегляду.<br/><br/>На жаль, використання ntfy web не має сенсу у режимі приватного перегляду, оскільки все зберігається в пам’яті браузера. Ви можете прочитати більше про це <githubLink>у цьому випуску GitHub</githubLink> або поспілкуватися з нами на <discordLink>Discord</discordLink> або <matrixLink>Matrix</matrixLink>."
+}
From 38c3b1fbf734e97cb3df166c47a719de6865eefc Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sat, 10 Sep 2022 23:19:35 -0400
Subject: [PATCH 38/63] Release notes
---
docs/releases.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/releases.md b/docs/releases.md
index b615b034..235fc854 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -36,13 +36,13 @@ Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up s
* Subscription display name for the web app ([#348](https://github.com/binwiederhier/ntfy/pull/348))
* Allow setting socket permissions via `--listen-unix-mode` ([#356](https://github.com/binwiederhier/ntfy/pull/356), thanks to [@koro666](https://github.com/koro666))
+* Icons can be set for each individual notification ([#126](https://github.com/binwiederhier/ntfy/issues/126), thanks to [@wunter8](https://github.com/wunter8))
**Bugs:**
* `ntfy user` commands don't work with `auth_file` but works with `auth-file` ([#344](https://github.com/binwiederhier/ntfy/issues/344), thanks to [@Histalek](https://github.com/Histalek) for reporting)
* Ignore new draft HTTP `Priority` header ([#351](https://github.com/binwiederhier/ntfy/issues/351), thanks to [@ksurl](https://github.com/ksurl) for reporting)
* Delete expired attachments based on mod time instead of DB entry to avoid races (no ticket)
-* Icons can be set for each individual notification ([#126](https://github.com/binwiederhier/ntfy/issues/126), thanks to [@wunter8](https://github.com/wunter8))
**Documentation:**
From 23a127d20b73b5fff0675d7170eafa1bc65c3614 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sun, 11 Sep 2022 16:25:40 -0400
Subject: [PATCH 39/63] Docs
---
docs/publish.md | 72 ++++++++++++++------
docs/releases.md | 5 +-
docs/static/img/android-screenshot-icon.png | Bin 39513 -> 28493 bytes
3 files changed, 51 insertions(+), 26 deletions(-)
diff --git a/docs/publish.md b/docs/publish.md
index d1dd9313..491327d9 100644
--- a/docs/publish.md
+++ b/docs/publish.md
@@ -2220,8 +2220,8 @@ Here's an example showing how to upload an image:
Host: ntfy.sh
Filename: flower.jpg
Content-Type: 52312
-
- <binary JPEG data>
+
+ (binary JPEG data)
```
=== "JavaScript"
@@ -2354,69 +2354,97 @@ _Supported on:_ :material-android:
You can include an icon that will appear next to the text of the notification. Simply pass the `X-Icon` header or query
parameter (or its alias `Icon`) to specify the URL that the icon is located at. The client will automatically download
-the icon (up to 300KB) and show it in the notification. Only jpeg and png images are supported at this time.
+the icon (unless it is already cached locally, and less than 24 hours old), and show it in the notification. Icons are
+cached locally in the client until the notification is deleted. **Only JPEG and PNG images are supported at this time**.
Here's an example showing how to include an icon:
=== "Command line (curl)"
```
curl \
- -X POST \
- -H "Icon: https://ntfy.sh/docs/static/img/ntfy.png" \
- ntfy.sh/customIcons
+ -H "Icon: https://styles.redditmedia.com/t5_32uhe/styles/communityIcon_xnt6chtnr2j21.png" \
+ -H "Title: Kodi: Resuming Playback" \
+ -H "Tags: arrow_forward" \
+ -d "The Wire, S01E01" \
+ ntfy.sh/tvshows
```
=== "ntfy CLI"
```
ntfy publish \
- --icon="https://ntfy.sh/docs/static/img/ntfy.png" \
- customIcons
+ --icon="https://styles.redditmedia.com/t5_32uhe/styles/communityIcon_xnt6chtnr2j21.png" \
+ --title="Kodi: Resuming Playback" \
+ --tags="arrow_forward" \
+ tvshows \
+ "The Wire, S01E01"
```
=== "HTTP"
``` http
- POST /customIcons HTTP/1.1
+ POST /tvshows HTTP/1.1
Host: ntfy.sh
- Icon: https://ntfy.sh/docs/static/img/ntfy.png
+ Icon: https://styles.redditmedia.com/t5_32uhe/styles/communityIcon_xnt6chtnr2j21.png
+ Tags: arrow_forward
+ Title: Kodi: Resuming Playback
+
+ The Wire, S01E01
```
=== "JavaScript"
``` javascript
- fetch('https://ntfy.sh/customIcons', {
+ fetch('https://ntfy.sh/tvshows', {
method: 'POST',
- headers: { 'Icon': 'https://ntfy.sh/docs/static/img/ntfy.png' }
+ headers: {
+ 'Icon': 'https://styles.redditmedia.com/t5_32uhe/styles/communityIcon_xnt6chtnr2j21.png',
+ 'Title': 'Kodi: Resuming Playback',
+ 'Tags': 'arrow_forward'
+ },
+ body: "The Wire, S01E01"
})
```
=== "Go"
``` go
- req, _ := http.NewRequest("POST", "https://ntfy.sh/customIcons", file)
- req.Header.Set("Icon", "https://ntfy.sh/docs/static/img/ntfy.png")
+ req, _ := http.NewRequest("POST", "https://ntfy.sh/tvshows", strings.NewReader("The Wire, S01E01"))
+ req.Header.Set("Icon", "https://styles.redditmedia.com/t5_32uhe/styles/communityIcon_xnt6chtnr2j21.png")
+ req.Header.Set("Tags", "arrow_forward")
+ req.Header.Set("Title", "Kodi: Resuming Playback")
http.DefaultClient.Do(req)
```
=== "PowerShell"
``` powershell
- $uri = "https://ntfy.sh/customIcons"
- $headers = @{ Icon="https://ntfy.sh/docs/static/img/ntfy.png" }
- Invoke-RestMethod -Method 'Post' -Uri $uri -Headers $headers -UseBasicParsing
+ $uri = "https://ntfy.sh/tvshows"
+ $headers = @{ Title"="Kodi: Resuming Playback"
+ Tags="arrow_forward"
+ Icon="https://styles.redditmedia.com/t5_32uhe/styles/communityIcon_xnt6chtnr2j21.png" }
+ $body = "The Wire, S01E01"
+ Invoke-RestMethod -Method 'Post' -Uri $uri -Headers $headers -Body $body -UseBasicParsing
```
=== "Python"
``` python
- requests.put("https://ntfy.sh/customIcons",
- headers={ "Icon": "https://ntfy.sh/docs/static/img/ntfy.png" })
+ requests.post("https://ntfy.sh/tvshows",
+ data="The Wire, S01E01",
+ headers={
+ "Title": "Kodi: Resuming Playback",
+ "Tags": "arrow_forward",
+ "Icon": "https://styles.redditmedia.com/t5_32uhe/styles/communityIcon_xnt6chtnr2j21.png"
+ })
```
=== "PHP"
``` php-inline
- file_get_contents('https://ntfy.sh/customIcons', false, stream_context_create([
+ file_get_contents('https://ntfy.sh/tvshows', false, stream_context_create([
'http' => [
'method' => 'PUT',
'header' =>
"Content-Type: text/plain\r\n" . // Does not matter
- "Icon: https://ntfy.sh/docs/static/img/ntfy.png",
- ]
+ "Title: Kodi: Resuming Playback\r\n" .
+ "Tags: arrow_forward\r\n" .
+ "Icon: https://styles.redditmedia.com/t5_32uhe/styles/communityIcon_xnt6chtnr2j21.png",
+ ],
+ 'content' => "The Wire, S01E01"
]));
```
diff --git a/docs/releases.md b/docs/releases.md
index 20c48a58..d1efe1cb 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -2,8 +2,6 @@
Binaries for all releases can be found on the GitHub releases pages for the [ntfy server](https://github.com/binwiederhier/ntfy/releases)
and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/releases).
-<!--
-
## ntfy Android app v1.14.0 (UNRELEASED)
**Features:**
@@ -26,11 +24,10 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
* Italian (thanks to [@Genio2003](https://hosted.weblate.org/user/Genio2003/))
* Dutch (thanks to [@SchoNie](https://hosted.weblate.org/user/SchoNie/))
+* Ukranian (thanks to [@v.kopitsa](https://hosted.weblate.org/user/v.kopitsa/))
Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up some Android tickets, and fixing them! You rock!
--->
-
## ntfy server v1.28.0 (UNRELEASED)
**Features:**
diff --git a/docs/static/img/android-screenshot-icon.png b/docs/static/img/android-screenshot-icon.png
index 9d9ffb2ad15d4ba3ff07d3ea52c51766a92563cc..68c57a16910a15c7a73511e75b6dc35a38dd1f1e 100644
GIT binary patch
literal 28493
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
Q(0{d4Rn$aO$y<j12M*k+G5`Po
literal 39513
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
Nw{(qkDz4c_{ttR=b!z|s
From 6476978a2e0cc5bed80c65af7c5e34cef04d5da9 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sun, 11 Sep 2022 16:31:39 -0400
Subject: [PATCH 40/63] Move things
---
server/message_cache.go | 22 +++++++++++-----------
server/server_firebase.go | 2 +-
server/types.go | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/server/message_cache.go b/server/message_cache.go
index f37e5a9d..a2f49e75 100644
--- a/server/message_cache.go
+++ b/server/message_cache.go
@@ -30,6 +30,7 @@ const (
priority INT NOT NULL,
tags TEXT NOT NULL,
click TEXT NOT NULL,
+ icon TEXT NOT NULL,
actions TEXT NOT NULL,
attachment_name TEXT NOT NULL,
attachment_type TEXT NOT NULL,
@@ -38,45 +39,44 @@ const (
attachment_url TEXT NOT NULL,
sender TEXT NOT NULL,
encoding TEXT NOT NULL,
- published INT NOT NULL,
- icon TEXT NOT NULL
+ published INT NOT NULL
);
CREATE INDEX IF NOT EXISTS idx_mid ON messages (mid);
CREATE INDEX IF NOT EXISTS idx_topic ON messages (topic);
COMMIT;
`
insertMessageQuery = `
- INSERT INTO messages (mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, published, icon)
+ INSERT INTO messages (mid, time, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, published)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
`
pruneMessagesQuery = `DELETE FROM messages WHERE time < ? AND published = 1`
selectRowIDFromMessageID = `SELECT id FROM messages WHERE mid = ?` // Do not include topic, see #336 and TestServer_PollSinceID_MultipleTopics
selectMessagesSinceTimeQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon
+ SELECT mid, time, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding
FROM messages
WHERE topic = ? AND time >= ? AND published = 1
ORDER BY time, id
`
selectMessagesSinceTimeIncludeScheduledQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon
+ SELECT mid, time, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding
FROM messages
WHERE topic = ? AND time >= ?
ORDER BY time, id
`
selectMessagesSinceIDQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon
+ SELECT mid, time, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding
FROM messages
WHERE topic = ? AND id > ? AND published = 1
ORDER BY time, id
`
selectMessagesSinceIDIncludeScheduledQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon
+ SELECT mid, time, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding
FROM messages
WHERE topic = ? AND (id > ? OR published = 0)
ORDER BY time, id
`
selectMessagesDueQuery = `
- SELECT mid, time, topic, message, title, priority, tags, click, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding, icon
+ SELECT mid, time, topic, message, title, priority, tags, click, icon, actions, attachment_name, attachment_type, attachment_size, attachment_expires, attachment_url, sender, encoding
FROM messages
WHERE time <= ? AND published = 0
ORDER BY time, id
@@ -272,6 +272,7 @@ func (c *messageCache) addMessages(ms []*message) error {
m.Priority,
tags,
m.Click,
+ m.Icon,
actionsStr,
attachmentName,
attachmentType,
@@ -281,7 +282,6 @@ func (c *messageCache) addMessages(ms []*message) error {
m.Sender,
m.Encoding,
published,
- m.Icon,
)
if err != nil {
return err
@@ -421,7 +421,7 @@ func readMessages(rows *sql.Rows) ([]*message, error) {
for rows.Next() {
var timestamp, attachmentSize, attachmentExpires int64
var priority int
- var id, topic, msg, title, tagsStr, click, actionsStr, attachmentName, attachmentType, attachmentURL, sender, encoding, icon string
+ var id, topic, msg, title, tagsStr, click, icon, actionsStr, attachmentName, attachmentType, attachmentURL, sender, encoding string
err := rows.Scan(
&id,
×tamp,
@@ -431,6 +431,7 @@ func readMessages(rows *sql.Rows) ([]*message, error) {
&priority,
&tagsStr,
&click,
+ &icon,
&actionsStr,
&attachmentName,
&attachmentType,
@@ -439,7 +440,6 @@ func readMessages(rows *sql.Rows) ([]*message, error) {
&attachmentURL,
&sender,
&encoding,
- &icon,
)
if err != nil {
return nil, err
diff --git a/server/server_firebase.go b/server/server_firebase.go
index ec3e6112..15d78952 100644
--- a/server/server_firebase.go
+++ b/server/server_firebase.go
@@ -148,10 +148,10 @@ func toFirebaseMessage(m *message, auther auth.Auther) (*messaging.Message, erro
"priority": fmt.Sprintf("%d", m.Priority),
"tags": strings.Join(m.Tags, ","),
"click": m.Click,
+ "icon": m.Icon,
"title": m.Title,
"message": m.Message,
"encoding": m.Encoding,
- "icon": m.Icon,
}
if len(m.Actions) > 0 {
actions, err := json.Marshal(m.Actions)
diff --git a/server/types.go b/server/types.go
index 7a5badf8..b502dcd7 100644
--- a/server/types.go
+++ b/server/types.go
@@ -29,9 +29,9 @@ type message struct {
Priority int `json:"priority,omitempty"`
Tags []string `json:"tags,omitempty"`
Click string `json:"click,omitempty"`
+ Icon string `json:"icon,omitempty"`
Actions []*action `json:"actions,omitempty"`
Attachment *attachment `json:"attachment,omitempty"`
- Icon string `json:"icon,omitempty"`
PollID string `json:"poll_id,omitempty"`
Sender string `json:"-"` // IP address of uploader, used for rate limiting
Encoding string `json:"encoding,omitempty"` // empty for raw UTF-8, or "base64" for encoded bytes
@@ -73,9 +73,9 @@ type publishMessage struct {
Priority int `json:"priority"`
Tags []string `json:"tags"`
Click string `json:"click"`
+ Icon string `json:"icon"`
Actions []action `json:"actions"`
Attach string `json:"attach"`
- Icon string `json:"icon"`
Filename string `json:"filename"`
Email string `json:"email"`
Delay string `json:"delay"`
From ed4cc86c5c28633e4a8809e5aa1af8be7bc903f0 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Mon, 12 Sep 2022 14:17:33 -0400
Subject: [PATCH 41/63] Add whitelisting logic for nginx to docs
---
docs/config.md | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/docs/config.md b/docs/config.md
index 6908c469..c5c50b99 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -805,9 +805,25 @@ and [here](https://easyengine.io/tutorials/nginx/block-wp-login-php-bruteforce-a
=== "/etc/nginx/nginx.conf"
```
+ # Rate limit all IP addresses
http {
limit_req_zone $binary_remote_addr zone=one:10m rate=1r/s;
}
+
+ # Alternatively, whitelist certain IP addresses
+ http {
+ geo $limited {
+ default 1;
+ 116.203.112.46/32 0;
+ 132.226.42.65/32 0;
+ ...
+ }
+ map $limited $limitkey {
+ 1 $binary_remote_addr;
+ 0 "";
+ }
+ limit_req_zone $limitkey zone=one:10m rate=1r/s;
+ }
```
=== "/etc/nginx/sites-enabled/ntfy.sh"
From 4446795dad05cdaae1d6da3aba3d41e4153cfa4b Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Mon, 12 Sep 2022 23:31:30 -0400
Subject: [PATCH 42/63] Integrations
---
docs/integrations.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docs/integrations.md b/docs/integrations.md
index 2bbff53f..2859586e 100644
--- a/docs/integrations.md
+++ b/docs/integrations.md
@@ -22,6 +22,8 @@ messages until I finally finish implementing end-to-end encryption.
- [Robusta](https://docs.robusta.dev/master/catalog/sinks/webhook.html) ⭐ - open source platform for Kubernetes troubleshooting
- [borgmatic](https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#third-party-monitoring-services) ⭐ - configuration-driven backup software for servers and workstations
- [Radarr](https://radarr.video/) ⭐ - Movie collection manager for Usenet and BitTorrent users
+- [FlexGet](https://flexget.com/Plugins/Notifiers/ntfysh) ⭐ - Multipurpose automation tool for all of your media
+- [Platypush](https://docs.platypush.tech/platypush/plugins/ntfy.html) - Automation platform aimed to run on any device that can run Python
## [UnifiedPush](https://unifiedpush.org/users/apps/) integrations
From b37b3d97ada0e90add1561e13392ff77b53f4e34 Mon Sep 17 00:00:00 2001
From: TheLazyFox <35723598+the-lazy-fox@users.noreply.github.com>
Date: Mon, 19 Sep 2022 13:59:29 +0200
Subject: [PATCH 43/63] Update develop.md
---
docs/develop.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/develop.md b/docs/develop.md
index 65507847..3c07d8f2 100644
--- a/docs/develop.md
+++ b/docs/develop.md
@@ -59,7 +59,7 @@ These steps **assume Ubuntu**. Steps may vary on different Linux distributions.
First, install [Go](https://go.dev/) (see [official instructions](https://go.dev/doc/install)):
``` shell
wget https://go.dev/dl/go1.18.linux-amd64.tar.gz
-rm -rf /usr/local/go && tar -C /usr/local -xzf go1.18.linux-amd64.tar.gz
+sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.18.linux-amd64.tar.gz
export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
go version # verifies that it worked
```
From 1e823b4f89064e4f6af2db69e5cef88c26f2aef5 Mon Sep 17 00:00:00 2001
From: Patryk <patrykiakos@protonmail.com>
Date: Thu, 22 Sep 2022 22:14:30 +0200
Subject: [PATCH 44/63] Added translation using Weblate (Polish)
---
web/public/static/langs/pl.json | 1 +
1 file changed, 1 insertion(+)
create mode 100644 web/public/static/langs/pl.json
diff --git a/web/public/static/langs/pl.json b/web/public/static/langs/pl.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/web/public/static/langs/pl.json
@@ -0,0 +1 @@
+{}
From b117c217e44b42584bacb7aac05b9ae8894f74c3 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Fri, 23 Sep 2022 12:42:44 -0400
Subject: [PATCH 45/63] Deps
---
go.mod | 33 +-
go.sum | 99 ++-
web/package-lock.json | 1547 +++++++++++++++++++++--------------------
3 files changed, 843 insertions(+), 836 deletions(-)
diff --git a/go.mod b/go.mod
index ed311def..daaff181 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.17
require (
cloud.google.com/go/firestore v1.6.1 // indirect
- cloud.google.com/go/storage v1.26.0 // indirect
+ cloud.google.com/go/storage v1.27.0 // indirect
github.com/BurntSushi/toml v1.2.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
github.com/emersion/go-smtp v0.15.0
@@ -13,13 +13,13 @@ require (
github.com/mattn/go-sqlite3 v1.14.15
github.com/olebedev/when v0.0.0-20211212231525-59bd4edcf9d6
github.com/stretchr/testify v1.7.0
- github.com/urfave/cli/v2 v2.14.1
- golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
- golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
- golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
- golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
- golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9
- google.golang.org/api v0.94.0
+ github.com/urfave/cli/v2 v2.16.3
+ golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0
+ golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
+ golang.org/x/sync v0.0.0-20220907140024-f12130a52804
+ golang.org/x/term v0.0.0-20220919170432-7a66f970e087
+ golang.org/x/time v0.0.0-20220922220347-f3bd1da661af
+ google.golang.org/api v0.97.0
gopkg.in/yaml.v2 v2.4.0
)
@@ -29,29 +29,28 @@ require firebase.google.com/go/v4 v4.8.0
require (
cloud.google.com/go v0.104.0 // indirect
- cloud.google.com/go/compute v1.9.0 // indirect
- cloud.google.com/go/iam v0.3.0 // indirect
+ cloud.google.com/go/compute v1.10.0 // indirect
+ cloud.google.com/go/iam v0.4.0 // indirect
github.com/AlekSi/pointer v1.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac // indirect
+ github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
- github.com/google/go-cmp v0.5.8 // indirect
+ github.com/google/go-cmp v0.5.9 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
github.com/googleapis/gax-go/v2 v2.5.1 // indirect
- github.com/googleapis/go-type-adapters v1.0.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.opencensus.io v0.23.0 // indirect
- golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
- golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
+ golang.org/x/net v0.0.0-20220921203646-d300de134e69 // indirect
+ golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
golang.org/x/text v0.3.7 // indirect
- golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
+ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/appengine/v2 v2.0.2 // indirect
- google.golang.org/genproto v0.0.0-20220902135211-223410557253 // indirect
+ google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737 // indirect
google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
index ecf341c4..9db876ff 100644
--- a/go.sum
+++ b/go.sum
@@ -29,10 +29,7 @@ cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2Z
cloud.google.com/go v0.100.1/go.mod h1:fs4QogzfH5n2pBXBP9vRiU+eCny7lD2vmFZy79Iuw1U=
cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc=
-cloud.google.com/go v0.102.1 h1:vpK6iQWv/2uUeFJth4/cBHsQAGjn1iIE6AAlxipRaA0=
cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU=
-cloud.google.com/go v0.103.0 h1:YXtxp9ymmZjlGzxV7VrYQ8aaQuAgcqxSy6YhDX4I458=
-cloud.google.com/go v0.103.0/go.mod h1:vwLx1nqLrzLX/fpwSMOXmFIqBOyHsvHbnAdbGSJ+mKk=
cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
@@ -47,12 +44,11 @@ cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJW
cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M=
cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
-cloud.google.com/go/compute v1.7.0 h1:v/k9Eueb8aAJ0vZuxKMrgm6kPhCLZU9HxFU+AFDs9Uk=
cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U=
-cloud.google.com/go/compute v1.8.0 h1:NLtR56/eKx9K1s2Tw/4hec2vsU1S3WeKRMj8HXbBo6E=
-cloud.google.com/go/compute v1.8.0/go.mod h1:boQ44qJsMqZjKzzsEkoJWQGj4h8ygmyk17UArClWzmg=
cloud.google.com/go/compute v1.9.0 h1:ED/FP4xv8GJw63v556/ASNc1CeeLUO2Bs8nzaHchkHg=
cloud.google.com/go/compute v1.9.0/go.mod h1:lWv1h/zUWTm/LozzfTJhBSkd6ShQq8la8VeeuOEGxfY=
+cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
+cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
cloud.google.com/go/firestore v1.6.1 h1:8rBq3zRjnHx8UtBvaOWqBB1xq9jH6/wltfQLlTMh2Fw=
@@ -60,6 +56,8 @@ cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx
cloud.google.com/go/iam v0.1.1/go.mod h1:CKqrcnI/suGpybEHxZ7BMehL0oA4LpdyJdUlTl9jVMw=
cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc=
cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
+cloud.google.com/go/iam v0.4.0 h1:YBYU00SCDzZJdHqVc4I5d6lsklcYIjQZa1YmEz4jlSE=
+cloud.google.com/go/iam v0.4.0/go.mod h1:cbaZxyScUhxl7ZAkNWiALgihfP75wS/fUsVNaa1r3vA=
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -71,12 +69,11 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
cloud.google.com/go/storage v1.21.0/go.mod h1:XmRlxkgPjlBONznT2dDUU/5XlpU2OjMnKuqnZI01LAA=
cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y=
-cloud.google.com/go/storage v1.23.0 h1:wWRIaDURQA8xxHguFCshYepGlrWIrbBnAmc7wfg07qY=
cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc=
-cloud.google.com/go/storage v1.25.0 h1:D2Dn0PslpK7Z3B2AvuUHyIC762bDbGJdlmQlCBR71os=
-cloud.google.com/go/storage v1.25.0/go.mod h1:Qys4JU+jeup3QnuKKAosWuxrD95C4MSqxfVDnSirDsI=
cloud.google.com/go/storage v1.26.0 h1:lYAGjknyDJirSzfwUlkv4Nsnj7od7foxQNH/fqZqles=
cloud.google.com/go/storage v1.26.0/go.mod h1:mk/N7YwIKEWyTvXAWQCIeiCTdLoRH6Pd5xmSnolQLTI=
+cloud.google.com/go/storage v1.27.0 h1:YOO045NZI9RKfCj1c5A/ZtuuENUc8OAW+gHdGnDgyMQ=
+cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
firebase.google.com/go/v4 v4.8.0 h1:ooJqjFEh1G6DQ5+wyb/RAXAgku0E2RzJeH6WauSpWSo=
firebase.google.com/go/v4 v4.8.0/go.mod h1:y+j6xX7BgBco/XaN+YExIBVm6pzvYutheDV3nprvbWc=
@@ -84,7 +81,6 @@ github.com/AlekSi/pointer v1.0.0/go.mod h1:1kjywbfcPFCmncIxtk6fIEub6LKrfMz3gc5QK
github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w=
github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
@@ -115,6 +111,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac h1:tn/OQ2PmwQ0XFVgAHfjlLyqMewry25Rz7jWnVoh4Ggs=
github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
+github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
+github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
github.com/emersion/go-smtp v0.15.0 h1:3+hMGMGrqP/lqd7qoxZc1hTU8LY8gHV9RFGWlqSDmP8=
github.com/emersion/go-smtp v0.15.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -127,8 +125,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/gabriel-vasile/mimetype v1.4.0 h1:Cn9dkdYsMIu56tGho+fqzh7XmvY2YyGU0FnbhiOsEro=
-github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
github.com/gabriel-vasile/mimetype v1.4.1 h1:TRWk7se+TOjCYgRth7+1/OYLNiRNIotknkFtf/dnN7Q=
github.com/gabriel-vasile/mimetype v1.4.1/go.mod h1:05Vi0w3Y9c/lNvJOdmIwvrrAhX3rYhfQQCaf9VJcv7M=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -186,6 +182,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -219,11 +217,9 @@ github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pf
github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
-github.com/googleapis/gax-go/v2 v2.4.0 h1:dS9eYAjhrE2RjmzYw2XAPvcXfmcQLtFEQWn0CR82awk=
github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
github.com/googleapis/gax-go/v2 v2.5.1 h1:kBRZU0PSuI7PspsSb/ChWoVResUcwNVIdpB049pKTiw=
github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
-github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA=
github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -240,8 +236,6 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/mattn/go-sqlite3 v1.14.13 h1:1tj15ngiFfcZzii7yd82foL+ks+ouQcj8j/TPq3fk1I=
-github.com/mattn/go-sqlite3 v1.14.13/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/olebedev/when v0.0.0-20211212231525-59bd4edcf9d6 h1:oDSPaYiL2dbjcArLrFS8ANtwgJMyOLzvQCZon+XmFsk=
@@ -264,12 +258,10 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
-github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
-github.com/urfave/cli/v2 v2.11.2 h1:FVfNg4m3vbjbBpLYxW//WjxUoHvJ9TlppXcqY9Q9ZfA=
-github.com/urfave/cli/v2 v2.11.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
github.com/urfave/cli/v2 v2.14.1 h1:0Sx+C9404t2+DPuIJ3UpZFOEFhNG3wPxMj7uZHyZKFA=
github.com/urfave/cli/v2 v2.14.1/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
+github.com/urfave/cli/v2 v2.16.3 h1:gHoFIwpPjoyIMbJp/VFd+/vuD0dAgFK4B6DpEMFJfQk=
+github.com/urfave/cli/v2 v2.16.3/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -291,12 +283,10 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
-golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 h1:GIAS/yBem/gq2MUqgNIzUHW7cJMmx3TGZOrnyYaNQ6c=
-golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 h1:a5Yg6ylndHHYJqIPrdq0AhvR6KTvDTAvgBtaidhEevY=
+golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -367,7 +357,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
@@ -376,14 +365,13 @@ golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220622184535-263ec571b305 h1:dAgbJ2SP4jD6XYfMNLVj0BF21jo2PjChrtGaAvF5M3I=
-golang.org/x/net v0.0.0-20220622184535-263ec571b305/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E=
-golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b h1:ZmngSVLe/wycRns9MKikG9OWIEjGcGAkacif7oYQaUY=
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20220921203646-d300de134e69 h1:hUJpGDpnfwdJW8iNypFjmSY0sCBEL+spFTZ2eO+Sfps=
+golang.org/x/net v0.0.0-20220921203646-d300de134e69/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -405,12 +393,11 @@ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
-golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 h1:+jnHzr9VPj32ykQVai5DNahi9+NSp7yYuCsl5eAQtL0=
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
-golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7 h1:dtndE8FcEta75/4kHF3AbpuWzV6f1LjnLrM4pe2SZrw=
-golang.org/x/oauth2 v0.0.0-20220808172628-8227340efae7/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 h1:2o1E+E8TpNLklK9nHiPiK1uzIYrIHt+cQx3ynCwq9V8=
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 h1:lxqLZaMad/dJHMFZH0NiNpiEZI/nhgWhe4wgzpE+MuA=
+golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -422,12 +409,11 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A=
+golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -490,21 +476,18 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664 h1:wEZYwx+kK+KlZ0hpvP2Ls1Xr4+RWnlzGFwPP0aiDjIU=
-golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 h1:fqTvyMIIj+HRzMmnzr9NtpHP6uVpvB5fkHcgPDC4nu8=
-golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 h1:Sx/u41w+OwrInGdEckYmEuU5gHoGSL4QbDz3S9s6j4U=
-golang.org/x/sys v0.0.0-20220818161305-2296e01440c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
+golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM=
-golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.0.0-20220919170432-7a66f970e087 h1:tPwmk4vmvVCMdr98VgL4JH+qZxPL8fqlUOHnyOM8N3w=
+golang.org/x/term v0.0.0-20220919170432-7a66f970e087/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -518,10 +501,10 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U=
-golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 h1:ftMN5LMiBFjbzleLqtoBZk7KdJwhuybIU+FckUHgoyQ=
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y=
+golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -581,6 +564,8 @@ golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0=
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
+golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -625,13 +610,14 @@ google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69
google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg=
google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o=
-google.golang.org/api v0.85.0 h1:8rJoHuRxx+vCmZtAO/3k1dRLvYNVyTJtZ5oaFZvhgvc=
google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g=
-google.golang.org/api v0.86.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
-google.golang.org/api v0.93.0 h1:T2xt9gi0gHdxdnRkVQhT8mIvPaXKNsDNWz+L696M66M=
+google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
+google.golang.org/api v0.91.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
google.golang.org/api v0.94.0 h1:KtKM9ru3nzQioV1HLlUf1cR7vMYJIpgls5VhAYQXIwA=
google.golang.org/api v0.94.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI=
+google.golang.org/api v0.97.0 h1:x/vEL1XDF/2V4xzdNgFPaKHluRESo2aTsL7QzHnBtGQ=
+google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -640,7 +626,6 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine/v2 v2.0.1 h1:jTGfiRmR5qoInpT3CXJ72GJEB4owDGEKN+xRDA6ekBY=
google.golang.org/appengine/v2 v2.0.1/go.mod h1:XgltgQxPOF3ShivrVrZyfvYCx8Dunh73bKjUuXUZb8Q=
google.golang.org/appengine/v2 v2.0.2 h1:MSqyWy2shDLwG7chbwBJ5uMyw6SNqJzhJHNDwYB0Akk=
google.golang.org/appengine/v2 v2.0.2/go.mod h1:PkgRUWz4o1XOvbqtWTkBtCitEJ5Tp4HoVEdMMYQR/8E=
@@ -731,16 +716,15 @@ google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP
google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220623142657-077d458a5694 h1:itnFmgk4Ls5nT+mYO2ZK6F0DpKsGZLhB5BB9y5ZL2HA=
-google.golang.org/genproto v0.0.0-20220623142657-077d458a5694/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1 h1:C2UVWqrgLYKrT5nh5oU6hLRm1AeEklCK5eloQA1NtFY=
-google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220819174105-e9f053255caa h1:Ux9yJCyf598uEniFPSyp8g1jtGTt77m+lzYyVgrWQaQ=
-google.golang.org/genproto v0.0.0-20220819174105-e9f053255caa/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE=
+google.golang.org/genproto v0.0.0-20220804142021-4e6b2dfa6612/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc=
+google.golang.org/genproto v0.0.0-20220810155839-1856144b1d9c/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
google.golang.org/genproto v0.0.0-20220902135211-223410557253 h1:vXJMM8Shg7TGaYxZsQ++A/FOSlbDmDtWhS/o+3w/hj4=
google.golang.org/genproto v0.0.0-20220902135211-223410557253/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737 h1:K1zaaMdYBXRyX+cwFnxj7M6zwDyumLQMZ5xqwGvjreQ=
+google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737/go.mod h1:2r/26NEF3bFmT3eC3aZreahSal0C3Shl8Gi6vyDYqOQ=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
@@ -771,9 +755,7 @@ google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ5
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w=
google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw=
google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
@@ -791,7 +773,6 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
diff --git a/web/package-lock.json b/web/package-lock.json
index 99542c21..d449d11e 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -52,27 +52,27 @@
}
},
"node_modules/@babel/compat-data": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.0.tgz",
- "integrity": "sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.1.tgz",
+ "integrity": "sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg==",
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/core": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.0.tgz",
- "integrity": "sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.1.tgz",
+ "integrity": "sha512-1H8VgqXme4UXCRv7/Wa1bq7RVymKOzC7znjyFM8KiEzwFqcKUKYNoQef4GhdklgNvoBXyW4gYhuBNCM5o1zImw==",
"dependencies": {
"@ampproject/remapping": "^2.1.0",
"@babel/code-frame": "^7.18.6",
"@babel/generator": "^7.19.0",
- "@babel/helper-compilation-targets": "^7.19.0",
+ "@babel/helper-compilation-targets": "^7.19.1",
"@babel/helper-module-transforms": "^7.19.0",
"@babel/helpers": "^7.19.0",
- "@babel/parser": "^7.19.0",
+ "@babel/parser": "^7.19.1",
"@babel/template": "^7.18.10",
- "@babel/traverse": "^7.19.0",
+ "@babel/traverse": "^7.19.1",
"@babel/types": "^7.19.0",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
@@ -89,11 +89,11 @@
}
},
"node_modules/@babel/eslint-parser": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.9.tgz",
- "integrity": "sha512-KzSGpMBggz4fKbRbWLNyPVTuQr6cmCcBhOyXTw/fieOVaw5oYAwcAj4a7UKcDYCPxQq+CG1NCDZH9e2JTXquiQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
+ "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
"dependencies": {
- "eslint-scope": "^5.1.1",
+ "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
"eslint-visitor-keys": "^2.1.0",
"semver": "^6.3.0"
},
@@ -105,18 +105,6 @@
"eslint": "^7.5.0 || ^8.0.0"
}
},
- "node_modules/@babel/eslint-parser/node_modules/eslint-scope": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
- "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
- "dependencies": {
- "esrecurse": "^4.3.0",
- "estraverse": "^4.1.1"
- },
- "engines": {
- "node": ">=8.0.0"
- }
- },
"node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
@@ -125,14 +113,6 @@
"node": ">=10"
}
},
- "node_modules/@babel/eslint-parser/node_modules/estraverse": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
- "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
- "engines": {
- "node": ">=4.0"
- }
- },
"node_modules/@babel/generator": {
"version": "7.19.0",
"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz",
@@ -183,13 +163,13 @@
}
},
"node_modules/@babel/helper-compilation-targets": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz",
- "integrity": "sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz",
+ "integrity": "sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==",
"dependencies": {
- "@babel/compat-data": "^7.19.0",
+ "@babel/compat-data": "^7.19.1",
"@babel/helper-validator-option": "^7.18.6",
- "browserslist": "^4.20.2",
+ "browserslist": "^4.21.3",
"semver": "^6.3.0"
},
"engines": {
@@ -235,9 +215,9 @@
}
},
"node_modules/@babel/helper-define-polyfill-provider": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz",
- "integrity": "sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
+ "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
"dependencies": {
"@babel/helper-compilation-targets": "^7.17.7",
"@babel/helper-plugin-utils": "^7.16.7",
@@ -369,15 +349,15 @@
}
},
"node_modules/@babel/helper-replace-supers": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz",
- "integrity": "sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
+ "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
"dependencies": {
"@babel/helper-environment-visitor": "^7.18.9",
"@babel/helper-member-expression-to-functions": "^7.18.9",
"@babel/helper-optimise-call-expression": "^7.18.6",
- "@babel/traverse": "^7.18.9",
- "@babel/types": "^7.18.9"
+ "@babel/traverse": "^7.19.1",
+ "@babel/types": "^7.19.0"
},
"engines": {
"node": ">=6.9.0"
@@ -425,9 +405,9 @@
}
},
"node_modules/@babel/helper-validator-identifier": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
- "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+ "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
"engines": {
"node": ">=6.9.0"
}
@@ -481,9 +461,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz",
- "integrity": "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+ "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==",
"bin": {
"parser": "bin/babel-parser.js"
},
@@ -522,9 +502,9 @@
}
},
"node_modules/@babel/plugin-proposal-async-generator-functions": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.0.tgz",
- "integrity": "sha512-nhEByMUTx3uZueJ/QkJuSlCfN4FGg+xy+vRsfGQGzSauq5ks2Deid2+05Q3KhfaUjvec1IGhw/Zm3cFm8JigTQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
+ "integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
"dependencies": {
"@babel/helper-environment-visitor": "^7.18.9",
"@babel/helper-plugin-utils": "^7.19.0",
@@ -570,13 +550,13 @@
}
},
"node_modules/@babel/plugin-proposal-decorators": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.0.tgz",
- "integrity": "sha512-Bo5nOSjiJccjv00+BrDkmfeBLBi2B0qe8ygj24KdL8VdwtZz+710NCwehF+x/Ng+0mkHx5za2eAofmvVFLF4Fg==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.1.tgz",
+ "integrity": "sha512-LfIKNBBY7Q1OX5C4xAgRQffOg2OnhAo9fnbcOHgOC9Yytm2Sw+4XqHufRYU86tHomzepxtvuVaNO+3EVKR4ivw==",
"dependencies": {
"@babel/helper-create-class-features-plugin": "^7.19.0",
"@babel/helper-plugin-utils": "^7.19.0",
- "@babel/helper-replace-supers": "^7.18.9",
+ "@babel/helper-replace-supers": "^7.19.1",
"@babel/helper-split-export-declaration": "^7.18.6",
"@babel/plugin-syntax-decorators": "^7.19.0"
},
@@ -1320,9 +1300,9 @@
}
},
"node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.0.tgz",
- "integrity": "sha512-HDSuqOQzkU//kfGdiHBt71/hkDTApw4U/cMVgKgX7PqfB3LOaK+2GtCEsBu1dL9CkswDm0Gwehht1dCr421ULQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
+ "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
"dependencies": {
"@babel/helper-create-regexp-features-plugin": "^7.19.0",
"@babel/helper-plugin-utils": "^7.19.0"
@@ -1496,15 +1476,15 @@
}
},
"node_modules/@babel/plugin-transform-runtime": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz",
- "integrity": "sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.1.tgz",
+ "integrity": "sha512-2nJjTUFIzBMP/f/miLxEK9vxwW/KUXsdvN4sR//TmuDhe6yU2h57WmIOE12Gng3MDP/xpjUV/ToZRdcf8Yj4fA==",
"dependencies": {
"@babel/helper-module-imports": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.9",
- "babel-plugin-polyfill-corejs2": "^0.3.2",
- "babel-plugin-polyfill-corejs3": "^0.5.3",
- "babel-plugin-polyfill-regenerator": "^0.4.0",
+ "@babel/helper-plugin-utils": "^7.19.0",
+ "babel-plugin-polyfill-corejs2": "^0.3.3",
+ "babel-plugin-polyfill-corejs3": "^0.6.0",
+ "babel-plugin-polyfill-regenerator": "^0.4.1",
"semver": "^6.3.0"
},
"engines": {
@@ -1586,9 +1566,9 @@
}
},
"node_modules/@babel/plugin-transform-typescript": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.0.tgz",
- "integrity": "sha512-DOOIywxPpkQHXijXv+s9MDAyZcLp12oYRl3CMWZ6u7TjSoCBq/KqHR/nNFR3+i2xqheZxoF0H2XyL7B6xeSRuA==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.1.tgz",
+ "integrity": "sha512-+ILcOU+6mWLlvCwnL920m2Ow3wWx3Wo8n2t5aROQmV55GZt+hOiLvBaa3DNzRjSEHa1aauRs4/YLmkCfFkhhRQ==",
"dependencies": {
"@babel/helper-create-class-features-plugin": "^7.19.0",
"@babel/helper-plugin-utils": "^7.19.0",
@@ -1631,17 +1611,17 @@
}
},
"node_modules/@babel/preset-env": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.0.tgz",
- "integrity": "sha512-1YUju1TAFuzjIQqNM9WsF4U6VbD/8t3wEAlw3LFYuuEr+ywqLRcSXxFKz4DCEj+sN94l/XTDiUXYRrsvMpz9WQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.1.tgz",
+ "integrity": "sha512-c8B2c6D16Lp+Nt6HcD+nHl0VbPKVnNPTpszahuxJJnurfMtKeZ80A+qUv48Y7wqvS+dTFuLuaM9oYxyNHbCLWA==",
"dependencies": {
- "@babel/compat-data": "^7.19.0",
- "@babel/helper-compilation-targets": "^7.19.0",
+ "@babel/compat-data": "^7.19.1",
+ "@babel/helper-compilation-targets": "^7.19.1",
"@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-validator-option": "^7.18.6",
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
- "@babel/plugin-proposal-async-generator-functions": "^7.19.0",
+ "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-class-static-block": "^7.18.6",
"@babel/plugin-proposal-dynamic-import": "^7.18.6",
@@ -1689,7 +1669,7 @@
"@babel/plugin-transform-modules-commonjs": "^7.18.6",
"@babel/plugin-transform-modules-systemjs": "^7.19.0",
"@babel/plugin-transform-modules-umd": "^7.18.6",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.0",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
"@babel/plugin-transform-new-target": "^7.18.6",
"@babel/plugin-transform-object-super": "^7.18.6",
"@babel/plugin-transform-parameters": "^7.18.8",
@@ -1705,10 +1685,10 @@
"@babel/plugin-transform-unicode-regex": "^7.18.6",
"@babel/preset-modules": "^0.1.5",
"@babel/types": "^7.19.0",
- "babel-plugin-polyfill-corejs2": "^0.3.2",
- "babel-plugin-polyfill-corejs3": "^0.5.3",
- "babel-plugin-polyfill-regenerator": "^0.4.0",
- "core-js-compat": "^3.22.1",
+ "babel-plugin-polyfill-corejs2": "^0.3.3",
+ "babel-plugin-polyfill-corejs3": "^0.6.0",
+ "babel-plugin-polyfill-regenerator": "^0.4.1",
+ "core-js-compat": "^3.25.1",
"semver": "^6.3.0"
},
"engines": {
@@ -1780,11 +1760,11 @@
}
},
"node_modules/@babel/runtime-corejs3": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.19.0.tgz",
- "integrity": "sha512-JyXXoCu1N8GLuKc2ii8y5RGma5FMpFeO2nAQIe0Yzrbq+rQnN+sFj47auLblR5ka6aHNGPDgv8G/iI2Grb0ldQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.19.1.tgz",
+ "integrity": "sha512-j2vJGnkopRzH+ykJ8h68wrHnEUmtK//E723jjixiAl/PPf6FhqY/vYRcMVlNydRKQjQsTsYEjpx+DZMIvnGk/g==",
"dependencies": {
- "core-js-pure": "^3.20.2",
+ "core-js-pure": "^3.25.1",
"regenerator-runtime": "^0.13.4"
},
"engines": {
@@ -1805,9 +1785,9 @@
}
},
"node_modules/@babel/traverse": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.0.tgz",
- "integrity": "sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
+ "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
"dependencies": {
"@babel/code-frame": "^7.18.6",
"@babel/generator": "^7.19.0",
@@ -1815,7 +1795,7 @@
"@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.0",
+ "@babel/parser": "^7.19.1",
"@babel/types": "^7.19.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
@@ -1848,9 +1828,9 @@
"integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg=="
},
"node_modules/@csstools/postcss-cascade-layers": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.0.5.tgz",
- "integrity": "sha512-Id/9wBT7FkgFzdEpiEWrsVd4ltDxN0rI0QS0SChbeQiSuux3z21SJCRLu6h2cvCEUmaRi+VD0mHFj+GJD4GFnw==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
+ "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
"dependencies": {
"@csstools/selector-specificity": "^2.0.2",
"postcss-selector-parser": "^6.0.10"
@@ -2259,9 +2239,9 @@
"integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="
},
"node_modules/@eslint/eslintrc": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz",
- "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==",
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
+ "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
"dependencies": {
"ajv": "^6.12.4",
"debug": "^4.3.2",
@@ -2322,9 +2302,9 @@
}
},
"node_modules/@humanwhocodes/config-array": {
- "version": "0.10.4",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
- "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
+ "version": "0.10.5",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz",
+ "integrity": "sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==",
"dependencies": {
"@humanwhocodes/object-schema": "^1.2.1",
"debug": "^4.1.1",
@@ -3101,14 +3081,14 @@
"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
},
"node_modules/@mui/base": {
- "version": "5.0.0-alpha.95",
- "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.95.tgz",
- "integrity": "sha512-fcxnDeO7rBwzP0buVdI5fn0aA7NQ/AeUV5RzIIH0kOXVVT21HB4JFf41Qhwd0PIq63PXxmc6Fs2mdlzMYuPo9g==",
+ "version": "5.0.0-alpha.98",
+ "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.98.tgz",
+ "integrity": "sha512-c0U51+K2m57MASpRrmNs6qTXSvktDbVcSjD8zCRPbfuwYWERGGwNxwM3/jsBa4dSojTSmLPnOBFDypl74Ds6yQ==",
"dependencies": {
- "@babel/runtime": "^7.18.9",
+ "@babel/runtime": "^7.19.0",
"@emotion/is-prop-valid": "^1.2.0",
"@mui/types": "^7.2.0",
- "@mui/utils": "^5.10.3",
+ "@mui/utils": "^5.10.6",
"@popperjs/core": "^2.11.6",
"clsx": "^1.2.1",
"prop-types": "^15.8.1",
@@ -3133,20 +3113,20 @@
}
},
"node_modules/@mui/core-downloads-tracker": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.3.tgz",
- "integrity": "sha512-mX2S0d1oboKBbWQqWIgRmyALAEzh37yiknpD3mKx8bcoMKbp1VtqzIt0aeHP16Uhsd0eValDFILxLNHWi0oddQ==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.6.tgz",
+ "integrity": "sha512-dmyQBqrKmVU6yCSM4GGal5qNXpViXX+/V1t0GA1A5i9QF5Gx6noV/cw0hrSS2ffLT8L2oScq1oTdA6NVIiQ8lg==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/mui"
}
},
"node_modules/@mui/icons-material": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.10.3.tgz",
- "integrity": "sha512-o0kbUlsWCBtCE0wP33cGKbyryCh7kpm2EECYMPDmWrLhbA+HUODXIdhiTFS26szp2xXo9HY1lEx0ufeJ+tddYw==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.10.6.tgz",
+ "integrity": "sha512-QwxdRmLA46S94B0hExPDx0td+A2unF+33bQ6Cs+lNpJKVsm1YeHwNdYXYcnpWeHeQQ07055OXl7IB2GKDd0MfA==",
"dependencies": {
- "@babel/runtime": "^7.18.9"
+ "@babel/runtime": "^7.19.0"
},
"engines": {
"node": ">=12.0.0"
@@ -3167,16 +3147,16 @@
}
},
"node_modules/@mui/material": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.3.tgz",
- "integrity": "sha512-g0lzHcqWHYeOEAxTzcwpM1I7b+wyiRTeXkEdRsspnOpZtb0H/1xg386tMFRGbxBJ4zfVGT+TWublofw7pyQkqw==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.6.tgz",
+ "integrity": "sha512-QilW5PAAGSQdN7Cpp4rwSQ1doJAt3ca1a2PHZtr8RLVlpHnXb+qQ8CeDo9+9V2fK5CDNdtTN1F+iJKO43aFBpQ==",
"dependencies": {
- "@babel/runtime": "^7.18.9",
- "@mui/base": "5.0.0-alpha.95",
- "@mui/core-downloads-tracker": "^5.10.3",
- "@mui/system": "^5.10.3",
+ "@babel/runtime": "^7.19.0",
+ "@mui/base": "5.0.0-alpha.98",
+ "@mui/core-downloads-tracker": "^5.10.6",
+ "@mui/system": "^5.10.6",
"@mui/types": "^7.2.0",
- "@mui/utils": "^5.10.3",
+ "@mui/utils": "^5.10.6",
"@types/react-transition-group": "^4.4.5",
"clsx": "^1.2.1",
"csstype": "^3.1.0",
@@ -3211,12 +3191,12 @@
}
},
"node_modules/@mui/private-theming": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.10.3.tgz",
- "integrity": "sha512-LCYIKlkGz2BTSng2BFzzwSJBRZbChIUri2x2Nh8ryk2B1Ho7zpvE7ex6y39LlStG2Frf92NFC/V4YQbmMAjD5A==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.10.6.tgz",
+ "integrity": "sha512-I/W0QyTLRdEx6py3lKAquKO/rNF/7j+nIOM/xCyI9kU0fcotVTcTY08mKMsS6vrzdWpi6pAkD0wP0KwWy5R5VA==",
"dependencies": {
- "@babel/runtime": "^7.18.9",
- "@mui/utils": "^5.10.3",
+ "@babel/runtime": "^7.19.0",
+ "@mui/utils": "^5.10.6",
"prop-types": "^15.8.1"
},
"engines": {
@@ -3237,11 +3217,11 @@
}
},
"node_modules/@mui/styled-engine": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.3.tgz",
- "integrity": "sha512-9Uz7eB8xXoiDvpJ9qBxZ/2xGO8xKfA2T23dw4AsQ69SQtGatrOLAapzP2lNr0tfB9xvKucclPFhRO5aLhDFOVQ==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.6.tgz",
+ "integrity": "sha512-OnVw5xnO4l0XzlJFhKif/RlLenBNhyEQQlSTwB9ApSWB05UAU5ZSbjNsRfyEKvgmQ/fPa+MqPD/dzxbIRCwyeg==",
"dependencies": {
- "@babel/runtime": "^7.18.9",
+ "@babel/runtime": "^7.19.0",
"@emotion/cache": "^11.10.3",
"csstype": "^3.1.0",
"prop-types": "^15.8.1"
@@ -3268,15 +3248,15 @@
}
},
"node_modules/@mui/system": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.3.tgz",
- "integrity": "sha512-uLW/CIz3zk1jr5zH0ahOUqJIrpWP02Mv4emfrplh7Mh5JCb/oumhYaC/ALJJEjzUHKg9wwiyuM0pCwK/kSf1jQ==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.6.tgz",
+ "integrity": "sha512-HfQVX7e2xpQ3jtdB/WwtkFVtozMOozyN575/63u8ILHkE8wGDhblmCieAsnyJPFbm7WBW5PCMyzmfr4QyKLaYg==",
"dependencies": {
- "@babel/runtime": "^7.18.9",
- "@mui/private-theming": "^5.10.3",
- "@mui/styled-engine": "^5.10.3",
+ "@babel/runtime": "^7.19.0",
+ "@mui/private-theming": "^5.10.6",
+ "@mui/styled-engine": "^5.10.6",
"@mui/types": "^7.2.0",
- "@mui/utils": "^5.10.3",
+ "@mui/utils": "^5.10.6",
"clsx": "^1.2.1",
"csstype": "^3.1.0",
"prop-types": "^15.8.1"
@@ -3320,11 +3300,11 @@
}
},
"node_modules/@mui/utils": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.10.3.tgz",
- "integrity": "sha512-4jXMDPfx6bpMVuheLaOpKTjpzw39ogAZLeaLj5+RJec3E37/hAZMYjURfblLfTWMMoGoqkY03mNsZaEwNobBow==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.10.6.tgz",
+ "integrity": "sha512-g0Qs8xN/MW2M3fLL8197h5J2VB9U+49fLlnKKqC6zy/yus5cZwdT+Gwec+wUMxgwQoxMDn+J8oDWAn28kEOR/Q==",
"dependencies": {
- "@babel/runtime": "^7.18.9",
+ "@babel/runtime": "^7.19.0",
"@types/prop-types": "^15.7.5",
"@types/react-is": "^16.7.1 || ^17.0.0",
"prop-types": "^15.8.1",
@@ -3341,6 +3321,34 @@
"react": "^17.0.0 || ^18.0.0"
}
},
+ "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+ "version": "5.1.1-v1",
+ "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+ "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+ "dependencies": {
+ "eslint-scope": "5.1.1"
+ }
+ },
+ "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/eslint-scope": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+ "dependencies": {
+ "esrecurse": "^4.3.0",
+ "estraverse": "^4.1.1"
+ },
+ "engines": {
+ "node": ">=8.0.0"
+ }
+ },
+ "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/estraverse": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3439,6 +3447,14 @@
"url": "https://opencollective.com/popperjs"
}
},
+ "node_modules/@remix-run/router": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.0.1.tgz",
+ "integrity": "sha512-eBV5rvW4dRFOU1eajN7FmYxjAIVz/mRHgUE9En9mBn6m3mulK3WTR5C3iQhL9MZ14rWAq+xOlEaCkDiW0/heOg==",
+ "engines": {
+ "node": ">=14"
+ }
+ },
"node_modules/@rollup/plugin-babel": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -3514,14 +3530,14 @@
"integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="
},
"node_modules/@rushstack/eslint-patch": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz",
- "integrity": "sha512-LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA=="
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
+ "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="
},
"node_modules/@sinclair/typebox": {
- "version": "0.24.35",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.35.tgz",
- "integrity": "sha512-iN6ehuDndiTiDz2F+Orv/+oHJR+PrGv+38oghCddpsW4YEZl5qyLsWxSwYUWrKEOfjpGtXDFW6scJtjpzSLeSw=="
+ "version": "0.24.42",
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.42.tgz",
+ "integrity": "sha512-d+2AtrHGyWek2u2ITF0lHRIv6Tt7X0dEHW+0rP+5aDCEjC3fiN2RBjrLD0yU0at52BcZbRGxLbAtXiR0hFCjYw=="
},
"node_modules/@sinonjs/commons": {
"version": "1.8.3",
@@ -3868,9 +3884,9 @@
"integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="
},
"node_modules/@types/express": {
- "version": "4.17.13",
- "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
- "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
+ "version": "4.17.14",
+ "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
+ "integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
"dependencies": {
"@types/body-parser": "*",
"@types/express-serve-static-core": "^4.17.18",
@@ -3879,9 +3895,9 @@
}
},
"node_modules/@types/express-serve-static-core": {
- "version": "4.17.30",
- "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz",
- "integrity": "sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ==",
+ "version": "4.17.31",
+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
+ "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
"dependencies": {
"@types/node": "*",
"@types/qs": "*",
@@ -3946,9 +3962,9 @@
"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
},
"node_modules/@types/node": {
- "version": "18.7.15",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.15.tgz",
- "integrity": "sha512-XnjpaI8Bgc3eBag2Aw4t2Uj/49lLBSStHWfqKvIuXD7FIrZyMLWp8KuAFHAqxMZYTF9l08N1ctUn9YNybZJVmQ=="
+ "version": "18.7.18",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz",
+ "integrity": "sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="
},
"node_modules/@types/parse-json": {
"version": "4.0.0",
@@ -3981,9 +3997,9 @@
"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
},
"node_modules/@types/react": {
- "version": "18.0.18",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.18.tgz",
- "integrity": "sha512-6hI08umYs6NaiHFEEGioXnxJ+oEhY3eRz8VCUaudZmGdtvPviCJB8mgaMxaDWAdPSYd4eFavrPk2QIolwbLYrg==",
+ "version": "18.0.21",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.21.tgz",
+ "integrity": "sha512-7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA==",
"dependencies": {
"@types/prop-types": "*",
"@types/scheduler": "*",
@@ -4081,15 +4097,14 @@
"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.2.tgz",
- "integrity": "sha512-OwwR8LRwSnI98tdc2z7mJYgY60gf7I9ZfGjN5EjCwwns9bdTuQfAXcsjSB2wSQ/TVNYSGKf4kzVXbNGaZvwiXw==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.0.tgz",
+ "integrity": "sha512-GgHi/GNuUbTOeoJiEANi0oI6fF3gBQc3bGFYj40nnAPCbhrtEDf2rjBmefFadweBmO1Du1YovHeDP2h5JLhtTQ==",
"dependencies": {
- "@typescript-eslint/scope-manager": "5.36.2",
- "@typescript-eslint/type-utils": "5.36.2",
- "@typescript-eslint/utils": "5.36.2",
+ "@typescript-eslint/scope-manager": "5.38.0",
+ "@typescript-eslint/type-utils": "5.38.0",
+ "@typescript-eslint/utils": "5.38.0",
"debug": "^4.3.4",
- "functional-red-black-tree": "^1.0.1",
"ignore": "^5.2.0",
"regexpp": "^3.2.0",
"semver": "^7.3.7",
@@ -4127,11 +4142,11 @@
}
},
"node_modules/@typescript-eslint/experimental-utils": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.36.2.tgz",
- "integrity": "sha512-JtRmWb31KQoxGV6CHz8cI+9ki6cC7ciZepXYpCLxsdAtQlBrRBxh5Qpe/ZHyJFOT9j7gyXE+W0shWzRLPfuAFQ==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.38.0.tgz",
+ "integrity": "sha512-kzXBRfvGlicgGk4CYuRUqKvwc2s3wHXNssUWWJU18bhMRxriFm3BZWyQ6vEHBRpEIMKB6b7MIQHO+9lYlts19w==",
"dependencies": {
- "@typescript-eslint/utils": "5.36.2"
+ "@typescript-eslint/utils": "5.38.0"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4145,13 +4160,13 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.36.2.tgz",
- "integrity": "sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.38.0.tgz",
+ "integrity": "sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==",
"dependencies": {
- "@typescript-eslint/scope-manager": "5.36.2",
- "@typescript-eslint/types": "5.36.2",
- "@typescript-eslint/typescript-estree": "5.36.2",
+ "@typescript-eslint/scope-manager": "5.38.0",
+ "@typescript-eslint/types": "5.38.0",
+ "@typescript-eslint/typescript-estree": "5.38.0",
"debug": "^4.3.4"
},
"engines": {
@@ -4171,12 +4186,12 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz",
- "integrity": "sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.38.0.tgz",
+ "integrity": "sha512-ByhHIuNyKD9giwkkLqzezZ9y5bALW8VNY6xXcP+VxoH4JBDKjU5WNnsiD4HJdglHECdV+lyaxhvQjTUbRboiTA==",
"dependencies": {
- "@typescript-eslint/types": "5.36.2",
- "@typescript-eslint/visitor-keys": "5.36.2"
+ "@typescript-eslint/types": "5.38.0",
+ "@typescript-eslint/visitor-keys": "5.38.0"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4187,12 +4202,12 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.36.2.tgz",
- "integrity": "sha512-rPQtS5rfijUWLouhy6UmyNquKDPhQjKsaKH0WnY6hl/07lasj8gPaH2UD8xWkePn6SC+jW2i9c2DZVDnL+Dokw==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.38.0.tgz",
+ "integrity": "sha512-iZq5USgybUcj/lfnbuelJ0j3K9dbs1I3RICAJY9NZZpDgBYXmuUlYQGzftpQA9wC8cKgtS6DASTvF3HrXwwozA==",
"dependencies": {
- "@typescript-eslint/typescript-estree": "5.36.2",
- "@typescript-eslint/utils": "5.36.2",
+ "@typescript-eslint/typescript-estree": "5.38.0",
+ "@typescript-eslint/utils": "5.38.0",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
@@ -4213,9 +4228,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.36.2.tgz",
- "integrity": "sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.0.tgz",
+ "integrity": "sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA==",
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
@@ -4225,12 +4240,12 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz",
- "integrity": "sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.0.tgz",
+ "integrity": "sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==",
"dependencies": {
- "@typescript-eslint/types": "5.36.2",
- "@typescript-eslint/visitor-keys": "5.36.2",
+ "@typescript-eslint/types": "5.38.0",
+ "@typescript-eslint/visitor-keys": "5.38.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -4265,14 +4280,14 @@
}
},
"node_modules/@typescript-eslint/utils": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.36.2.tgz",
- "integrity": "sha512-uNcopWonEITX96v9pefk9DC1bWMdkweeSsewJ6GeC7L6j2t0SJywisgkr9wUTtXk90fi2Eljj90HSHm3OGdGRg==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.38.0.tgz",
+ "integrity": "sha512-6sdeYaBgk9Fh7N2unEXGz+D+som2QCQGPAf1SxrkEr+Z32gMreQ0rparXTNGRRfYUWk/JzbGdcM8NSSd6oqnTA==",
"dependencies": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.36.2",
- "@typescript-eslint/types": "5.36.2",
- "@typescript-eslint/typescript-estree": "5.36.2",
+ "@typescript-eslint/scope-manager": "5.38.0",
+ "@typescript-eslint/types": "5.38.0",
+ "@typescript-eslint/typescript-estree": "5.38.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
},
@@ -4308,11 +4323,11 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz",
- "integrity": "sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.0.tgz",
+ "integrity": "sha512-MxnrdIyArnTi+XyFLR+kt/uNAcdOnmT+879os7qDRI+EYySR4crXJq9BXPfRzzLGq0wgxkwidrCJ9WCAoacm1w==",
"dependencies": {
- "@typescript-eslint/types": "5.36.2",
+ "@typescript-eslint/types": "5.38.0",
"eslint-visitor-keys": "^3.3.0"
},
"engines": {
@@ -4558,9 +4573,9 @@
}
},
"node_modules/address": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/address/-/address-1.2.0.tgz",
- "integrity": "sha512-tNEZYz5G/zYunxFm7sfhAxkXEuLj3K6BKwv6ZURlsF6yiUQ65z0Q2wZW9L5cPUl9ocofGvXOdFYbFHp0+6MOig==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/address/-/address-1.2.1.tgz",
+ "integrity": "sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA==",
"engines": {
"node": ">= 10.0.0"
}
@@ -4840,9 +4855,9 @@
}
},
"node_modules/autoprefixer": {
- "version": "10.4.8",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.8.tgz",
- "integrity": "sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==",
+ "version": "10.4.12",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz",
+ "integrity": "sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==",
"funding": [
{
"type": "opencollective",
@@ -4854,8 +4869,8 @@
}
],
"dependencies": {
- "browserslist": "^4.21.3",
- "caniuse-lite": "^1.0.30001373",
+ "browserslist": "^4.21.4",
+ "caniuse-lite": "^1.0.30001407",
"fraction.js": "^4.2.0",
"normalize-range": "^0.1.2",
"picocolors": "^1.0.0",
@@ -5064,12 +5079,12 @@
}
},
"node_modules/babel-plugin-polyfill-corejs2": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz",
- "integrity": "sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+ "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
"dependencies": {
"@babel/compat-data": "^7.17.7",
- "@babel/helper-define-polyfill-provider": "^0.3.2",
+ "@babel/helper-define-polyfill-provider": "^0.3.3",
"semver": "^6.1.1"
},
"peerDependencies": {
@@ -5077,23 +5092,23 @@
}
},
"node_modules/babel-plugin-polyfill-corejs3": {
- "version": "0.5.3",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz",
- "integrity": "sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==",
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
+ "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
"dependencies": {
- "@babel/helper-define-polyfill-provider": "^0.3.2",
- "core-js-compat": "^3.21.0"
+ "@babel/helper-define-polyfill-provider": "^0.3.3",
+ "core-js-compat": "^3.25.1"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/babel-plugin-polyfill-regenerator": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz",
- "integrity": "sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==",
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+ "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
"dependencies": {
- "@babel/helper-define-polyfill-provider": "^0.3.2"
+ "@babel/helper-define-polyfill-provider": "^0.3.3"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
@@ -5306,9 +5321,9 @@
"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
},
"node_modules/browserslist": {
- "version": "4.21.3",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
- "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
+ "version": "4.21.4",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+ "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
"funding": [
{
"type": "opencollective",
@@ -5320,10 +5335,10 @@
}
],
"dependencies": {
- "caniuse-lite": "^1.0.30001370",
- "electron-to-chromium": "^1.4.202",
+ "caniuse-lite": "^1.0.30001400",
+ "electron-to-chromium": "^1.4.251",
"node-releases": "^2.0.6",
- "update-browserslist-db": "^1.0.5"
+ "update-browserslist-db": "^1.0.9"
},
"bin": {
"browserslist": "cli.js"
@@ -5424,9 +5439,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001390",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz",
- "integrity": "sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g==",
+ "version": "1.0.30001410",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001410.tgz",
+ "integrity": "sha512-QoblBnuE+rG0lc3Ur9ltP5q47lbguipa/ncNMyyGuqPk44FxbScWAeEO+k5fSQ8WekdAK4mWqNs1rADDAiN5xQ==",
"funding": [
{
"type": "opencollective",
@@ -5526,9 +5541,9 @@
}
},
"node_modules/ci-info": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.2.tgz",
- "integrity": "sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg=="
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.4.0.tgz",
+ "integrity": "sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug=="
},
"node_modules/cjs-module-lexer": {
"version": "1.2.2",
@@ -5778,9 +5793,9 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
},
"node_modules/core-js": {
- "version": "3.25.0",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz",
- "integrity": "sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA==",
+ "version": "3.25.2",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.2.tgz",
+ "integrity": "sha512-YB4IAT1bjEfxTJ1XYy11hJAKskO+qmhuDBM8/guIfMz4JvdsAQAqvyb97zXX7JgSrfPLG5mRGFWJwJD39ruq2A==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -5788,30 +5803,21 @@
}
},
"node_modules/core-js-compat": {
- "version": "3.25.0",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.0.tgz",
- "integrity": "sha512-extKQM0g8/3GjFx9US12FAgx8KJawB7RCQ5y8ipYLbmfzEzmFRWdDjIlxDx82g7ygcNG85qMVUSRyABouELdow==",
+ "version": "3.25.2",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.2.tgz",
+ "integrity": "sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==",
"dependencies": {
- "browserslist": "^4.21.3",
- "semver": "7.0.0"
+ "browserslist": "^4.21.4"
},
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/core-js"
}
},
- "node_modules/core-js-compat/node_modules/semver": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
- "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
- "bin": {
- "semver": "bin/semver.js"
- }
- },
"node_modules/core-js-pure": {
- "version": "3.25.0",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.0.tgz",
- "integrity": "sha512-IeHpLwk3uoci37yoI2Laty59+YqH9x5uR65/yiA0ARAJrTrN4YU0rmauLWfvqOuk77SlNJXj2rM6oT/dBD87+A==",
+ "version": "3.25.2",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.2.tgz",
+ "integrity": "sha512-ItD7YpW1cUB4jaqFLZXe1AXkyqIxz6GqPnsDV4uF4hVcWh/WAGIqSqw5p0/WdsILM0Xht9s3Koyw05R3K6RtiA==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -6261,9 +6267,9 @@
"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
},
"node_modules/csstype": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz",
- "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
+ "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
},
"node_modules/damerau-levenshtein": {
"version": "1.0.8",
@@ -6324,9 +6330,9 @@
}
},
"node_modules/decimal.js": {
- "version": "10.4.0",
- "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.0.tgz",
- "integrity": "sha512-Nv6ENEzyPQ6AItkGwLE2PGKinZZ9g59vSh2BeH6NqPu0OTKZ5ruJsVqh/orbAnqXc9pBbgXAIrc2EyaCj8NpGg=="
+ "version": "10.4.1",
+ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.1.tgz",
+ "integrity": "sha512-F29o+vci4DodHYT9UrR5IEbfBw9pE5eSapIJdTqXK5+6hq+t8VRxwQyKlW2i+KDKFkkJQRvFyI/QXD83h8LyQw=="
},
"node_modules/dedent": {
"version": "0.7.0",
@@ -6676,9 +6682,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.4.241",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.241.tgz",
- "integrity": "sha512-e7Wsh4ilaioBZ5bMm6+F4V5c11dh56/5Jwz7Hl5Tu1J7cnB+Pqx5qIF2iC7HPpfyQMqGSvvLP5bBAIDd2gAtGw=="
+ "version": "1.4.258",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.258.tgz",
+ "integrity": "sha512-vutF4q0dTUXoAFI7Vbtdwen/BJVwPgj8GRg/SElOodfH7VTX+svUe62A5BG41QRQGk5HsZPB0M++KH1lAlOt0A=="
},
"node_modules/emittery": {
"version": "0.8.1",
@@ -6749,21 +6755,21 @@
}
},
"node_modules/es-abstract": {
- "version": "1.20.2",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
- "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
+ "version": "1.20.3",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.3.tgz",
+ "integrity": "sha512-AyrnaKVpMzljIdwjzrj+LxGmj8ik2LckwXacHqrJJ/jxz6dDDBcZ7I7nlHM0FvEW8MfbWJwOd+yT2XzYW49Frw==",
"dependencies": {
"call-bind": "^1.0.2",
"es-to-primitive": "^1.2.1",
"function-bind": "^1.1.1",
"function.prototype.name": "^1.1.5",
- "get-intrinsic": "^1.1.2",
+ "get-intrinsic": "^1.1.3",
"get-symbol-description": "^1.0.0",
"has": "^1.0.3",
"has-property-descriptors": "^1.0.0",
"has-symbols": "^1.0.3",
"internal-slot": "^1.0.3",
- "is-callable": "^1.2.4",
+ "is-callable": "^1.2.6",
"is-negative-zero": "^2.0.2",
"is-regex": "^1.1.4",
"is-shared-array-buffer": "^1.0.2",
@@ -6773,6 +6779,7 @@
"object-keys": "^1.1.1",
"object.assign": "^4.1.4",
"regexp.prototype.flags": "^1.4.3",
+ "safe-regex-test": "^1.0.0",
"string.prototype.trimend": "^1.0.5",
"string.prototype.trimstart": "^1.0.5",
"unbox-primitive": "^1.0.2"
@@ -6920,11 +6927,11 @@
}
},
"node_modules/eslint": {
- "version": "8.23.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.0.tgz",
- "integrity": "sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==",
+ "version": "8.23.1",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.1.tgz",
+ "integrity": "sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==",
"dependencies": {
- "@eslint/eslintrc": "^1.3.1",
+ "@eslint/eslintrc": "^1.3.2",
"@humanwhocodes/config-array": "^0.10.4",
"@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
"@humanwhocodes/module-importer": "^1.0.1",
@@ -6943,7 +6950,6 @@
"fast-deep-equal": "^3.1.3",
"file-entry-cache": "^6.0.1",
"find-up": "^5.0.0",
- "functional-red-black-tree": "^1.0.1",
"glob-parent": "^6.0.1",
"globals": "^13.15.0",
"globby": "^11.1.0",
@@ -6952,6 +6958,7 @@
"import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4",
"is-glob": "^4.0.0",
+ "js-sdsl": "^4.1.4",
"js-yaml": "^4.1.0",
"json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1",
@@ -7159,9 +7166,9 @@
}
},
"node_modules/eslint-plugin-react": {
- "version": "7.31.6",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.6.tgz",
- "integrity": "sha512-CXu4eu28sb8Sd2+cyUYsJVyDvpTlaXPG+bOzzpS9IzZKtye96AYX3ZmHQ6ayn/OAIQ/ufDJP8ElPWd63Pepn9w==",
+ "version": "7.31.8",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.8.tgz",
+ "integrity": "sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==",
"dependencies": {
"array-includes": "^3.1.5",
"array.prototype.flatmap": "^1.3.0",
@@ -7224,9 +7231,9 @@
}
},
"node_modules/eslint-plugin-testing-library": {
- "version": "5.6.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.6.1.tgz",
- "integrity": "sha512-url6n7SbPg77TM2MLy1XkcrQEWiS5nKcDiJgwOYz2qGCEMywM7gizPzLi3XalJPdpIkQAo2BJFQZC6jggsyCuQ==",
+ "version": "5.7.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.7.0.tgz",
+ "integrity": "sha512-pI8LKtFiAflBpN4h14vTtfhKqLwtIW40TNhWyw0ckqHm0W/J0VmYtThoxpTAdHrvEWnkALSG1Z8ABBkIncMIHA==",
"dependencies": {
"@typescript-eslint/utils": "^5.13.0"
},
@@ -7715,9 +7722,9 @@
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
},
"node_modules/fast-glob": {
- "version": "3.2.11",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
- "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+ "version": "3.2.12",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+ "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
"dependencies": {
"@nodelib/fs.stat": "^2.0.2",
"@nodelib/fs.walk": "^1.2.3",
@@ -7770,9 +7777,9 @@
}
},
"node_modules/fb-watchman": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
- "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+ "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
"dependencies": {
"bser": "2.1.1"
}
@@ -7937,9 +7944,9 @@
"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
},
"node_modules/follow-redirects": {
- "version": "1.15.1",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
- "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+ "version": "1.15.2",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+ "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
"funding": [
{
"type": "individual",
@@ -8224,11 +8231,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/functional-red-black-tree": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
- "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="
- },
"node_modules/functions-have-names": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
@@ -8254,9 +8256,9 @@
}
},
"node_modules/get-intrinsic": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
- "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+ "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
"dependencies": {
"function-bind": "^1.1.1",
"has": "^1.0.3",
@@ -8507,14 +8509,6 @@
"he": "bin/he"
}
},
- "node_modules/history": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
- "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
- "dependencies": {
- "@babel/runtime": "^7.7.6"
- }
- },
"node_modules/hoist-non-react-statics": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -8753,9 +8747,9 @@
}
},
"node_modules/i18next": {
- "version": "21.9.1",
- "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.9.1.tgz",
- "integrity": "sha512-ITbDrAjbRR73spZAiu6+ex5WNlHRr1mY+acDi2ioTHuUiviJqSz269Le1xHAf0QaQ6GgIHResUhQNcxGwa/PhA==",
+ "version": "21.9.2",
+ "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.9.2.tgz",
+ "integrity": "sha512-00fVrLQOwy45nm3OtC9l1WiLK3nJlIYSljgCt0qzTaAy65aciMdRy9GsuW+a2AtKtdg9/njUGfRH30LRupV7ZQ==",
"funding": [
{
"type": "individual",
@@ -8783,9 +8777,9 @@
}
},
"node_modules/i18next-http-backend": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-1.4.1.tgz",
- "integrity": "sha512-s4Q9hK2jS29iyhniMP82z+yYY8riGTrWbnyvsSzi5TaF7Le4E7b5deTmtuaRuab9fdDcYXtcwdBgawZG+JCEjA==",
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-1.4.4.tgz",
+ "integrity": "sha512-M4gLPe6JKZ2p1UmE6t4rzWV/sAxgrLThW7ztXAsTpFwFqXoyzhTzX8eYxVv9KjpCQh4K9nwxnEjEi+74C4Thbg==",
"dependencies": {
"cross-fetch": "3.1.5"
}
@@ -8813,9 +8807,9 @@
}
},
"node_modules/idb": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/idb/-/idb-7.0.2.tgz",
- "integrity": "sha512-jjKrT1EnyZewQ/gCBb/eyiYrhGzws2FeY92Yx8qT9S9GeQAmo4JFVIiWRIfKW/6Ob9A+UDAOW9j9jn58fy2HIg=="
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.0.tgz",
+ "integrity": "sha512-Wsk07aAxDsntgYJY4h0knZJuTxM73eQ4reRAO+Z1liOh8eMCJ/MoDS8fCui1vGT9mnjtl1sOu3I2i/W1swPYZg=="
},
"node_modules/identity-obj-proxy": {
"version": "3.0.0",
@@ -8969,9 +8963,9 @@
}
},
"node_modules/is-callable": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
- "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+ "version": "1.2.6",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz",
+ "integrity": "sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q==",
"engines": {
"node": ">= 0.4"
},
@@ -11293,6 +11287,11 @@
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz",
"integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
},
+ "node_modules/js-sdsl": {
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
+ "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw=="
+ },
"node_modules/js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -12689,9 +12688,9 @@
}
},
"node_modules/postcss-custom-properties": {
- "version": "12.1.8",
- "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.8.tgz",
- "integrity": "sha512-8rbj8kVu00RQh2fQF81oBqtduiANu4MIxhyf0HbbStgPtnFlWn0yiaYTpLHrPnJbffVY1s9apWsIoVZcc68FxA==",
+ "version": "12.1.9",
+ "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.9.tgz",
+ "integrity": "sha512-/E7PRvK8DAVljBbeWrcEQJPG72jaImxF3vvCNFwv9cC8CzigVoNIpeyfnJzphnN3Fd8/auBf5wvkw6W9MfmTyg==",
"dependencies": {
"postcss-value-parser": "^4.2.0"
},
@@ -12703,7 +12702,7 @@
"url": "https://opencollective.com/csstools"
},
"peerDependencies": {
- "postcss": "^8.4"
+ "postcss": "^8.2"
}
},
"node_modules/postcss-custom-selectors": {
@@ -13208,9 +13207,9 @@
}
},
"node_modules/postcss-nesting": {
- "version": "10.1.10",
- "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.10.tgz",
- "integrity": "sha512-lqd7LXCq0gWc0wKXtoKDru5wEUNjm3OryLVNRZ8OnW8km6fSNUuFrjEhU3nklxXE2jvd4qrox566acgh+xQt8w==",
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
+ "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
"dependencies": {
"@csstools/selector-specificity": "^2.0.0",
"postcss-selector-parser": "^6.0.10"
@@ -13446,11 +13445,11 @@
}
},
"node_modules/postcss-preset-env": {
- "version": "7.8.0",
- "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.0.tgz",
- "integrity": "sha512-leqiqLOellpLKfbHkD06E04P6d9ZQ24mat6hu4NSqun7WG0UhspHR5Myiv/510qouCjoo4+YJtNOqg5xHaFnCA==",
+ "version": "7.8.2",
+ "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.2.tgz",
+ "integrity": "sha512-rSMUEaOCnovKnwc5LvBDHUDzpGP+nrUeWZGWt9M72fBvckCi45JmnJigUr4QG4zZeOHmOCNCZnd2LKDvP++ZuQ==",
"dependencies": {
- "@csstools/postcss-cascade-layers": "^1.0.5",
+ "@csstools/postcss-cascade-layers": "^1.1.0",
"@csstools/postcss-color-function": "^1.1.1",
"@csstools/postcss-font-format-keywords": "^1.0.1",
"@csstools/postcss-hwb-function": "^1.0.2",
@@ -13464,19 +13463,19 @@
"@csstools/postcss-text-decoration-shorthand": "^1.0.0",
"@csstools/postcss-trigonometric-functions": "^1.0.2",
"@csstools/postcss-unset-value": "^1.0.2",
- "autoprefixer": "^10.4.8",
+ "autoprefixer": "^10.4.11",
"browserslist": "^4.21.3",
"css-blank-pseudo": "^3.0.3",
"css-has-pseudo": "^3.0.4",
"css-prefers-color-scheme": "^6.0.3",
- "cssdb": "^7.0.0",
+ "cssdb": "^7.0.1",
"postcss-attribute-case-insensitive": "^5.0.2",
"postcss-clamp": "^4.1.0",
"postcss-color-functional-notation": "^4.2.4",
"postcss-color-hex-alpha": "^8.0.4",
"postcss-color-rebeccapurple": "^7.1.1",
"postcss-custom-media": "^8.0.2",
- "postcss-custom-properties": "^12.1.8",
+ "postcss-custom-properties": "^12.1.9",
"postcss-custom-selectors": "^6.0.3",
"postcss-dir-pseudo-class": "^6.0.5",
"postcss-double-position-gradients": "^3.1.2",
@@ -13490,7 +13489,7 @@
"postcss-lab-function": "^4.2.1",
"postcss-logical": "^5.0.4",
"postcss-media-minmax": "^5.0.0",
- "postcss-nesting": "^10.1.10",
+ "postcss-nesting": "^10.2.0",
"postcss-opacity-percentage": "^1.1.2",
"postcss-overflow-shorthand": "^3.0.4",
"postcss-page-break": "^3.0.4",
@@ -14079,9 +14078,9 @@
"integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
},
"node_modules/react-i18next": {
- "version": "11.18.5",
- "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.5.tgz",
- "integrity": "sha512-cKcyuuzIv0YUZ4l9WORflVNuhISPAqQShOAsxwFyYuJoCA7HlLmHm7XnvO6hfAGmGpDNRhJHoBX8hG49Cb2xZQ==",
+ "version": "11.18.6",
+ "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.6.tgz",
+ "integrity": "sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==",
"dependencies": {
"@babel/runtime": "^7.14.5",
"html-parse-stringify": "^3.0.1"
@@ -14124,23 +14123,29 @@
}
},
"node_modules/react-router": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz",
- "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==",
+ "version": "6.4.1",
+ "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.4.1.tgz",
+ "integrity": "sha512-OJASKp5AykDWFewgWUim1vlLr7yfD4vO/h+bSgcP/ix8Md+LMHuAjovA74MQfsfhQJGGN1nHRhwS5qQQbbBt3A==",
"dependencies": {
- "history": "^5.2.0"
+ "@remix-run/router": "1.0.1"
+ },
+ "engines": {
+ "node": ">=14"
},
"peerDependencies": {
"react": ">=16.8"
}
},
"node_modules/react-router-dom": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz",
- "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==",
+ "version": "6.4.1",
+ "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.4.1.tgz",
+ "integrity": "sha512-MY7NJCrGNVJtGp8ODMOBHu20UaIkmwD2V3YsAOUQoCXFk7Ppdwf55RdcGyrSj+ycSL9Uiwrb3gTLYSnzcRoXww==",
"dependencies": {
- "history": "^5.2.0",
- "react-router": "6.3.0"
+ "@remix-run/router": "1.0.1",
+ "react-router": "6.4.1"
+ },
+ "engines": {
+ "node": ">=14"
},
"peerDependencies": {
"react": ">=16.8",
@@ -14308,9 +14313,9 @@
"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
},
"node_modules/regenerate-unicode-properties": {
- "version": "10.0.1",
- "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
- "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
+ "version": "10.1.0",
+ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+ "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
"dependencies": {
"regenerate": "^1.4.2"
},
@@ -14364,14 +14369,14 @@
}
},
"node_modules/regexpu-core": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz",
- "integrity": "sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
+ "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
"dependencies": {
"regenerate": "^1.4.2",
- "regenerate-unicode-properties": "^10.0.1",
- "regjsgen": "^0.6.0",
- "regjsparser": "^0.8.2",
+ "regenerate-unicode-properties": "^10.1.0",
+ "regjsgen": "^0.7.1",
+ "regjsparser": "^0.9.1",
"unicode-match-property-ecmascript": "^2.0.0",
"unicode-match-property-value-ecmascript": "^2.0.0"
},
@@ -14380,14 +14385,14 @@
}
},
"node_modules/regjsgen": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
- "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
+ "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
},
"node_modules/regjsparser": {
- "version": "0.8.4",
- "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
- "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
+ "version": "0.9.1",
+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+ "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
"dependencies": {
"jsesc": "~0.5.0"
},
@@ -14583,9 +14588,9 @@
}
},
"node_modules/rollup": {
- "version": "2.79.0",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.0.tgz",
- "integrity": "sha512-x4KsrCgwQ7ZJPcFA/SUu6QVcYlO7uRLfLAy0DSA4NS2eG8japdbpM50ToH7z4iObodRYOJ0soneF0iaQRJ6zhA==",
+ "version": "2.79.1",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+ "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
"bin": {
"rollup": "dist/bin/rollup"
},
@@ -14677,6 +14682,19 @@
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
+ "node_modules/safe-regex-test": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+ "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+ "dependencies": {
+ "call-bind": "^1.0.2",
+ "get-intrinsic": "^1.1.3",
+ "is-regex": "^1.1.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -14771,9 +14789,9 @@
"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
},
"node_modules/selfsigned": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz",
- "integrity": "sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==",
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
+ "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
"dependencies": {
"node-forge": "^1"
},
@@ -15373,9 +15391,9 @@
}
},
"node_modules/supports-hyperlinks": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
- "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+ "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
"dependencies": {
"has-flag": "^4.0.0",
"supports-color": "^7.0.0"
@@ -15867,9 +15885,9 @@
}
},
"node_modules/typescript": {
- "version": "4.8.2",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
- "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
+ "version": "4.8.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz",
+ "integrity": "sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==",
"peer": true,
"bin": {
"tsc": "bin/tsc",
@@ -15922,9 +15940,9 @@
}
},
"node_modules/unicode-property-aliases-ecmascript": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
- "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+ "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
"engines": {
"node": ">=4"
}
@@ -15971,9 +15989,9 @@
}
},
"node_modules/update-browserslist-db": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz",
- "integrity": "sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg==",
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
+ "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
"funding": [
{
"type": "opencollective",
@@ -16262,9 +16280,9 @@
}
},
"node_modules/webpack-dev-server": {
- "version": "4.10.1",
- "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.10.1.tgz",
- "integrity": "sha512-FIzMq3jbBarz3ld9l7rbM7m6Rj1lOsgq/DyLGMX/fPEB1UBUPtf5iL/4eNfhx8YYJTRlzfv107UfWSWcBK5Odw==",
+ "version": "4.11.1",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
+ "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
"dependencies": {
"@types/bonjour": "^3.5.9",
"@types/connect-history-api-fallback": "^1.3.5",
@@ -16289,7 +16307,7 @@
"p-retry": "^4.5.0",
"rimraf": "^3.0.2",
"schema-utils": "^4.0.0",
- "selfsigned": "^2.0.1",
+ "selfsigned": "^2.1.1",
"serve-index": "^1.9.1",
"sockjs": "^0.3.24",
"spdy": "^4.0.2",
@@ -16365,9 +16383,9 @@
}
},
"node_modules/webpack-dev-server/node_modules/ws": {
- "version": "8.8.1",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
- "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
+ "version": "8.9.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
+ "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
"engines": {
"node": ">=10.0.0"
},
@@ -17024,24 +17042,24 @@
}
},
"@babel/compat-data": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.0.tgz",
- "integrity": "sha512-y5rqgTTPTmaF5e2nVhOxw+Ur9HDJLsWb6U/KpgUzRZEdPfE6VOubXBKLdbcUTijzRptednSBDQbYZBOSqJxpJw=="
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.19.1.tgz",
+ "integrity": "sha512-72a9ghR0gnESIa7jBN53U32FOVCEoztyIlKaNoU05zRhEecduGK9L9c3ww7Mp06JiR+0ls0GBPFJQwwtjn9ksg=="
},
"@babel/core": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.0.tgz",
- "integrity": "sha512-reM4+U7B9ss148rh2n1Qs9ASS+w94irYXga7c2jaQv9RVzpS7Mv1a9rnYYwuDa45G+DkORt9g6An2k/V4d9LbQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.1.tgz",
+ "integrity": "sha512-1H8VgqXme4UXCRv7/Wa1bq7RVymKOzC7znjyFM8KiEzwFqcKUKYNoQef4GhdklgNvoBXyW4gYhuBNCM5o1zImw==",
"requires": {
"@ampproject/remapping": "^2.1.0",
"@babel/code-frame": "^7.18.6",
"@babel/generator": "^7.19.0",
- "@babel/helper-compilation-targets": "^7.19.0",
+ "@babel/helper-compilation-targets": "^7.19.1",
"@babel/helper-module-transforms": "^7.19.0",
"@babel/helpers": "^7.19.0",
- "@babel/parser": "^7.19.0",
+ "@babel/parser": "^7.19.1",
"@babel/template": "^7.18.10",
- "@babel/traverse": "^7.19.0",
+ "@babel/traverse": "^7.19.1",
"@babel/types": "^7.19.0",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
@@ -17051,33 +17069,19 @@
}
},
"@babel/eslint-parser": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.9.tgz",
- "integrity": "sha512-KzSGpMBggz4fKbRbWLNyPVTuQr6cmCcBhOyXTw/fieOVaw5oYAwcAj4a7UKcDYCPxQq+CG1NCDZH9e2JTXquiQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz",
+ "integrity": "sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ==",
"requires": {
- "eslint-scope": "^5.1.1",
+ "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
"eslint-visitor-keys": "^2.1.0",
"semver": "^6.3.0"
},
"dependencies": {
- "eslint-scope": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
- "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
- "requires": {
- "esrecurse": "^4.3.0",
- "estraverse": "^4.1.1"
- }
- },
"eslint-visitor-keys": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
"integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
- },
- "estraverse": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
- "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
}
}
},
@@ -17121,13 +17125,13 @@
}
},
"@babel/helper-compilation-targets": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.0.tgz",
- "integrity": "sha512-Ai5bNWXIvwDvWM7njqsG3feMlL9hCVQsPYXodsZyLwshYkZVJt59Gftau4VrE8S9IT9asd2uSP1hG6wCNw+sXA==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.1.tgz",
+ "integrity": "sha512-LlLkkqhCMyz2lkQPvJNdIYU7O5YjWRgC2R4omjCTpZd8u8KMQzZvX4qce+/BluN1rcQiV7BoGUpmQ0LeHerbhg==",
"requires": {
- "@babel/compat-data": "^7.19.0",
+ "@babel/compat-data": "^7.19.1",
"@babel/helper-validator-option": "^7.18.6",
- "browserslist": "^4.20.2",
+ "browserslist": "^4.21.3",
"semver": "^6.3.0"
}
},
@@ -17155,9 +17159,9 @@
}
},
"@babel/helper-define-polyfill-provider": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz",
- "integrity": "sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
+ "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
"requires": {
"@babel/helper-compilation-targets": "^7.17.7",
"@babel/helper-plugin-utils": "^7.16.7",
@@ -17253,15 +17257,15 @@
}
},
"@babel/helper-replace-supers": {
- "version": "7.18.9",
- "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz",
- "integrity": "sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
+ "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
"requires": {
"@babel/helper-environment-visitor": "^7.18.9",
"@babel/helper-member-expression-to-functions": "^7.18.9",
"@babel/helper-optimise-call-expression": "^7.18.6",
- "@babel/traverse": "^7.18.9",
- "@babel/types": "^7.18.9"
+ "@babel/traverse": "^7.19.1",
+ "@babel/types": "^7.19.0"
}
},
"@babel/helper-simple-access": {
@@ -17294,9 +17298,9 @@
"integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="
},
"@babel/helper-validator-identifier": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz",
- "integrity": "sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+ "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="
},
"@babel/helper-validator-option": {
"version": "7.18.6",
@@ -17335,9 +17339,9 @@
}
},
"@babel/parser": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz",
- "integrity": "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw=="
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz",
+ "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A=="
},
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
"version": "7.18.6",
@@ -17358,9 +17362,9 @@
}
},
"@babel/plugin-proposal-async-generator-functions": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.0.tgz",
- "integrity": "sha512-nhEByMUTx3uZueJ/QkJuSlCfN4FGg+xy+vRsfGQGzSauq5ks2Deid2+05Q3KhfaUjvec1IGhw/Zm3cFm8JigTQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
+ "integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
"requires": {
"@babel/helper-environment-visitor": "^7.18.9",
"@babel/helper-plugin-utils": "^7.19.0",
@@ -17388,13 +17392,13 @@
}
},
"@babel/plugin-proposal-decorators": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.0.tgz",
- "integrity": "sha512-Bo5nOSjiJccjv00+BrDkmfeBLBi2B0qe8ygj24KdL8VdwtZz+710NCwehF+x/Ng+0mkHx5za2eAofmvVFLF4Fg==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.1.tgz",
+ "integrity": "sha512-LfIKNBBY7Q1OX5C4xAgRQffOg2OnhAo9fnbcOHgOC9Yytm2Sw+4XqHufRYU86tHomzepxtvuVaNO+3EVKR4ivw==",
"requires": {
"@babel/helper-create-class-features-plugin": "^7.19.0",
"@babel/helper-plugin-utils": "^7.19.0",
- "@babel/helper-replace-supers": "^7.18.9",
+ "@babel/helper-replace-supers": "^7.19.1",
"@babel/helper-split-export-declaration": "^7.18.6",
"@babel/plugin-syntax-decorators": "^7.19.0"
}
@@ -17859,9 +17863,9 @@
}
},
"@babel/plugin-transform-named-capturing-groups-regex": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.0.tgz",
- "integrity": "sha512-HDSuqOQzkU//kfGdiHBt71/hkDTApw4U/cMVgKgX7PqfB3LOaK+2GtCEsBu1dL9CkswDm0Gwehht1dCr421ULQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
+ "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
"requires": {
"@babel/helper-create-regexp-features-plugin": "^7.19.0",
"@babel/helper-plugin-utils": "^7.19.0"
@@ -17963,15 +17967,15 @@
}
},
"@babel/plugin-transform-runtime": {
- "version": "7.18.10",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz",
- "integrity": "sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.1.tgz",
+ "integrity": "sha512-2nJjTUFIzBMP/f/miLxEK9vxwW/KUXsdvN4sR//TmuDhe6yU2h57WmIOE12Gng3MDP/xpjUV/ToZRdcf8Yj4fA==",
"requires": {
"@babel/helper-module-imports": "^7.18.6",
- "@babel/helper-plugin-utils": "^7.18.9",
- "babel-plugin-polyfill-corejs2": "^0.3.2",
- "babel-plugin-polyfill-corejs3": "^0.5.3",
- "babel-plugin-polyfill-regenerator": "^0.4.0",
+ "@babel/helper-plugin-utils": "^7.19.0",
+ "babel-plugin-polyfill-corejs2": "^0.3.3",
+ "babel-plugin-polyfill-corejs3": "^0.6.0",
+ "babel-plugin-polyfill-regenerator": "^0.4.1",
"semver": "^6.3.0"
}
},
@@ -18017,9 +18021,9 @@
}
},
"@babel/plugin-transform-typescript": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.0.tgz",
- "integrity": "sha512-DOOIywxPpkQHXijXv+s9MDAyZcLp12oYRl3CMWZ6u7TjSoCBq/KqHR/nNFR3+i2xqheZxoF0H2XyL7B6xeSRuA==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.19.1.tgz",
+ "integrity": "sha512-+ILcOU+6mWLlvCwnL920m2Ow3wWx3Wo8n2t5aROQmV55GZt+hOiLvBaa3DNzRjSEHa1aauRs4/YLmkCfFkhhRQ==",
"requires": {
"@babel/helper-create-class-features-plugin": "^7.19.0",
"@babel/helper-plugin-utils": "^7.19.0",
@@ -18044,17 +18048,17 @@
}
},
"@babel/preset-env": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.0.tgz",
- "integrity": "sha512-1YUju1TAFuzjIQqNM9WsF4U6VbD/8t3wEAlw3LFYuuEr+ywqLRcSXxFKz4DCEj+sN94l/XTDiUXYRrsvMpz9WQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.1.tgz",
+ "integrity": "sha512-c8B2c6D16Lp+Nt6HcD+nHl0VbPKVnNPTpszahuxJJnurfMtKeZ80A+qUv48Y7wqvS+dTFuLuaM9oYxyNHbCLWA==",
"requires": {
- "@babel/compat-data": "^7.19.0",
- "@babel/helper-compilation-targets": "^7.19.0",
+ "@babel/compat-data": "^7.19.1",
+ "@babel/helper-compilation-targets": "^7.19.1",
"@babel/helper-plugin-utils": "^7.19.0",
"@babel/helper-validator-option": "^7.18.6",
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
- "@babel/plugin-proposal-async-generator-functions": "^7.19.0",
+ "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-class-static-block": "^7.18.6",
"@babel/plugin-proposal-dynamic-import": "^7.18.6",
@@ -18102,7 +18106,7 @@
"@babel/plugin-transform-modules-commonjs": "^7.18.6",
"@babel/plugin-transform-modules-systemjs": "^7.19.0",
"@babel/plugin-transform-modules-umd": "^7.18.6",
- "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.0",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
"@babel/plugin-transform-new-target": "^7.18.6",
"@babel/plugin-transform-object-super": "^7.18.6",
"@babel/plugin-transform-parameters": "^7.18.8",
@@ -18118,10 +18122,10 @@
"@babel/plugin-transform-unicode-regex": "^7.18.6",
"@babel/preset-modules": "^0.1.5",
"@babel/types": "^7.19.0",
- "babel-plugin-polyfill-corejs2": "^0.3.2",
- "babel-plugin-polyfill-corejs3": "^0.5.3",
- "babel-plugin-polyfill-regenerator": "^0.4.0",
- "core-js-compat": "^3.22.1",
+ "babel-plugin-polyfill-corejs2": "^0.3.3",
+ "babel-plugin-polyfill-corejs3": "^0.6.0",
+ "babel-plugin-polyfill-regenerator": "^0.4.1",
+ "core-js-compat": "^3.25.1",
"semver": "^6.3.0"
}
},
@@ -18169,11 +18173,11 @@
}
},
"@babel/runtime-corejs3": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.19.0.tgz",
- "integrity": "sha512-JyXXoCu1N8GLuKc2ii8y5RGma5FMpFeO2nAQIe0Yzrbq+rQnN+sFj47auLblR5ka6aHNGPDgv8G/iI2Grb0ldQ==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.19.1.tgz",
+ "integrity": "sha512-j2vJGnkopRzH+ykJ8h68wrHnEUmtK//E723jjixiAl/PPf6FhqY/vYRcMVlNydRKQjQsTsYEjpx+DZMIvnGk/g==",
"requires": {
- "core-js-pure": "^3.20.2",
+ "core-js-pure": "^3.25.1",
"regenerator-runtime": "^0.13.4"
}
},
@@ -18188,9 +18192,9 @@
}
},
"@babel/traverse": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.0.tgz",
- "integrity": "sha512-4pKpFRDh+utd2mbRC8JLnlsMUii3PMHjpL6a0SZ4NMZy7YFP9aXORxEhdMVOc9CpWtDF09IkciQLEhK7Ml7gRA==",
+ "version": "7.19.1",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.19.1.tgz",
+ "integrity": "sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==",
"requires": {
"@babel/code-frame": "^7.18.6",
"@babel/generator": "^7.19.0",
@@ -18198,7 +18202,7 @@
"@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.0",
+ "@babel/parser": "^7.19.1",
"@babel/types": "^7.19.0",
"debug": "^4.1.0",
"globals": "^11.1.0"
@@ -18225,9 +18229,9 @@
"integrity": "sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg=="
},
"@csstools/postcss-cascade-layers": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.0.5.tgz",
- "integrity": "sha512-Id/9wBT7FkgFzdEpiEWrsVd4ltDxN0rI0QS0SChbeQiSuux3z21SJCRLu6h2cvCEUmaRi+VD0mHFj+GJD4GFnw==",
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz",
+ "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==",
"requires": {
"@csstools/selector-specificity": "^2.0.2",
"postcss-selector-parser": "^6.0.10"
@@ -18461,9 +18465,9 @@
"integrity": "sha512-AHPmaAx+RYfZz0eYu6Gviiagpmiyw98ySSlQvCUhVGDRtDFe4DBS0x1bSjdF3gqUDYOczB+yYvBTtEylYSdRhg=="
},
"@eslint/eslintrc": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.1.tgz",
- "integrity": "sha512-OhSY22oQQdw3zgPOOwdoj01l/Dzl1Z+xyUP33tkSN+aqyEhymJCcPHyXt+ylW8FSe0TfRC2VG+ROQOapD0aZSQ==",
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz",
+ "integrity": "sha512-AXYd23w1S/bv3fTs3Lz0vjiYemS08jWkI3hYyS9I1ry+0f+Yjs1wm+sU0BS8qDOPrBIkp4qHYC16I8uVtpLajQ==",
"requires": {
"ajv": "^6.12.4",
"debug": "^4.3.2",
@@ -18505,9 +18509,9 @@
}
},
"@humanwhocodes/config-array": {
- "version": "0.10.4",
- "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz",
- "integrity": "sha512-mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw==",
+ "version": "0.10.5",
+ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.5.tgz",
+ "integrity": "sha512-XVVDtp+dVvRxMoxSiSfasYaG02VEe1qH5cKgMQJWhol6HwzbcqoCMJi8dAGoYAO57jhUyhI6cWuRiTcRaDaYug==",
"requires": {
"@humanwhocodes/object-schema": "^1.2.1",
"debug": "^4.1.1",
@@ -19081,14 +19085,14 @@
"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
},
"@mui/base": {
- "version": "5.0.0-alpha.95",
- "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.95.tgz",
- "integrity": "sha512-fcxnDeO7rBwzP0buVdI5fn0aA7NQ/AeUV5RzIIH0kOXVVT21HB4JFf41Qhwd0PIq63PXxmc6Fs2mdlzMYuPo9g==",
+ "version": "5.0.0-alpha.98",
+ "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.98.tgz",
+ "integrity": "sha512-c0U51+K2m57MASpRrmNs6qTXSvktDbVcSjD8zCRPbfuwYWERGGwNxwM3/jsBa4dSojTSmLPnOBFDypl74Ds6yQ==",
"requires": {
- "@babel/runtime": "^7.18.9",
+ "@babel/runtime": "^7.19.0",
"@emotion/is-prop-valid": "^1.2.0",
"@mui/types": "^7.2.0",
- "@mui/utils": "^5.10.3",
+ "@mui/utils": "^5.10.6",
"@popperjs/core": "^2.11.6",
"clsx": "^1.2.1",
"prop-types": "^15.8.1",
@@ -19096,29 +19100,29 @@
}
},
"@mui/core-downloads-tracker": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.3.tgz",
- "integrity": "sha512-mX2S0d1oboKBbWQqWIgRmyALAEzh37yiknpD3mKx8bcoMKbp1VtqzIt0aeHP16Uhsd0eValDFILxLNHWi0oddQ=="
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.6.tgz",
+ "integrity": "sha512-dmyQBqrKmVU6yCSM4GGal5qNXpViXX+/V1t0GA1A5i9QF5Gx6noV/cw0hrSS2ffLT8L2oScq1oTdA6NVIiQ8lg=="
},
"@mui/icons-material": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.10.3.tgz",
- "integrity": "sha512-o0kbUlsWCBtCE0wP33cGKbyryCh7kpm2EECYMPDmWrLhbA+HUODXIdhiTFS26szp2xXo9HY1lEx0ufeJ+tddYw==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.10.6.tgz",
+ "integrity": "sha512-QwxdRmLA46S94B0hExPDx0td+A2unF+33bQ6Cs+lNpJKVsm1YeHwNdYXYcnpWeHeQQ07055OXl7IB2GKDd0MfA==",
"requires": {
- "@babel/runtime": "^7.18.9"
+ "@babel/runtime": "^7.19.0"
}
},
"@mui/material": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.3.tgz",
- "integrity": "sha512-g0lzHcqWHYeOEAxTzcwpM1I7b+wyiRTeXkEdRsspnOpZtb0H/1xg386tMFRGbxBJ4zfVGT+TWublofw7pyQkqw==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.6.tgz",
+ "integrity": "sha512-QilW5PAAGSQdN7Cpp4rwSQ1doJAt3ca1a2PHZtr8RLVlpHnXb+qQ8CeDo9+9V2fK5CDNdtTN1F+iJKO43aFBpQ==",
"requires": {
- "@babel/runtime": "^7.18.9",
- "@mui/base": "5.0.0-alpha.95",
- "@mui/core-downloads-tracker": "^5.10.3",
- "@mui/system": "^5.10.3",
+ "@babel/runtime": "^7.19.0",
+ "@mui/base": "5.0.0-alpha.98",
+ "@mui/core-downloads-tracker": "^5.10.6",
+ "@mui/system": "^5.10.6",
"@mui/types": "^7.2.0",
- "@mui/utils": "^5.10.3",
+ "@mui/utils": "^5.10.6",
"@types/react-transition-group": "^4.4.5",
"clsx": "^1.2.1",
"csstype": "^3.1.0",
@@ -19128,36 +19132,36 @@
}
},
"@mui/private-theming": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.10.3.tgz",
- "integrity": "sha512-LCYIKlkGz2BTSng2BFzzwSJBRZbChIUri2x2Nh8ryk2B1Ho7zpvE7ex6y39LlStG2Frf92NFC/V4YQbmMAjD5A==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.10.6.tgz",
+ "integrity": "sha512-I/W0QyTLRdEx6py3lKAquKO/rNF/7j+nIOM/xCyI9kU0fcotVTcTY08mKMsS6vrzdWpi6pAkD0wP0KwWy5R5VA==",
"requires": {
- "@babel/runtime": "^7.18.9",
- "@mui/utils": "^5.10.3",
+ "@babel/runtime": "^7.19.0",
+ "@mui/utils": "^5.10.6",
"prop-types": "^15.8.1"
}
},
"@mui/styled-engine": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.3.tgz",
- "integrity": "sha512-9Uz7eB8xXoiDvpJ9qBxZ/2xGO8xKfA2T23dw4AsQ69SQtGatrOLAapzP2lNr0tfB9xvKucclPFhRO5aLhDFOVQ==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.6.tgz",
+ "integrity": "sha512-OnVw5xnO4l0XzlJFhKif/RlLenBNhyEQQlSTwB9ApSWB05UAU5ZSbjNsRfyEKvgmQ/fPa+MqPD/dzxbIRCwyeg==",
"requires": {
- "@babel/runtime": "^7.18.9",
+ "@babel/runtime": "^7.19.0",
"@emotion/cache": "^11.10.3",
"csstype": "^3.1.0",
"prop-types": "^15.8.1"
}
},
"@mui/system": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.3.tgz",
- "integrity": "sha512-uLW/CIz3zk1jr5zH0ahOUqJIrpWP02Mv4emfrplh7Mh5JCb/oumhYaC/ALJJEjzUHKg9wwiyuM0pCwK/kSf1jQ==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.6.tgz",
+ "integrity": "sha512-HfQVX7e2xpQ3jtdB/WwtkFVtozMOozyN575/63u8ILHkE8wGDhblmCieAsnyJPFbm7WBW5PCMyzmfr4QyKLaYg==",
"requires": {
- "@babel/runtime": "^7.18.9",
- "@mui/private-theming": "^5.10.3",
- "@mui/styled-engine": "^5.10.3",
+ "@babel/runtime": "^7.19.0",
+ "@mui/private-theming": "^5.10.6",
+ "@mui/styled-engine": "^5.10.6",
"@mui/types": "^7.2.0",
- "@mui/utils": "^5.10.3",
+ "@mui/utils": "^5.10.6",
"clsx": "^1.2.1",
"csstype": "^3.1.0",
"prop-types": "^15.8.1"
@@ -19170,17 +19174,41 @@
"requires": {}
},
"@mui/utils": {
- "version": "5.10.3",
- "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.10.3.tgz",
- "integrity": "sha512-4jXMDPfx6bpMVuheLaOpKTjpzw39ogAZLeaLj5+RJec3E37/hAZMYjURfblLfTWMMoGoqkY03mNsZaEwNobBow==",
+ "version": "5.10.6",
+ "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.10.6.tgz",
+ "integrity": "sha512-g0Qs8xN/MW2M3fLL8197h5J2VB9U+49fLlnKKqC6zy/yus5cZwdT+Gwec+wUMxgwQoxMDn+J8oDWAn28kEOR/Q==",
"requires": {
- "@babel/runtime": "^7.18.9",
+ "@babel/runtime": "^7.19.0",
"@types/prop-types": "^15.7.5",
"@types/react-is": "^16.7.1 || ^17.0.0",
"prop-types": "^15.8.1",
"react-is": "^18.2.0"
}
},
+ "@nicolo-ribaudo/eslint-scope-5-internals": {
+ "version": "5.1.1-v1",
+ "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+ "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+ "requires": {
+ "eslint-scope": "5.1.1"
+ },
+ "dependencies": {
+ "eslint-scope": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+ "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+ "requires": {
+ "esrecurse": "^4.3.0",
+ "estraverse": "^4.1.1"
+ }
+ },
+ "estraverse": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+ }
+ }
+ },
"@nodelib/fs.scandir": {
"version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -19232,6 +19260,11 @@
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz",
"integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="
},
+ "@remix-run/router": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.0.1.tgz",
+ "integrity": "sha512-eBV5rvW4dRFOU1eajN7FmYxjAIVz/mRHgUE9En9mBn6m3mulK3WTR5C3iQhL9MZ14rWAq+xOlEaCkDiW0/heOg=="
+ },
"@rollup/plugin-babel": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -19281,14 +19314,14 @@
}
},
"@rushstack/eslint-patch": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.4.tgz",
- "integrity": "sha512-LwzQKA4vzIct1zNZzBmRKI9QuNpLgTQMEjsQLf3BXuGYb3QPTP4Yjf6mkdX+X1mYttZ808QpOwAzZjv28kq7DA=="
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.2.0.tgz",
+ "integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="
},
"@sinclair/typebox": {
- "version": "0.24.35",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.35.tgz",
- "integrity": "sha512-iN6ehuDndiTiDz2F+Orv/+oHJR+PrGv+38oghCddpsW4YEZl5qyLsWxSwYUWrKEOfjpGtXDFW6scJtjpzSLeSw=="
+ "version": "0.24.42",
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.42.tgz",
+ "integrity": "sha512-d+2AtrHGyWek2u2ITF0lHRIv6Tt7X0dEHW+0rP+5aDCEjC3fiN2RBjrLD0yU0at52BcZbRGxLbAtXiR0hFCjYw=="
},
"@sinonjs/commons": {
"version": "1.8.3",
@@ -19531,9 +19564,9 @@
"integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="
},
"@types/express": {
- "version": "4.17.13",
- "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
- "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
+ "version": "4.17.14",
+ "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
+ "integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
"requires": {
"@types/body-parser": "*",
"@types/express-serve-static-core": "^4.17.18",
@@ -19542,9 +19575,9 @@
}
},
"@types/express-serve-static-core": {
- "version": "4.17.30",
- "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz",
- "integrity": "sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ==",
+ "version": "4.17.31",
+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
+ "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
"requires": {
"@types/node": "*",
"@types/qs": "*",
@@ -19609,9 +19642,9 @@
"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
},
"@types/node": {
- "version": "18.7.15",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.15.tgz",
- "integrity": "sha512-XnjpaI8Bgc3eBag2Aw4t2Uj/49lLBSStHWfqKvIuXD7FIrZyMLWp8KuAFHAqxMZYTF9l08N1ctUn9YNybZJVmQ=="
+ "version": "18.7.18",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz",
+ "integrity": "sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="
},
"@types/parse-json": {
"version": "4.0.0",
@@ -19644,9 +19677,9 @@
"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
},
"@types/react": {
- "version": "18.0.18",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.18.tgz",
- "integrity": "sha512-6hI08umYs6NaiHFEEGioXnxJ+oEhY3eRz8VCUaudZmGdtvPviCJB8mgaMxaDWAdPSYd4eFavrPk2QIolwbLYrg==",
+ "version": "18.0.21",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.21.tgz",
+ "integrity": "sha512-7QUCOxvFgnD5Jk8ZKlUAhVcRj7GuJRjnjjiY/IUBWKgOlnvDvTMLD4RTF7NPyVmbRhNrbomZiOepg7M/2Kj1mA==",
"requires": {
"@types/prop-types": "*",
"@types/scheduler": "*",
@@ -19744,15 +19777,14 @@
"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
},
"@typescript-eslint/eslint-plugin": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.2.tgz",
- "integrity": "sha512-OwwR8LRwSnI98tdc2z7mJYgY60gf7I9ZfGjN5EjCwwns9bdTuQfAXcsjSB2wSQ/TVNYSGKf4kzVXbNGaZvwiXw==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.0.tgz",
+ "integrity": "sha512-GgHi/GNuUbTOeoJiEANi0oI6fF3gBQc3bGFYj40nnAPCbhrtEDf2rjBmefFadweBmO1Du1YovHeDP2h5JLhtTQ==",
"requires": {
- "@typescript-eslint/scope-manager": "5.36.2",
- "@typescript-eslint/type-utils": "5.36.2",
- "@typescript-eslint/utils": "5.36.2",
+ "@typescript-eslint/scope-manager": "5.38.0",
+ "@typescript-eslint/type-utils": "5.38.0",
+ "@typescript-eslint/utils": "5.38.0",
"debug": "^4.3.4",
- "functional-red-black-tree": "^1.0.1",
"ignore": "^5.2.0",
"regexpp": "^3.2.0",
"semver": "^7.3.7",
@@ -19770,56 +19802,56 @@
}
},
"@typescript-eslint/experimental-utils": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.36.2.tgz",
- "integrity": "sha512-JtRmWb31KQoxGV6CHz8cI+9ki6cC7ciZepXYpCLxsdAtQlBrRBxh5Qpe/ZHyJFOT9j7gyXE+W0shWzRLPfuAFQ==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.38.0.tgz",
+ "integrity": "sha512-kzXBRfvGlicgGk4CYuRUqKvwc2s3wHXNssUWWJU18bhMRxriFm3BZWyQ6vEHBRpEIMKB6b7MIQHO+9lYlts19w==",
"requires": {
- "@typescript-eslint/utils": "5.36.2"
+ "@typescript-eslint/utils": "5.38.0"
}
},
"@typescript-eslint/parser": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.36.2.tgz",
- "integrity": "sha512-qS/Kb0yzy8sR0idFspI9Z6+t7mqk/oRjnAYfewG+VN73opAUvmYL3oPIMmgOX6CnQS6gmVIXGshlb5RY/R22pA==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.38.0.tgz",
+ "integrity": "sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==",
"requires": {
- "@typescript-eslint/scope-manager": "5.36.2",
- "@typescript-eslint/types": "5.36.2",
- "@typescript-eslint/typescript-estree": "5.36.2",
+ "@typescript-eslint/scope-manager": "5.38.0",
+ "@typescript-eslint/types": "5.38.0",
+ "@typescript-eslint/typescript-estree": "5.38.0",
"debug": "^4.3.4"
}
},
"@typescript-eslint/scope-manager": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.36.2.tgz",
- "integrity": "sha512-cNNP51L8SkIFSfce8B1NSUBTJTu2Ts4nWeWbFrdaqjmn9yKrAaJUBHkyTZc0cL06OFHpb+JZq5AUHROS398Orw==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.38.0.tgz",
+ "integrity": "sha512-ByhHIuNyKD9giwkkLqzezZ9y5bALW8VNY6xXcP+VxoH4JBDKjU5WNnsiD4HJdglHECdV+lyaxhvQjTUbRboiTA==",
"requires": {
- "@typescript-eslint/types": "5.36.2",
- "@typescript-eslint/visitor-keys": "5.36.2"
+ "@typescript-eslint/types": "5.38.0",
+ "@typescript-eslint/visitor-keys": "5.38.0"
}
},
"@typescript-eslint/type-utils": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.36.2.tgz",
- "integrity": "sha512-rPQtS5rfijUWLouhy6UmyNquKDPhQjKsaKH0WnY6hl/07lasj8gPaH2UD8xWkePn6SC+jW2i9c2DZVDnL+Dokw==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.38.0.tgz",
+ "integrity": "sha512-iZq5USgybUcj/lfnbuelJ0j3K9dbs1I3RICAJY9NZZpDgBYXmuUlYQGzftpQA9wC8cKgtS6DASTvF3HrXwwozA==",
"requires": {
- "@typescript-eslint/typescript-estree": "5.36.2",
- "@typescript-eslint/utils": "5.36.2",
+ "@typescript-eslint/typescript-estree": "5.38.0",
+ "@typescript-eslint/utils": "5.38.0",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
}
},
"@typescript-eslint/types": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.36.2.tgz",
- "integrity": "sha512-9OJSvvwuF1L5eS2EQgFUbECb99F0mwq501w0H0EkYULkhFa19Qq7WFbycdw1PexAc929asupbZcgjVIe6OK/XQ=="
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.0.tgz",
+ "integrity": "sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA=="
},
"@typescript-eslint/typescript-estree": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.36.2.tgz",
- "integrity": "sha512-8fyH+RfbKc0mTspfuEjlfqA4YywcwQK2Amcf6TDOwaRLg7Vwdu4bZzyvBZp4bjt1RRjQ5MDnOZahxMrt2l5v9w==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.0.tgz",
+ "integrity": "sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==",
"requires": {
- "@typescript-eslint/types": "5.36.2",
- "@typescript-eslint/visitor-keys": "5.36.2",
+ "@typescript-eslint/types": "5.38.0",
+ "@typescript-eslint/visitor-keys": "5.38.0",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -19838,14 +19870,14 @@
}
},
"@typescript-eslint/utils": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.36.2.tgz",
- "integrity": "sha512-uNcopWonEITX96v9pefk9DC1bWMdkweeSsewJ6GeC7L6j2t0SJywisgkr9wUTtXk90fi2Eljj90HSHm3OGdGRg==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.38.0.tgz",
+ "integrity": "sha512-6sdeYaBgk9Fh7N2unEXGz+D+som2QCQGPAf1SxrkEr+Z32gMreQ0rparXTNGRRfYUWk/JzbGdcM8NSSd6oqnTA==",
"requires": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.36.2",
- "@typescript-eslint/types": "5.36.2",
- "@typescript-eslint/typescript-estree": "5.36.2",
+ "@typescript-eslint/scope-manager": "5.38.0",
+ "@typescript-eslint/types": "5.38.0",
+ "@typescript-eslint/typescript-estree": "5.38.0",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
},
@@ -19867,11 +19899,11 @@
}
},
"@typescript-eslint/visitor-keys": {
- "version": "5.36.2",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.36.2.tgz",
- "integrity": "sha512-BtRvSR6dEdrNt7Net2/XDjbYKU5Ml6GqJgVfXT0CxTCJlnIqK7rAGreuWKMT2t8cFUT2Msv5oxw0GMRD7T5J7A==",
+ "version": "5.38.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.0.tgz",
+ "integrity": "sha512-MxnrdIyArnTi+XyFLR+kt/uNAcdOnmT+879os7qDRI+EYySR4crXJq9BXPfRzzLGq0wgxkwidrCJ9WCAoacm1w==",
"requires": {
- "@typescript-eslint/types": "5.36.2",
+ "@typescript-eslint/types": "5.38.0",
"eslint-visitor-keys": "^3.3.0"
}
},
@@ -20086,9 +20118,9 @@
"integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="
},
"address": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/address/-/address-1.2.0.tgz",
- "integrity": "sha512-tNEZYz5G/zYunxFm7sfhAxkXEuLj3K6BKwv6ZURlsF6yiUQ65z0Q2wZW9L5cPUl9ocofGvXOdFYbFHp0+6MOig=="
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/address/-/address-1.2.1.tgz",
+ "integrity": "sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA=="
},
"adjust-sourcemap-loader": {
"version": "4.0.0",
@@ -20289,12 +20321,12 @@
"integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
},
"autoprefixer": {
- "version": "10.4.8",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.8.tgz",
- "integrity": "sha512-75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw==",
+ "version": "10.4.12",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz",
+ "integrity": "sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==",
"requires": {
- "browserslist": "^4.21.3",
- "caniuse-lite": "^1.0.30001373",
+ "browserslist": "^4.21.4",
+ "caniuse-lite": "^1.0.30001407",
"fraction.js": "^4.2.0",
"normalize-range": "^0.1.2",
"picocolors": "^1.0.0",
@@ -20442,30 +20474,30 @@
"requires": {}
},
"babel-plugin-polyfill-corejs2": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz",
- "integrity": "sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==",
+ "version": "0.3.3",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
+ "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
"requires": {
"@babel/compat-data": "^7.17.7",
- "@babel/helper-define-polyfill-provider": "^0.3.2",
+ "@babel/helper-define-polyfill-provider": "^0.3.3",
"semver": "^6.1.1"
}
},
"babel-plugin-polyfill-corejs3": {
- "version": "0.5.3",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz",
- "integrity": "sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==",
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
+ "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
"requires": {
- "@babel/helper-define-polyfill-provider": "^0.3.2",
- "core-js-compat": "^3.21.0"
+ "@babel/helper-define-polyfill-provider": "^0.3.3",
+ "core-js-compat": "^3.25.1"
}
},
"babel-plugin-polyfill-regenerator": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz",
- "integrity": "sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==",
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
+ "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
"requires": {
- "@babel/helper-define-polyfill-provider": "^0.3.2"
+ "@babel/helper-define-polyfill-provider": "^0.3.3"
}
},
"babel-plugin-transform-react-remove-prop-types": {
@@ -20646,14 +20678,14 @@
"integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="
},
"browserslist": {
- "version": "4.21.3",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz",
- "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==",
+ "version": "4.21.4",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz",
+ "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
"requires": {
- "caniuse-lite": "^1.0.30001370",
- "electron-to-chromium": "^1.4.202",
+ "caniuse-lite": "^1.0.30001400",
+ "electron-to-chromium": "^1.4.251",
"node-releases": "^2.0.6",
- "update-browserslist-db": "^1.0.5"
+ "update-browserslist-db": "^1.0.9"
}
},
"bser": {
@@ -20724,9 +20756,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001390",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001390.tgz",
- "integrity": "sha512-sS4CaUM+/+vqQUlCvCJ2WtDlV81aWtHhqeEVkLokVJJa3ViN4zDxAGfq9R8i1m90uGHxo99cy10Od+lvn3hf0g=="
+ "version": "1.0.30001410",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001410.tgz",
+ "integrity": "sha512-QoblBnuE+rG0lc3Ur9ltP5q47lbguipa/ncNMyyGuqPk44FxbScWAeEO+k5fSQ8WekdAK4mWqNs1rADDAiN5xQ=="
},
"case-sensitive-paths-webpack-plugin": {
"version": "2.4.0",
@@ -20791,9 +20823,9 @@
"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="
},
"ci-info": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.3.2.tgz",
- "integrity": "sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg=="
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.4.0.tgz",
+ "integrity": "sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug=="
},
"cjs-module-lexer": {
"version": "1.2.2",
@@ -20992,30 +21024,22 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
},
"core-js": {
- "version": "3.25.0",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.0.tgz",
- "integrity": "sha512-CVU1xvJEfJGhyCpBrzzzU1kjCfgsGUxhEvwUV2e/cOedYWHdmluamx+knDnmhqALddMG16fZvIqvs9aijsHHaA=="
+ "version": "3.25.2",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.2.tgz",
+ "integrity": "sha512-YB4IAT1bjEfxTJ1XYy11hJAKskO+qmhuDBM8/guIfMz4JvdsAQAqvyb97zXX7JgSrfPLG5mRGFWJwJD39ruq2A=="
},
"core-js-compat": {
- "version": "3.25.0",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.0.tgz",
- "integrity": "sha512-extKQM0g8/3GjFx9US12FAgx8KJawB7RCQ5y8ipYLbmfzEzmFRWdDjIlxDx82g7ygcNG85qMVUSRyABouELdow==",
+ "version": "3.25.2",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.2.tgz",
+ "integrity": "sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==",
"requires": {
- "browserslist": "^4.21.3",
- "semver": "7.0.0"
- },
- "dependencies": {
- "semver": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
- "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
- }
+ "browserslist": "^4.21.4"
}
},
"core-js-pure": {
- "version": "3.25.0",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.0.tgz",
- "integrity": "sha512-IeHpLwk3uoci37yoI2Laty59+YqH9x5uR65/yiA0ARAJrTrN4YU0rmauLWfvqOuk77SlNJXj2rM6oT/dBD87+A=="
+ "version": "3.25.2",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.2.tgz",
+ "integrity": "sha512-ItD7YpW1cUB4jaqFLZXe1AXkyqIxz6GqPnsDV4uF4hVcWh/WAGIqSqw5p0/WdsILM0Xht9s3Koyw05R3K6RtiA=="
},
"core-util-is": {
"version": "1.0.3",
@@ -21315,9 +21339,9 @@
}
},
"csstype": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz",
- "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",
+ "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
},
"damerau-levenshtein": {
"version": "1.0.8",
@@ -21363,9 +21387,9 @@
}
},
"decimal.js": {
- "version": "10.4.0",
- "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.0.tgz",
- "integrity": "sha512-Nv6ENEzyPQ6AItkGwLE2PGKinZZ9g59vSh2BeH6NqPu0OTKZ5ruJsVqh/orbAnqXc9pBbgXAIrc2EyaCj8NpGg=="
+ "version": "10.4.1",
+ "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.1.tgz",
+ "integrity": "sha512-F29o+vci4DodHYT9UrR5IEbfBw9pE5eSapIJdTqXK5+6hq+t8VRxwQyKlW2i+KDKFkkJQRvFyI/QXD83h8LyQw=="
},
"dedent": {
"version": "0.7.0",
@@ -21626,9 +21650,9 @@
}
},
"electron-to-chromium": {
- "version": "1.4.241",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.241.tgz",
- "integrity": "sha512-e7Wsh4ilaioBZ5bMm6+F4V5c11dh56/5Jwz7Hl5Tu1J7cnB+Pqx5qIF2iC7HPpfyQMqGSvvLP5bBAIDd2gAtGw=="
+ "version": "1.4.258",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.258.tgz",
+ "integrity": "sha512-vutF4q0dTUXoAFI7Vbtdwen/BJVwPgj8GRg/SElOodfH7VTX+svUe62A5BG41QRQGk5HsZPB0M++KH1lAlOt0A=="
},
"emittery": {
"version": "0.8.1",
@@ -21681,21 +21705,21 @@
}
},
"es-abstract": {
- "version": "1.20.2",
- "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.2.tgz",
- "integrity": "sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==",
+ "version": "1.20.3",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.3.tgz",
+ "integrity": "sha512-AyrnaKVpMzljIdwjzrj+LxGmj8ik2LckwXacHqrJJ/jxz6dDDBcZ7I7nlHM0FvEW8MfbWJwOd+yT2XzYW49Frw==",
"requires": {
"call-bind": "^1.0.2",
"es-to-primitive": "^1.2.1",
"function-bind": "^1.1.1",
"function.prototype.name": "^1.1.5",
- "get-intrinsic": "^1.1.2",
+ "get-intrinsic": "^1.1.3",
"get-symbol-description": "^1.0.0",
"has": "^1.0.3",
"has-property-descriptors": "^1.0.0",
"has-symbols": "^1.0.3",
"internal-slot": "^1.0.3",
- "is-callable": "^1.2.4",
+ "is-callable": "^1.2.6",
"is-negative-zero": "^2.0.2",
"is-regex": "^1.1.4",
"is-shared-array-buffer": "^1.0.2",
@@ -21705,6 +21729,7 @@
"object-keys": "^1.1.1",
"object.assign": "^4.1.4",
"regexp.prototype.flags": "^1.4.3",
+ "safe-regex-test": "^1.0.0",
"string.prototype.trimend": "^1.0.5",
"string.prototype.trimstart": "^1.0.5",
"unbox-primitive": "^1.0.2"
@@ -21809,11 +21834,11 @@
}
},
"eslint": {
- "version": "8.23.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.0.tgz",
- "integrity": "sha512-pBG/XOn0MsJcKcTRLr27S5HpzQo4kLr+HjLQIyK4EiCsijDl/TB+h5uEuJU6bQ8Edvwz1XWOjpaP2qgnXGpTcA==",
+ "version": "8.23.1",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.1.tgz",
+ "integrity": "sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==",
"requires": {
- "@eslint/eslintrc": "^1.3.1",
+ "@eslint/eslintrc": "^1.3.2",
"@humanwhocodes/config-array": "^0.10.4",
"@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
"@humanwhocodes/module-importer": "^1.0.1",
@@ -21832,7 +21857,6 @@
"fast-deep-equal": "^3.1.3",
"file-entry-cache": "^6.0.1",
"find-up": "^5.0.0",
- "functional-red-black-tree": "^1.0.1",
"glob-parent": "^6.0.1",
"globals": "^13.15.0",
"globby": "^11.1.0",
@@ -21841,6 +21865,7 @@
"import-fresh": "^3.0.0",
"imurmurhash": "^0.1.4",
"is-glob": "^4.0.0",
+ "js-sdsl": "^4.1.4",
"js-yaml": "^4.1.0",
"json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.4.1",
@@ -22064,9 +22089,9 @@
}
},
"eslint-plugin-react": {
- "version": "7.31.6",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.6.tgz",
- "integrity": "sha512-CXu4eu28sb8Sd2+cyUYsJVyDvpTlaXPG+bOzzpS9IzZKtye96AYX3ZmHQ6ayn/OAIQ/ufDJP8ElPWd63Pepn9w==",
+ "version": "7.31.8",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.8.tgz",
+ "integrity": "sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==",
"requires": {
"array-includes": "^3.1.5",
"array.prototype.flatmap": "^1.3.0",
@@ -22111,9 +22136,9 @@
"requires": {}
},
"eslint-plugin-testing-library": {
- "version": "5.6.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.6.1.tgz",
- "integrity": "sha512-url6n7SbPg77TM2MLy1XkcrQEWiS5nKcDiJgwOYz2qGCEMywM7gizPzLi3XalJPdpIkQAo2BJFQZC6jggsyCuQ==",
+ "version": "5.7.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.7.0.tgz",
+ "integrity": "sha512-pI8LKtFiAflBpN4h14vTtfhKqLwtIW40TNhWyw0ckqHm0W/J0VmYtThoxpTAdHrvEWnkALSG1Z8ABBkIncMIHA==",
"requires": {
"@typescript-eslint/utils": "^5.13.0"
}
@@ -22381,9 +22406,9 @@
"integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
},
"fast-glob": {
- "version": "3.2.11",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
- "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+ "version": "3.2.12",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+ "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
"requires": {
"@nodelib/fs.stat": "^2.0.2",
"@nodelib/fs.walk": "^1.2.3",
@@ -22429,9 +22454,9 @@
}
},
"fb-watchman": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
- "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+ "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
"requires": {
"bser": "2.1.1"
}
@@ -22560,9 +22585,9 @@
"integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="
},
"follow-redirects": {
- "version": "1.15.1",
- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
- "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
+ "version": "1.15.2",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+ "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
},
"fork-ts-checker-webpack-plugin": {
"version": "6.5.2",
@@ -22742,11 +22767,6 @@
"functions-have-names": "^1.2.2"
}
},
- "functional-red-black-tree": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
- "integrity": "sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="
- },
"functions-have-names": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
@@ -22763,9 +22783,9 @@
"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
},
"get-intrinsic": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz",
- "integrity": "sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==",
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+ "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
"requires": {
"function-bind": "^1.1.1",
"has": "^1.0.3",
@@ -22940,14 +22960,6 @@
"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
"integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
},
- "history": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
- "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==",
- "requires": {
- "@babel/runtime": "^7.7.6"
- }
- },
"hoist-non-react-statics": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
@@ -23135,9 +23147,9 @@
"integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="
},
"i18next": {
- "version": "21.9.1",
- "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.9.1.tgz",
- "integrity": "sha512-ITbDrAjbRR73spZAiu6+ex5WNlHRr1mY+acDi2ioTHuUiviJqSz269Le1xHAf0QaQ6GgIHResUhQNcxGwa/PhA==",
+ "version": "21.9.2",
+ "resolved": "https://registry.npmjs.org/i18next/-/i18next-21.9.2.tgz",
+ "integrity": "sha512-00fVrLQOwy45nm3OtC9l1WiLK3nJlIYSljgCt0qzTaAy65aciMdRy9GsuW+a2AtKtdg9/njUGfRH30LRupV7ZQ==",
"requires": {
"@babel/runtime": "^7.17.2"
}
@@ -23151,9 +23163,9 @@
}
},
"i18next-http-backend": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-1.4.1.tgz",
- "integrity": "sha512-s4Q9hK2jS29iyhniMP82z+yYY8riGTrWbnyvsSzi5TaF7Le4E7b5deTmtuaRuab9fdDcYXtcwdBgawZG+JCEjA==",
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-1.4.4.tgz",
+ "integrity": "sha512-M4gLPe6JKZ2p1UmE6t4rzWV/sAxgrLThW7ztXAsTpFwFqXoyzhTzX8eYxVv9KjpCQh4K9nwxnEjEi+74C4Thbg==",
"requires": {
"cross-fetch": "3.1.5"
}
@@ -23173,9 +23185,9 @@
"requires": {}
},
"idb": {
- "version": "7.0.2",
- "resolved": "https://registry.npmjs.org/idb/-/idb-7.0.2.tgz",
- "integrity": "sha512-jjKrT1EnyZewQ/gCBb/eyiYrhGzws2FeY92Yx8qT9S9GeQAmo4JFVIiWRIfKW/6Ob9A+UDAOW9j9jn58fy2HIg=="
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.0.tgz",
+ "integrity": "sha512-Wsk07aAxDsntgYJY4h0knZJuTxM73eQ4reRAO+Z1liOh8eMCJ/MoDS8fCui1vGT9mnjtl1sOu3I2i/W1swPYZg=="
},
"identity-obj-proxy": {
"version": "3.0.0",
@@ -23283,9 +23295,9 @@
}
},
"is-callable": {
- "version": "1.2.4",
- "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
- "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="
+ "version": "1.2.6",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz",
+ "integrity": "sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q=="
},
"is-core-module": {
"version": "2.10.0",
@@ -24951,6 +24963,11 @@
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz",
"integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
},
+ "js-sdsl": {
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.4.tgz",
+ "integrity": "sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw=="
+ },
"js-tokens": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -25923,9 +25940,9 @@
}
},
"postcss-custom-properties": {
- "version": "12.1.8",
- "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.8.tgz",
- "integrity": "sha512-8rbj8kVu00RQh2fQF81oBqtduiANu4MIxhyf0HbbStgPtnFlWn0yiaYTpLHrPnJbffVY1s9apWsIoVZcc68FxA==",
+ "version": "12.1.9",
+ "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.9.tgz",
+ "integrity": "sha512-/E7PRvK8DAVljBbeWrcEQJPG72jaImxF3vvCNFwv9cC8CzigVoNIpeyfnJzphnN3Fd8/auBf5wvkw6W9MfmTyg==",
"requires": {
"postcss-value-parser": "^4.2.0"
}
@@ -26200,9 +26217,9 @@
}
},
"postcss-nesting": {
- "version": "10.1.10",
- "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.10.tgz",
- "integrity": "sha512-lqd7LXCq0gWc0wKXtoKDru5wEUNjm3OryLVNRZ8OnW8km6fSNUuFrjEhU3nklxXE2jvd4qrox566acgh+xQt8w==",
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz",
+ "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==",
"requires": {
"@csstools/selector-specificity": "^2.0.0",
"postcss-selector-parser": "^6.0.10"
@@ -26327,11 +26344,11 @@
}
},
"postcss-preset-env": {
- "version": "7.8.0",
- "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.0.tgz",
- "integrity": "sha512-leqiqLOellpLKfbHkD06E04P6d9ZQ24mat6hu4NSqun7WG0UhspHR5Myiv/510qouCjoo4+YJtNOqg5xHaFnCA==",
+ "version": "7.8.2",
+ "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.2.tgz",
+ "integrity": "sha512-rSMUEaOCnovKnwc5LvBDHUDzpGP+nrUeWZGWt9M72fBvckCi45JmnJigUr4QG4zZeOHmOCNCZnd2LKDvP++ZuQ==",
"requires": {
- "@csstools/postcss-cascade-layers": "^1.0.5",
+ "@csstools/postcss-cascade-layers": "^1.1.0",
"@csstools/postcss-color-function": "^1.1.1",
"@csstools/postcss-font-format-keywords": "^1.0.1",
"@csstools/postcss-hwb-function": "^1.0.2",
@@ -26345,19 +26362,19 @@
"@csstools/postcss-text-decoration-shorthand": "^1.0.0",
"@csstools/postcss-trigonometric-functions": "^1.0.2",
"@csstools/postcss-unset-value": "^1.0.2",
- "autoprefixer": "^10.4.8",
+ "autoprefixer": "^10.4.11",
"browserslist": "^4.21.3",
"css-blank-pseudo": "^3.0.3",
"css-has-pseudo": "^3.0.4",
"css-prefers-color-scheme": "^6.0.3",
- "cssdb": "^7.0.0",
+ "cssdb": "^7.0.1",
"postcss-attribute-case-insensitive": "^5.0.2",
"postcss-clamp": "^4.1.0",
"postcss-color-functional-notation": "^4.2.4",
"postcss-color-hex-alpha": "^8.0.4",
"postcss-color-rebeccapurple": "^7.1.1",
"postcss-custom-media": "^8.0.2",
- "postcss-custom-properties": "^12.1.8",
+ "postcss-custom-properties": "^12.1.9",
"postcss-custom-selectors": "^6.0.3",
"postcss-dir-pseudo-class": "^6.0.5",
"postcss-double-position-gradients": "^3.1.2",
@@ -26371,7 +26388,7 @@
"postcss-lab-function": "^4.2.1",
"postcss-logical": "^5.0.4",
"postcss-media-minmax": "^5.0.0",
- "postcss-nesting": "^10.1.10",
+ "postcss-nesting": "^10.2.0",
"postcss-opacity-percentage": "^1.1.2",
"postcss-overflow-shorthand": "^3.0.4",
"postcss-page-break": "^3.0.4",
@@ -26790,9 +26807,9 @@
"integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg=="
},
"react-i18next": {
- "version": "11.18.5",
- "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.5.tgz",
- "integrity": "sha512-cKcyuuzIv0YUZ4l9WORflVNuhISPAqQShOAsxwFyYuJoCA7HlLmHm7XnvO6hfAGmGpDNRhJHoBX8hG49Cb2xZQ==",
+ "version": "11.18.6",
+ "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.6.tgz",
+ "integrity": "sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==",
"requires": {
"@babel/runtime": "^7.14.5",
"html-parse-stringify": "^3.0.1"
@@ -26817,20 +26834,20 @@
"integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A=="
},
"react-router": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz",
- "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==",
+ "version": "6.4.1",
+ "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.4.1.tgz",
+ "integrity": "sha512-OJASKp5AykDWFewgWUim1vlLr7yfD4vO/h+bSgcP/ix8Md+LMHuAjovA74MQfsfhQJGGN1nHRhwS5qQQbbBt3A==",
"requires": {
- "history": "^5.2.0"
+ "@remix-run/router": "1.0.1"
}
},
"react-router-dom": {
- "version": "6.3.0",
- "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz",
- "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==",
+ "version": "6.4.1",
+ "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.4.1.tgz",
+ "integrity": "sha512-MY7NJCrGNVJtGp8ODMOBHu20UaIkmwD2V3YsAOUQoCXFk7Ppdwf55RdcGyrSj+ycSL9Uiwrb3gTLYSnzcRoXww==",
"requires": {
- "history": "^5.2.0",
- "react-router": "6.3.0"
+ "@remix-run/router": "1.0.1",
+ "react-router": "6.4.1"
}
},
"react-scripts": {
@@ -26959,9 +26976,9 @@
"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
},
"regenerate-unicode-properties": {
- "version": "10.0.1",
- "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
- "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
+ "version": "10.1.0",
+ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+ "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
"requires": {
"regenerate": "^1.4.2"
}
@@ -27000,27 +27017,27 @@
"integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
},
"regexpu-core": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz",
- "integrity": "sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
+ "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
"requires": {
"regenerate": "^1.4.2",
- "regenerate-unicode-properties": "^10.0.1",
- "regjsgen": "^0.6.0",
- "regjsparser": "^0.8.2",
+ "regenerate-unicode-properties": "^10.1.0",
+ "regjsgen": "^0.7.1",
+ "regjsparser": "^0.9.1",
"unicode-match-property-ecmascript": "^2.0.0",
"unicode-match-property-value-ecmascript": "^2.0.0"
}
},
"regjsgen": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
- "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA=="
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
+ "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="
},
"regjsparser": {
- "version": "0.8.4",
- "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
- "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
+ "version": "0.9.1",
+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+ "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
"requires": {
"jsesc": "~0.5.0"
},
@@ -27151,9 +27168,9 @@
}
},
"rollup": {
- "version": "2.79.0",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.0.tgz",
- "integrity": "sha512-x4KsrCgwQ7ZJPcFA/SUu6QVcYlO7uRLfLAy0DSA4NS2eG8japdbpM50ToH7z4iObodRYOJ0soneF0iaQRJ6zhA==",
+ "version": "2.79.1",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+ "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
"requires": {
"fsevents": "~2.3.2"
}
@@ -27215,6 +27232,16 @@
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
},
+ "safe-regex-test": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+ "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
+ "requires": {
+ "call-bind": "^1.0.2",
+ "get-intrinsic": "^1.1.3",
+ "is-regex": "^1.1.4"
+ }
+ },
"safer-buffer": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
@@ -27271,9 +27298,9 @@
"integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
},
"selfsigned": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz",
- "integrity": "sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==",
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
+ "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
"requires": {
"node-forge": "^1"
}
@@ -27750,9 +27777,9 @@
}
},
"supports-hyperlinks": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
- "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+ "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
"requires": {
"has-flag": "^4.0.0",
"supports-color": "^7.0.0"
@@ -28125,9 +28152,9 @@
}
},
"typescript": {
- "version": "4.8.2",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
- "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
+ "version": "4.8.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz",
+ "integrity": "sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig==",
"peer": true
},
"unbox-primitive": {
@@ -28161,9 +28188,9 @@
"integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="
},
"unicode-property-aliases-ecmascript": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
- "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+ "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="
},
"unique-string": {
"version": "2.0.0",
@@ -28194,9 +28221,9 @@
"integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
},
"update-browserslist-db": {
- "version": "1.0.7",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz",
- "integrity": "sha512-iN/XYesmZ2RmmWAiI4Z5rq0YqSiv0brj9Ce9CfhNE4xIW2h+MFxcgkxIzZ+ShkFPUkjU3gQ+3oypadD3RAMtrg==",
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz",
+ "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==",
"requires": {
"escalade": "^3.1.1",
"picocolors": "^1.0.0"
@@ -28425,9 +28452,9 @@
}
},
"webpack-dev-server": {
- "version": "4.10.1",
- "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.10.1.tgz",
- "integrity": "sha512-FIzMq3jbBarz3ld9l7rbM7m6Rj1lOsgq/DyLGMX/fPEB1UBUPtf5iL/4eNfhx8YYJTRlzfv107UfWSWcBK5Odw==",
+ "version": "4.11.1",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
+ "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
"requires": {
"@types/bonjour": "^3.5.9",
"@types/connect-history-api-fallback": "^1.3.5",
@@ -28452,7 +28479,7 @@
"p-retry": "^4.5.0",
"rimraf": "^3.0.2",
"schema-utils": "^4.0.0",
- "selfsigned": "^2.0.1",
+ "selfsigned": "^2.1.1",
"serve-index": "^1.9.1",
"sockjs": "^0.3.24",
"spdy": "^4.0.2",
@@ -28496,9 +28523,9 @@
}
},
"ws": {
- "version": "8.8.1",
- "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz",
- "integrity": "sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==",
+ "version": "8.9.0",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-8.9.0.tgz",
+ "integrity": "sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==",
"requires": {}
}
}
From fd21d2f4ced004c160a545f505db4ce860769c8a Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Fri, 23 Sep 2022 12:55:40 -0400
Subject: [PATCH 46/63] Added Ukranian
---
docs/releases.md | 5 +++++
web/src/components/Preferences.js | 1 +
2 files changed, 6 insertions(+)
diff --git a/docs/releases.md b/docs/releases.md
index d1efe1cb..ad9b604e 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -53,6 +53,11 @@ Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up s
* Clarified Docker install instructions ([#361](https://github.com/binwiederhier/ntfy/issues/361), thanks to [@barart](https://github.com/barart) for reporting)
* Mismatched quotation marks ([#392](https://github.com/binwiederhier/ntfy/pull/392)], thanks to [@connorlanigan](https://github.com/connorlanigan))
+**Additional translations:**
+
+* Ukranian (thanks to [@v.kopitsa](https://hosted.weblate.org/user/v.kopitsa/))
+
+
## ntfy server v1.27.2
Released June 23, 2022
diff --git a/web/src/components/Preferences.js b/web/src/components/Preferences.js
index 468cc4c3..104bf509 100644
--- a/web/src/components/Preferences.js
+++ b/web/src/components/Preferences.js
@@ -461,6 +461,7 @@ const Language = () => {
<MenuItem value="ja">日本語</MenuItem>
<MenuItem value="nl">Nederlands</MenuItem>
<MenuItem value="nb_NO">Norsk bokmål</MenuItem>
+ <MenuItem value="uk">Українська</MenuItem>
<MenuItem value="pt_BR">Português (Brasil)</MenuItem>
<MenuItem value="ru">Русский</MenuItem>
<MenuItem value="tr">Türkçe</MenuItem>
From 61d5293ba0d69afa837b3e2d73eaeb97cd0d1724 Mon Sep 17 00:00:00 2001
From: Patryk <patrykiakos@protonmail.com>
Date: Thu, 22 Sep 2022 20:23:28 +0000
Subject: [PATCH 47/63] Translated using Weblate (Polish)
Currently translated at 100.0% (189 of 189 strings)
Translation: ntfy/Web app
Translate-URL: https://hosted.weblate.org/projects/ntfy/web/pl/
---
web/public/static/langs/pl.json | 192 +++++++++++++++++++++++++++++++-
1 file changed, 191 insertions(+), 1 deletion(-)
diff --git a/web/public/static/langs/pl.json b/web/public/static/langs/pl.json
index 0967ef42..697de556 100644
--- a/web/public/static/langs/pl.json
+++ b/web/public/static/langs/pl.json
@@ -1 +1,191 @@
-{}
+{
+ "action_bar_send_test_notification": "Wyślij powiadomienie testowe",
+ "action_bar_clear_notifications": "Wyczyść powiadomienia",
+ "action_bar_toggle_mute": "Włączanie/wyłączanie wyciszania powiadomień",
+ "action_bar_toggle_action_menu": "Otwórz/zamknij menu działań",
+ "message_bar_type_message": "Wpisz wiadomość tutaj",
+ "message_bar_error_publishing": "Błąd przy wysyłaniu powiadomienia",
+ "message_bar_show_dialog": "Pokaż okno dialogowe publikacji",
+ "nav_button_all_notifications": "Wszystkie powiadomienia",
+ "nav_button_documentation": "Dokumentacja",
+ "nav_button_muted": "Powiadomienia wyciszone",
+ "alert_grant_title": "Powiadomienia są wyłączone",
+ "alert_grant_description": "Udziel przeglądarce pozwolenia na wyświetlanie powiadomień na pulpicie.",
+ "alert_grant_button": "Pozwól teraz",
+ "alert_not_supported_title": "Powiadomienia nie są obsługiwane",
+ "alert_not_supported_description": "Powiadomienia nie są obsługiwane przez Twoją przeglądarkę.",
+ "notifications_list": "Lista powiadomień",
+ "notifications_list_item": "Powiadomienie",
+ "notifications_mark_read": "Oznacz jako przeczytane",
+ "notifications_delete": "Usuń",
+ "notifications_copied_to_clipboard": "Skopiowano do schowka",
+ "notifications_tags": "Tagi",
+ "message_bar_publish": "Opublikuj powiadomienie",
+ "nav_topics_title": "Subskrybowane tematy",
+ "nav_button_settings": "Ustawienia",
+ "nav_button_publish_message": "Opublikuj powiadomienie",
+ "nav_button_subscribe": "Zasubskrybuj temat",
+ "nav_button_connecting": "łączenie",
+ "notifications_attachment_image": "Obraz załącznika",
+ "notifications_attachment_copy_url_button": "Kopiuj Adres URL",
+ "notifications_attachment_link_expires": "Łącze wygasa w dniu {{date}}",
+ "notifications_attachment_link_expired": "Łącze do pobrania wygasło",
+ "notifications_attachment_file_image": "plik graficzny",
+ "notifications_attachment_file_video": "plik wideo",
+ "notifications_attachment_file_audio": "plik audio",
+ "notifications_attachment_file_app": "plik aplikacji Android",
+ "notifications_attachment_file_document": "inny dokument",
+ "notifications_click_copy_url_title": "Skopiuj adres URL do schowka",
+ "notifications_click_open_button": "Otwórz łącze",
+ "notifications_actions_open_url_title": "Przejdź do {{url}}",
+ "notifications_actions_not_supported": "Ta akcja nie jest obsługiwana w aplikacji internetowej",
+ "notifications_actions_http_request_title": "Wyślij HTTP {{method}} do {{url}}",
+ "notifications_none_for_topic_title": "Nie otrzymałeś jeszcze żadnych powiadomień dla tego tematu.",
+ "notifications_none_for_any_description": "Aby wysłać powiadomienia do tematu, wyślij PUT/POST do adresu URL tematu. Oto przykład z jednym z twoich tematów.",
+ "notifications_no_subscriptions_title": "Wygląda na to, że nie masz jeszcze żadnych subskrypcji.",
+ "notifications_no_subscriptions_description": "Kliknij łącze \"{{linktext}}\", aby stworzyć lub zasubskrybować temat. Następnie możesz wysyłać wiadomości za pomocą PUT lub POST i otrzymywać powiadomienia tutaj.",
+ "notifications_example": "Przykład",
+ "notifications_loading": "Ładowanie powiadomień …",
+ "publish_dialog_title_topic": "Opublikuj do {{topic}}",
+ "publish_dialog_title_no_topic": "Opublikuj powiadomienie",
+ "publish_dialog_progress_uploading": "Przesyłanie …",
+ "publish_dialog_progress_uploading_detail": "Przesyłanie {{loaded}}/{{total}} ({{percent}}%) …",
+ "publish_dialog_message_published": "Powiadomienie wysłane",
+ "publish_dialog_attachment_limits_file_and_quota_reached": "przekracza limit rozmiaru pliku {{fileSizeLimit}}, pozostaje {{remainingBytes}}",
+ "publish_dialog_attachment_limits_file_reached": "przekracza limit rozmiaru pliku {{filesizeLimit}}",
+ "publish_dialog_attachment_limits_quota_reached": "przekracza limit, {{remainingBytes}} pozostało",
+ "publish_dialog_emoji_picker_show": "Wybierz emotkę",
+ "publish_dialog_priority_min": "Min. priorytet",
+ "publish_dialog_priority_low": "Niski priorytet",
+ "publish_dialog_base_url_label": "Adres URL usługi",
+ "publish_dialog_base_url_placeholder": "Adres URL usługi, np. https://example.com",
+ "publish_dialog_topic_label": "Nazwa tematu",
+ "publish_dialog_topic_placeholder": "Nazwa tematu, np. moje_alerty",
+ "publish_dialog_topic_reset": "Resetuj temat",
+ "publish_dialog_title_label": "Tytuł",
+ "publish_dialog_title_placeholder": "Tytuł notyfikacji, np. Niski poziom baterrii",
+ "publish_dialog_message_label": "Wiadomość",
+ "publish_dialog_message_placeholder": "Wpisz wiadomość tutaj",
+ "publish_dialog_tags_label": "Tagi",
+ "publish_dialog_tags_placeholder": "Lista tagów oddzielona przecinkami, np. ostrzeżenie, srv1-backup",
+ "publish_dialog_priority_label": "Priorytet",
+ "publish_dialog_click_label": "Kliknij Adres URL",
+ "publish_dialog_click_placeholder": "Adres URL, który ma być otwarty po kliknięciu na powiadomienie",
+ "publish_dialog_click_reset": "Usuń adres URL kliknięcia",
+ "publish_dialog_email_label": "Email",
+ "publish_dialog_email_placeholder": "Adres, na który ma być wysłane powiadomienie, np. phil@example.com",
+ "publish_dialog_email_reset": "Usuń przekazywanie wiadomości email",
+ "publish_dialog_attach_label": "Adres URL załącznika",
+ "publish_dialog_attach_placeholder": "Dołączenie pliku z adresu URL, np. https://f-droid.org/F-Droid.apk",
+ "publish_dialog_attach_reset": "Usuń adres URL załącznika",
+ "publish_dialog_filename_label": "Nazwa pliku",
+ "publish_dialog_filename_placeholder": "Nazwa pliku załącznika",
+ "publish_dialog_delay_label": "Opóźnienie",
+ "publish_dialog_delay_reset": "Usuń opóźnione dostarczenie",
+ "publish_dialog_other_features": "Inne funkcje:",
+ "publish_dialog_chip_click_label": "Adres URL kliknięcia",
+ "publish_dialog_chip_email_label": "Przekaż na email",
+ "publish_dialog_chip_attach_url_label": "Dołącz plik z adresu URL",
+ "publish_dialog_chip_attach_file_label": "Dołącz plik lokalny",
+ "publish_dialog_chip_delay_label": "Opóźnienie dostawy",
+ "publish_dialog_chip_topic_label": "Zmień temat",
+ "publish_dialog_details_examples_description": "Przykłady i szczegółowe informacje na temat wszystkich opcji można znaleźć w <docsLink>dokumentacji</docsLink>.",
+ "publish_dialog_button_cancel_sending": "Anuluj wysyłanie",
+ "publish_dialog_button_send": "Wyślij",
+ "publish_dialog_checkbox_publish_another": "Wyślij kolejną wiadomość",
+ "publish_dialog_attached_file_title": "Załączony plik:",
+ "publish_dialog_attached_file_filename_placeholder": "Nazwa pliku załącznika",
+ "publish_dialog_drop_file_here": "Upuść plik tutaj",
+ "emoji_picker_search_placeholder": "Szukaj emotki",
+ "emoji_picker_search_clear": "Wyczyść wyszukiwanie",
+ "subscribe_dialog_subscribe_title": "Zasubskrybuj temat",
+ "subscribe_dialog_subscribe_topic_placeholder": "Nazwa tematu, np. moje_alerty",
+ "subscribe_dialog_subscribe_use_another_label": "Użyj innego serwera",
+ "subscribe_dialog_subscribe_base_url_label": "Adres URL usługi",
+ "subscribe_dialog_subscribe_button_cancel": "Anuluj",
+ "subscribe_dialog_login_description": "Ten temat jest chroniony hasłem. Proszę podać nazwę użytkownika i hasło, aby zasubskrybować.",
+ "subscribe_dialog_login_username_label": "Nazwa użytkownika, np. phil",
+ "subscribe_dialog_login_password_label": "Hasło",
+ "publish_dialog_button_cancel": "Anuluj",
+ "subscribe_dialog_login_button_back": "Powrót",
+ "subscribe_dialog_login_button_login": "Zaloguj się",
+ "subscribe_dialog_error_user_not_authorized": "Użytkownik {{username}} nie ma uprawnień",
+ "subscribe_dialog_error_user_anonymous": "anonim",
+ "prefs_notifications_title": "Powiadomienia",
+ "prefs_notifications_sound_title": "Dźwięk powiadomienia",
+ "prefs_notifications_sound_description_none": "Brak dźwięku po otrzymaniu powiadomienia",
+ "prefs_notifications_sound_description_some": "Odtwarzaj dźwięk {{sound}}, gdy nadejdzie powiadomienie",
+ "prefs_notifications_sound_play": "Odtwórz wybrany dźwięk",
+ "prefs_notifications_min_priority_title": "Minimalny priorytet",
+ "prefs_notifications_min_priority_description_any": "Pokaż wszystkie powiadomienia, niezależnie od priorytetu",
+ "prefs_notifications_min_priority_description_x_or_higher": "Pokazuj powiadomienia, gdy ich priorytet to {{number}} ({{name}}) lub wyższy",
+ "prefs_notifications_min_priority_description_max": "Pokaż powiadomienia, jeśli priorytet wynosi 5 (max)",
+ "prefs_notifications_min_priority_any": "Dowolny priorytet",
+ "prefs_notifications_min_priority_low_and_higher": "Niski priorytet i wyższy",
+ "prefs_notifications_min_priority_default_and_higher": "Priorytet standardowy i wyższy",
+ "prefs_notifications_min_priority_high_and_higher": "Wysoki priorytet i wyższy",
+ "prefs_notifications_delete_after_one_day": "Po jednym dniu",
+ "prefs_notifications_delete_after_one_week": "Po tygodniu",
+ "prefs_notifications_delete_after_one_month": "Po miesiącu",
+ "prefs_notifications_delete_after_never_description": "Powiadomienia nigdy nie są automatycznie usuwane",
+ "prefs_notifications_delete_after_three_hours_description": "Powiadomienia są automatycznie usuwane po trzech godzinach",
+ "prefs_notifications_delete_after_one_day_description": "Powiadomienia są automatycznie usuwane po jednym dniu",
+ "prefs_notifications_delete_after_one_month_description": "Powiadomienia są automatycznie usuwane po upływie jednego miesiąca",
+ "prefs_notifications_delete_after_one_week_description": "Powiadomienia są automatycznie usuwane po upływie jedego tygodnia",
+ "prefs_users_title": "Zarządzaj użytkownikami",
+ "prefs_users_description": "Dodaj/usuń użytkowników dla tematów chronionych hasłem. Uwaga: Nazwa użytkownika i hasło są przechowywane w lokalnej pamięci przeglądarki.",
+ "prefs_users_table": "Tabela użytkowników",
+ "prefs_users_add_button": "Dodaj użytkownika",
+ "notifications_attachment_open_button": "Otwórz załącznik",
+ "prefs_users_edit_button": "Edytuj użytkownika",
+ "prefs_users_delete_button": "Usuń użytkownika",
+ "prefs_users_table_base_url_header": "Adres URL usługi",
+ "prefs_users_dialog_title_add": "Dodaj użytkownika",
+ "prefs_users_dialog_button_cancel": "Anuluj",
+ "prefs_users_dialog_button_add": "Dodaj",
+ "prefs_users_dialog_button_save": "Zapisz",
+ "prefs_appearance_title": "Wygląd",
+ "prefs_appearance_language_title": "Język",
+ "error_boundary_title": "Oh nie, ntfy przestało działać",
+ "error_boundary_description": "Oczywiście, to nie miało się wydarzyć. Bardzo przepraszam za to.<br/>Jeśli masz minutę, proszę <githubLink>zgłoś to na GitHubie</githubLink>, albo daj nam znać przez <discordLink>Discord</discordLink> lub <matrixLink>Matrix</matrixLink>.",
+ "error_boundary_button_copy_stack_trace": "Kopiuj stack trace",
+ "error_boundary_stack_trace": "Stack trace",
+ "error_boundary_gathering_info": "Zbierz więcej informacji …",
+ "error_boundary_unsupported_indexeddb_title": "Prywatne karty przeglądarki nie są obsługiwane",
+ "action_bar_show_menu": "Pokaż menu",
+ "action_bar_logo_alt": "ntfy logo",
+ "action_bar_unsubscribe": "Zrezygnuj z subskrypcji",
+ "notifications_attachment_copy_url_title": "Kopiuj adres URL załącznika do schowka",
+ "action_bar_settings": "Ustawienia",
+ "notifications_priority_x": "Priorytet {{priority}}",
+ "notifications_new_indicator": "Nowe powiadomienie",
+ "notifications_attachment_open_title": "Przejdź do {{url}}",
+ "notifications_click_copy_url_button": "Skopiuj łącze",
+ "notifications_none_for_topic_description": "Aby wysłać powiadomienia do tego tematu, wyślij PUT lub POST-Request na adres URL tematu.",
+ "notifications_none_for_any_title": "Nie otrzymałeś żadnych powiadomień.",
+ "notifications_more_details": "Bardziej szczegółowe informacje można znaleźć na <websiteLink>stronie internetowej</websiteLink> oraz w <docsLink>dokumentacji</docsLink>.",
+ "publish_dialog_priority_default": "Domyślny priorytet",
+ "publish_dialog_priority_max": "Max. priorytet",
+ "publish_dialog_priority_high": "Wysoki priorytet",
+ "publish_dialog_delay_placeholder": "Opóźnienie dostarczenie, np.{{unixTimestamp}}, {{relativeTime}}, lub \"{{naturalLanguage}}\" (tylko w języku angielskim)",
+ "subscribe_dialog_subscribe_button_subscribe": "Subskrybuj",
+ "prefs_users_table_user_header": "Użytkownik",
+ "publish_dialog_attached_file_remove": "Usuń załączony plik",
+ "subscribe_dialog_subscribe_description": "Tematy nie mogą być chronione hasłem, więc wybierz trudną do odgadnięcia nazwę. Po zasubskrybowaniu możesz wysyłać powiadomienia poprzez POST/PUT.",
+ "subscribe_dialog_login_title": "Wymagane jest zalogowanie się",
+ "prefs_notifications_delete_after_title": "Usuń powiadomienia",
+ "prefs_users_dialog_password_label": "Hasło",
+ "priority_low": "niski",
+ "priority_default": "podstawowy",
+ "priority_max": "maksymalny",
+ "prefs_notifications_delete_after_three_hours": "Po trzech godzinach",
+ "prefs_users_dialog_base_url_label": "Adres URL usługi, np. https://ntfy.sh",
+ "prefs_notifications_sound_no_sound": "Bez dzwięku",
+ "prefs_users_dialog_username_label": "Nazwa użytkownika, np. phil",
+ "priority_high": "wysoki",
+ "prefs_notifications_min_priority_max_only": "Tylko maksymalny priorytet",
+ "prefs_notifications_delete_after_never": "Nigdy",
+ "prefs_users_dialog_title_edit": "Edytuj użytkownika",
+ "priority_min": "minimum",
+ "error_boundary_unsupported_indexeddb_description": "Aplikacja ntfy potrzebuje IndexedDB, aby działać poprawnie, a Twoja przeglądarka nie obsługuje IndexedDB w prywatnych zakładkach.<br/><br/>To denerwujące, ale używanie ntfy w prywatnej zakładce nie ma sensu, ponieważ wszystkie dane są przechowywane w przeglądarce. Więcej informacji można uzyskać <githubLink>w tym wydaniu GitHub</githubLink>, lub na czacie w <discordLink>Discord</discordLink> lub <matrixLink>Matrix</matrixLink>."
+}
From f0f4de2719ceb1d701c45153f00f2d03e4ad4c6a Mon Sep 17 00:00:00 2001
From: YJSoft <yjsoft@yjsoft.xyz>
Date: Tue, 27 Sep 2022 10:37:39 +0200
Subject: [PATCH 48/63] Added translation using Weblate (Korean)
---
web/public/static/langs/ko.json | 1 +
1 file changed, 1 insertion(+)
create mode 100644 web/public/static/langs/ko.json
diff --git a/web/public/static/langs/ko.json b/web/public/static/langs/ko.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/web/public/static/langs/ko.json
@@ -0,0 +1 @@
+{}
From a9019131cf432e6b72f016a13a859e3e92288bd0 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Tue, 27 Sep 2022 07:44:00 -0400
Subject: [PATCH 49/63] Polish
---
docs/releases.md | 3 +-
go.sum | 103 +++++++++++++++++++++---------
web/src/components/Preferences.js | 3 +-
3 files changed, 76 insertions(+), 33 deletions(-)
diff --git a/docs/releases.md b/docs/releases.md
index ad9b604e..74ed5edc 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -25,6 +25,7 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
* Italian (thanks to [@Genio2003](https://hosted.weblate.org/user/Genio2003/))
* Dutch (thanks to [@SchoNie](https://hosted.weblate.org/user/SchoNie/))
* Ukranian (thanks to [@v.kopitsa](https://hosted.weblate.org/user/v.kopitsa/))
+* Polish (thanks to [@Namax0r](https://hosted.weblate.org/user/Namax0r/))
Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up some Android tickets, and fixing them! You rock!
@@ -56,7 +57,7 @@ Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up s
**Additional translations:**
* Ukranian (thanks to [@v.kopitsa](https://hosted.weblate.org/user/v.kopitsa/))
-
+* Polish (thanks to [@Namax0r](https://hosted.weblate.org/user/Namax0r/))
## ntfy server v1.27.2
Released June 23, 2022
diff --git a/go.sum b/go.sum
index 9db876ff..85eb3e7a 100644
--- a/go.sum
+++ b/go.sum
@@ -32,12 +32,22 @@ cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+
cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU=
cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI=
+cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4=
+cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ=
+cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o=
+cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY=
+cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA=
+cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY=
+cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM=
+cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY=
cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
cloud.google.com/go/compute v1.2.0/go.mod h1:xlogom/6gr8RJGBe7nT2eGsQYAFUbbv8dbC29qE3Xmw=
cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
@@ -45,23 +55,60 @@ cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6m
cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U=
-cloud.google.com/go/compute v1.9.0 h1:ED/FP4xv8GJw63v556/ASNc1CeeLUO2Bs8nzaHchkHg=
-cloud.google.com/go/compute v1.9.0/go.mod h1:lWv1h/zUWTm/LozzfTJhBSkd6ShQq8la8VeeuOEGxfY=
cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0=
+cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs=
+cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM=
+cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo=
+cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I=
+cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo=
+cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4=
+cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU=
+cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y=
+cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk=
cloud.google.com/go/firestore v1.6.1 h1:8rBq3zRjnHx8UtBvaOWqBB1xq9jH6/wltfQLlTMh2Fw=
cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
+cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk=
+cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM=
+cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o=
+cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0=
cloud.google.com/go/iam v0.1.1/go.mod h1:CKqrcnI/suGpybEHxZ7BMehL0oA4LpdyJdUlTl9jVMw=
-cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc=
cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
cloud.google.com/go/iam v0.4.0 h1:YBYU00SCDzZJdHqVc4I5d6lsklcYIjQZa1YmEz4jlSE=
cloud.google.com/go/iam v0.4.0/go.mod h1:cbaZxyScUhxl7ZAkNWiALgihfP75wS/fUsVNaa1r3vA=
+cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic=
+cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8=
+cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4=
+cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE=
+cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY=
+cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA=
+cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ=
+cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY=
+cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs=
+cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E=
+cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0=
+cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0=
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4=
+cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o=
+cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg=
+cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg=
+cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y=
+cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4=
+cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s=
+cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA=
+cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4=
+cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0=
+cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU=
+cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs=
+cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM=
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
@@ -70,10 +117,14 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
cloud.google.com/go/storage v1.21.0/go.mod h1:XmRlxkgPjlBONznT2dDUU/5XlpU2OjMnKuqnZI01LAA=
cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y=
cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc=
-cloud.google.com/go/storage v1.26.0 h1:lYAGjknyDJirSzfwUlkv4Nsnj7od7foxQNH/fqZqles=
-cloud.google.com/go/storage v1.26.0/go.mod h1:mk/N7YwIKEWyTvXAWQCIeiCTdLoRH6Pd5xmSnolQLTI=
cloud.google.com/go/storage v1.27.0 h1:YOO045NZI9RKfCj1c5A/ZtuuENUc8OAW+gHdGnDgyMQ=
cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s=
+cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw=
+cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU=
+cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0=
+cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo=
+cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE=
+cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
firebase.google.com/go/v4 v4.8.0 h1:ooJqjFEh1G6DQ5+wyb/RAXAgku0E2RzJeH6WauSpWSo=
firebase.google.com/go/v4 v4.8.0/go.mod h1:y+j6xX7BgBco/XaN+YExIBVm6pzvYutheDV3nprvbWc=
@@ -109,8 +160,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
-github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac h1:tn/OQ2PmwQ0XFVgAHfjlLyqMewry25Rz7jWnVoh4Ggs=
-github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
github.com/emersion/go-smtp v0.15.0 h1:3+hMGMGrqP/lqd7qoxZc1hTU8LY8gHV9RFGWlqSDmP8=
@@ -180,7 +229,6 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -258,8 +306,6 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/urfave/cli/v2 v2.14.1 h1:0Sx+C9404t2+DPuIJ3UpZFOEFhNG3wPxMj7uZHyZKFA=
-github.com/urfave/cli/v2 v2.14.1/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
github.com/urfave/cli/v2 v2.16.3 h1:gHoFIwpPjoyIMbJp/VFd+/vuD0dAgFK4B6DpEMFJfQk=
github.com/urfave/cli/v2 v2.16.3/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
@@ -283,8 +329,6 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
-golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 h1:a5Yg6ylndHHYJqIPrdq0AhvR6KTvDTAvgBtaidhEevY=
golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -367,8 +411,6 @@ golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b h1:ZmngSVLe/wycRns9MKikG9OWIEjGcGAkacif7oYQaUY=
-golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20220921203646-d300de134e69 h1:hUJpGDpnfwdJW8iNypFjmSY0sCBEL+spFTZ2eO+Sfps=
golang.org/x/net v0.0.0-20220921203646-d300de134e69/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
@@ -394,7 +436,6 @@ golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
-golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 h1:2o1E+E8TpNLklK9nHiPiK1uzIYrIHt+cQx3ynCwq9V8=
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 h1:lxqLZaMad/dJHMFZH0NiNpiEZI/nhgWhe4wgzpE+MuA=
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
@@ -410,8 +451,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
-golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A=
golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -478,14 +517,10 @@ golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
-golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
-golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20220919170432-7a66f970e087 h1:tPwmk4vmvVCMdr98VgL4JH+qZxPL8fqlUOHnyOM8N3w=
golang.org/x/term v0.0.0-20220919170432-7a66f970e087/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -501,8 +536,6 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 h1:ftMN5LMiBFjbzleLqtoBZk7KdJwhuybIU+FckUHgoyQ=
-golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y=
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -562,7 +595,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
-golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0=
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
@@ -607,15 +639,15 @@ google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc
google.golang.org/api v0.73.0/go.mod h1:lbd/q6BRFJbdpV6OUCXstVeiI5mL/d3/WifG7iNKnjI=
google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs=
google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
+google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg=
google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o=
google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g=
google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
-google.golang.org/api v0.91.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
-google.golang.org/api v0.94.0 h1:KtKM9ru3nzQioV1HLlUf1cR7vMYJIpgls5VhAYQXIwA=
-google.golang.org/api v0.94.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI=
+google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI=
+google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
google.golang.org/api v0.97.0 h1:x/vEL1XDF/2V4xzdNgFPaKHluRESo2aTsL7QzHnBtGQ=
google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
@@ -710,6 +742,7 @@ google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX
google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
@@ -717,12 +750,20 @@ google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljW
google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE=
-google.golang.org/genproto v0.0.0-20220804142021-4e6b2dfa6612/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc=
-google.golang.org/genproto v0.0.0-20220810155839-1856144b1d9c/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220801145646-83ce21fca29f/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc=
+google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20220902135211-223410557253 h1:vXJMM8Shg7TGaYxZsQ++A/FOSlbDmDtWhS/o+3w/hj4=
-google.golang.org/genproto v0.0.0-20220902135211-223410557253/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220829144015-23454907ede3/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220913154956-18f8339a66a5/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220914142337-ca0e39ece12f/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw=
google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737 h1:K1zaaMdYBXRyX+cwFnxj7M6zwDyumLQMZ5xqwGvjreQ=
google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737/go.mod h1:2r/26NEF3bFmT3eC3aZreahSal0C3Shl8Gi6vyDYqOQ=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
diff --git a/web/src/components/Preferences.js b/web/src/components/Preferences.js
index 104bf509..13de5565 100644
--- a/web/src/components/Preferences.js
+++ b/web/src/components/Preferences.js
@@ -436,7 +436,7 @@ const Appearance = () => {
const Language = () => {
const { t, i18n } = useTranslation();
const labelId = "prefLanguage";
- const randomFlags = shuffle(["🇬🇧", "🇺🇸", "🇪🇸", "🇫🇷", "🇧🇬", "🇨🇿", "🇩🇪", "🇨🇳", "🇮🇹", "🇭🇺", "🇧🇷", "🇳🇱", "🇮🇩", "🇯🇵", "🇷🇺", "🇹🇷"]).slice(0, 3);
+ const randomFlags = shuffle(["🇬🇧", "🇺🇸", "🇪🇸", "🇫🇷", "🇧🇬", "🇨🇿", "🇩🇪", "🇵🇱", "🇺🇦", "🇨🇳", "🇮🇹", "🇭🇺", "🇧🇷", "🇳🇱", "🇮🇩", "🇯🇵", "🇷🇺", "🇹🇷"]).slice(0, 3);
const title = t("prefs_appearance_language_title") + " " + randomFlags.join(" ");
const lang = i18n.language ?? "en";
@@ -463,6 +463,7 @@ const Language = () => {
<MenuItem value="nb_NO">Norsk bokmål</MenuItem>
<MenuItem value="uk">Українська</MenuItem>
<MenuItem value="pt_BR">Português (Brasil)</MenuItem>
+ <MenuItem value="pl">Polski</MenuItem>
<MenuItem value="ru">Русский</MenuItem>
<MenuItem value="tr">Türkçe</MenuItem>
</Select>
From 419bfecd6f435fc389be34987cf2e7c3bce95e25 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Tue, 27 Sep 2022 12:37:02 -0400
Subject: [PATCH 50/63] Reformatting, make update
---
client/client.go | 11 +-
cmd/publish.go | 9 +-
docs/releases.md | 19 +-
go.mod | 10 +-
go.sum | 10 +
server/actions.go | 12 +-
server/server.go | 24 +--
server/server_matrix.go | 29 ++-
util/embedfs.go | 13 +-
util/util.go | 3 +-
web/package-lock.json | 412 ++++++++++++++++++++--------------------
11 files changed, 289 insertions(+), 263 deletions(-)
diff --git a/client/client.go b/client/client.go
index baec3011..b744fa11 100644
--- a/client/client.go
+++ b/client/client.go
@@ -164,11 +164,12 @@ func (c *Client) Poll(topic string, options ...SubscribeOption) ([]*Message, err
// The method returns a unique subscriptionID that can be used in Unsubscribe.
//
// Example:
-// c := client.New(client.NewConfig())
-// subscriptionID := c.Subscribe("mytopic")
-// for m := range c.Messages {
-// fmt.Printf("New message: %s", m.Message)
-// }
+//
+// c := client.New(client.NewConfig())
+// subscriptionID := c.Subscribe("mytopic")
+// for m := range c.Messages {
+// fmt.Printf("New message: %s", m.Message)
+// }
func (c *Client) Subscribe(topic string, options ...SubscribeOption) string {
c.mu.Lock()
defer c.mu.Unlock()
diff --git a/cmd/publish.go b/cmd/publish.go
index c6b4a059..0b995258 100644
--- a/cmd/publish.go
+++ b/cmd/publish.go
@@ -212,10 +212,11 @@ func execPublish(c *cli.Context) error {
// parseTopicMessageCommand reads the topic and the remaining arguments from the context.
// There are a few cases to consider:
-// ntfy publish <topic> [<message>]
-// ntfy publish --wait-cmd <topic> <command>
-// NTFY_TOPIC=.. ntfy publish [<message>]
-// NTFY_TOPIC=.. ntfy publish --wait-cmd <command>
+//
+// ntfy publish <topic> [<message>]
+// ntfy publish --wait-cmd <topic> <command>
+// NTFY_TOPIC=.. ntfy publish [<message>]
+// NTFY_TOPIC=.. ntfy publish --wait-cmd <command>
func parseTopicMessageCommand(c *cli.Context) (topic string, message string, command []string, err error) {
var args []string
topic, args, err = parseTopicAndArgs(c)
diff --git a/docs/releases.md b/docs/releases.md
index 74ed5edc..9b74f77d 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -2,7 +2,12 @@
Binaries for all releases can be found on the GitHub releases pages for the [ntfy server](https://github.com/binwiederhier/ntfy/releases)
and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/releases).
-## ntfy Android app v1.14.0 (UNRELEASED)
+## ntfy Android app v1.14.0
+Released September 27, 2022
+
+This release adds the ability to set a custom icon to each notification, as well as a display name to subscriptions. We
+also moved the action buttons in the detail view to a more logical place, fixed a bunch of bugs, and added four more
+languages. Hurray!
**Features:**
@@ -18,7 +23,6 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
* Long-click selecting of notifications doesn't scroll to the top anymore ([#235](https://github.com/binwiederhier/ntfy/issues/235), thanks to [@wunter8](https://github.com/wunter8))
* Add attachment and click URL extras to MESSAGE_RECEIVED broadcast ([#329](https://github.com/binwiederhier/ntfy/issues/329), thanks to [@wunter8](https://github.com/wunter8))
* Accessibility: Clear/choose service URL button in base URL dropdown now has a label ([#292](https://github.com/binwiederhier/ntfy/issues/292), thanks to [@mhameed](https://github.com/mhameed) for reporting)
-* Web: Switched "Pop" and "Pop Swoosh" sounds ([#352](https://github.com/binwiederhier/ntfy/issues/352), thanks to [@coma-toast](https://github.com/coma-toast) for reporting)
**Additional translations:**
@@ -29,7 +33,15 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up some Android tickets, and fixing them! You rock!
-## ntfy server v1.28.0 (UNRELEASED)
+## ntfy server v1.28.0
+Released September 27, 2022
+
+This release primarily adds icon support for the Android app, and adds a display name to subscriptions in the web app.
+Aside from that, we fixed a few random bugs, most importantly the `Priority` header bug that allows the use behind
+Cloudflare. We also added a ton of documentation. Most prominently, an [integrations + projects page](https://ntfy.sh/docs/integrations/).
+
+As of now, I also have started accepting **[donations and sponsorships](https://github.com/sponsors/binwiederhier)** 💸.
+I would be very humbled if you consider donating.
**Features:**
@@ -45,6 +57,7 @@ Thank you to [@wunter8](https://github.com/wunter8) for proactively picking up s
* Ignore new draft HTTP `Priority` header ([#351](https://github.com/binwiederhier/ntfy/issues/351), thanks to [@ksurl](https://github.com/ksurl) for reporting)
* Delete expired attachments based on mod time instead of DB entry to avoid races (no ticket)
* Better logging for Matrix push key errors ([#384](https://github.com/binwiederhier/ntfy/pull/384), thanks to [@christophehenry](https://github.com/christophehenry))
+* Web: Switched "Pop" and "Pop Swoosh" sounds ([#352](https://github.com/binwiederhier/ntfy/issues/352), thanks to [@coma-toast](https://github.com/coma-toast) for reporting)
**Documentation:**
diff --git a/go.mod b/go.mod
index daaff181..a149167c 100644
--- a/go.mod
+++ b/go.mod
@@ -14,9 +14,9 @@ require (
github.com/olebedev/when v0.0.0-20211212231525-59bd4edcf9d6
github.com/stretchr/testify v1.7.0
github.com/urfave/cli/v2 v2.16.3
- golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0
+ golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
- golang.org/x/sync v0.0.0-20220907140024-f12130a52804
+ golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7
golang.org/x/term v0.0.0-20220919170432-7a66f970e087
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af
google.golang.org/api v0.97.0
@@ -44,13 +44,13 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.opencensus.io v0.23.0 // indirect
- golang.org/x/net v0.0.0-20220921203646-d300de134e69 // indirect
- golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
+ golang.org/x/net v0.0.0-20220927155233-aa73b2587036 // indirect
+ golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/appengine/v2 v2.0.2 // indirect
- google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737 // indirect
+ google.golang.org/genproto v0.0.0-20220927151529-dcaddaf36704 // indirect
google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
index 85eb3e7a..693f36ba 100644
--- a/go.sum
+++ b/go.sum
@@ -331,6 +331,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 h1:a5Yg6ylndHHYJqIPrdq0AhvR6KTvDTAvgBtaidhEevY=
golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A=
+golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -414,6 +416,8 @@ golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20220921203646-d300de134e69 h1:hUJpGDpnfwdJW8iNypFjmSY0sCBEL+spFTZ2eO+Sfps=
golang.org/x/net v0.0.0-20220921203646-d300de134e69/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20220927155233-aa73b2587036 h1:GDWXwjBkdo4XMin5T4iul98eH4BfGOR7TucJ057FxjY=
+golang.org/x/net v0.0.0-20220927155233-aa73b2587036/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -453,6 +457,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A=
golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 h1:ZrnxWX62AgTKOSagEqxvb3ffipvEDX2pl7E1TdqLqIc=
+golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -519,6 +525,8 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25 h1:nwzwVf0l2Y/lkov/+IYgMMbFyI+QypZDds9RxlSmsFQ=
+golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20220919170432-7a66f970e087 h1:tPwmk4vmvVCMdr98VgL4JH+qZxPL8fqlUOHnyOM8N3w=
@@ -766,6 +774,8 @@ google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+S
google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw=
google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737 h1:K1zaaMdYBXRyX+cwFnxj7M6zwDyumLQMZ5xqwGvjreQ=
google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737/go.mod h1:2r/26NEF3bFmT3eC3aZreahSal0C3Shl8Gi6vyDYqOQ=
+google.golang.org/genproto v0.0.0-20220927151529-dcaddaf36704 h1:H1AcWFV69NFCMeBJ8nVLtv8uHZZ5Ozcgoq012hHEFuU=
+google.golang.org/genproto v0.0.0-20220927151529-dcaddaf36704/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
diff --git a/server/actions.go b/server/actions.go
index 6102febd..dc8ad970 100644
--- a/server/actions.go
+++ b/server/actions.go
@@ -87,7 +87,8 @@ func parseActionsFromJSON(s string) ([]*action, error) {
// https://ntfy.sh/docs/publish/#action-buttons), into an array of actions.
//
// It can parse an actions string like this:
-// view, "Look ma, commas and \"quotes\" too", url=https://..; action=broadcast, ...
+//
+// view, "Look ma, commas and \"quotes\" too", url=https://..; action=broadcast, ...
//
// It works by advancing the position ("pos") through the input string ("input").
//
@@ -96,10 +97,11 @@ func parseActionsFromJSON(s string) ([]*action, error) {
// though it does not use state functions at all.
//
// Other resources:
-// https://adampresley.github.io/2015/04/12/writing-a-lexer-and-parser-in-go-part-1.html
-// https://github.com/adampresley/sample-ini-parser/blob/master/services/lexer/lexer/Lexer.go
-// https://github.com/benbjohnson/sql-parser/blob/master/scanner.go
-// https://blog.gopheracademy.com/advent-2014/parsers-lexers/
+//
+// https://adampresley.github.io/2015/04/12/writing-a-lexer-and-parser-in-go-part-1.html
+// https://github.com/adampresley/sample-ini-parser/blob/master/services/lexer/lexer/Lexer.go
+// https://github.com/benbjohnson/sql-parser/blob/master/scanner.go
+// https://blog.gopheracademy.com/advent-2014/parsers-lexers/
func parseActionsFromSimple(s string) ([]*action, error) {
if !utf8.ValidString(s) {
return nil, errors.New("invalid utf-8 string")
diff --git a/server/server.go b/server/server.go
index e28121c5..60261693 100644
--- a/server/server.go
+++ b/server/server.go
@@ -667,18 +667,18 @@ func (s *Server) parsePublishParams(r *http.Request, v *visitor, m *message) (ca
// handlePublishBody consumes the PUT/POST body and decides whether the body is an attachment or the message.
//
-// 1. curl -X POST -H "Poll: 1234" ntfy.sh/...
-// If a message is flagged as poll request, the body does not matter and is discarded
-// 2. curl -T somebinarydata.bin "ntfy.sh/mytopic?up=1"
-// If body is binary, encode as base64, if not do not encode
-// 3. curl -H "Attach: http://example.com/file.jpg" ntfy.sh/mytopic
-// Body must be a message, because we attached an external URL
-// 4. curl -T short.txt -H "Filename: short.txt" ntfy.sh/mytopic
-// Body must be attachment, because we passed a filename
-// 5. curl -T file.txt ntfy.sh/mytopic
-// If file.txt is <= 4096 (message limit) and valid UTF-8, treat it as a message
-// 6. curl -T file.txt ntfy.sh/mytopic
-// If file.txt is > message limit, treat it as an attachment
+// 1. curl -X POST -H "Poll: 1234" ntfy.sh/...
+// If a message is flagged as poll request, the body does not matter and is discarded
+// 2. curl -T somebinarydata.bin "ntfy.sh/mytopic?up=1"
+// If body is binary, encode as base64, if not do not encode
+// 3. curl -H "Attach: http://example.com/file.jpg" ntfy.sh/mytopic
+// Body must be a message, because we attached an external URL
+// 4. curl -T short.txt -H "Filename: short.txt" ntfy.sh/mytopic
+// Body must be attachment, because we passed a filename
+// 5. curl -T file.txt ntfy.sh/mytopic
+// If file.txt is <= 4096 (message limit) and valid UTF-8, treat it as a message
+// 6. curl -T file.txt ntfy.sh/mytopic
+// If file.txt is > message limit, treat it as an attachment
func (s *Server) handlePublishBody(r *http.Request, v *visitor, m *message, body *util.PeekedReadCloser, unifiedpush bool) error {
if m.Event == pollRequestEvent { // Case 1
return s.handleBodyDiscard(body)
diff --git a/server/server_matrix.go b/server/server_matrix.go
index 7204bfac..5c985f04 100644
--- a/server/server_matrix.go
+++ b/server/server_matrix.go
@@ -47,17 +47,17 @@ import (
//
// From the message, we only require the "pushkey", as it represents our target topic URL.
// A message may look like this (excerpt):
-// {
-// "notification": {
-// "devices": [
-// {
-// "pushkey": "https://ntfy.sh/upDAHJKFFDFD?up=1",
-// ...
-// }
-// ]
-// }
-// }
//
+// {
+// "notification": {
+// "devices": [
+// {
+// "pushkey": "https://ntfy.sh/upDAHJKFFDFD?up=1",
+// ...
+// }
+// ]
+// }
+// }
type matrixRequest struct {
Notification *struct {
Devices []*struct {
@@ -96,14 +96,13 @@ const (
//
// It basically converts a Matrix push gatewqy request:
//
-// POST /_matrix/push/v1/notify HTTP/1.1
-// { "notification": { "devices": [ { "pushkey": "https://ntfy.sh/upDAHJKFFDFD?up=1", ... } ] } }
+// POST /_matrix/push/v1/notify HTTP/1.1
+// { "notification": { "devices": [ { "pushkey": "https://ntfy.sh/upDAHJKFFDFD?up=1", ... } ] } }
//
// to a ntfy request, looking like this:
//
-// POST /upDAHJKFFDFD?up=1 HTTP/1.1
-// { "notification": { "devices": [ { "pushkey": "https://ntfy.sh/upDAHJKFFDFD?up=1", ... } ] } }
-//
+// POST /upDAHJKFFDFD?up=1 HTTP/1.1
+// { "notification": { "devices": [ { "pushkey": "https://ntfy.sh/upDAHJKFFDFD?up=1", ... } ] } }
func newRequestFromMatrixJSON(r *http.Request, baseURL string, messageLimit int) (*http.Request, error) {
if baseURL == "" {
return nil, errHTTPInternalErrorMissingBaseURL
diff --git a/util/embedfs.go b/util/embedfs.go
index 58c4529d..b75bf6ca 100644
--- a/util/embedfs.go
+++ b/util/embedfs.go
@@ -11,14 +11,13 @@ import (
// CachingEmbedFS is a wrapper around embed.FS that allows setting a ModTime, so that the
// default static file server can send 304s back. It can be used like this:
//
-// var (
-// //go:embed docs
-// docsStaticFs embed.FS
-// docsStaticCached = &util.CachingEmbedFS{ModTime: time.Now(), FS: docsStaticFs}
-// )
-//
-// http.FileServer(http.FS(docsStaticCached)).ServeHTTP(w, r)
+// var (
+// //go:embed docs
+// docsStaticFs embed.FS
+// docsStaticCached = &util.CachingEmbedFS{ModTime: time.Now(), FS: docsStaticFs}
+// )
//
+// http.FileServer(http.FS(docsStaticCached)).ServeHTTP(w, r)
type CachingEmbedFS struct {
ModTime time.Time
FS embed.FS
diff --git a/util/util.go b/util/util.go
index ce18f093..6c7fab69 100644
--- a/util/util.go
+++ b/util/util.go
@@ -268,7 +268,8 @@ func MaybeMarshalJSON(v interface{}) string {
// Warning: Never use this function with the intent to run the resulting command.
//
// Example:
-// []string{"ls", "-al", "Document Folder"} -> ls -al "Document Folder"
+//
+// []string{"ls", "-al", "Document Folder"} -> ls -al "Document Folder"
func QuoteCommand(command []string) string {
var quoted []string
for _, c := range command {
diff --git a/web/package-lock.json b/web/package-lock.json
index d449d11e..c377c725 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -3081,9 +3081,9 @@
"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
},
"node_modules/@mui/base": {
- "version": "5.0.0-alpha.98",
- "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.98.tgz",
- "integrity": "sha512-c0U51+K2m57MASpRrmNs6qTXSvktDbVcSjD8zCRPbfuwYWERGGwNxwM3/jsBa4dSojTSmLPnOBFDypl74Ds6yQ==",
+ "version": "5.0.0-alpha.99",
+ "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.99.tgz",
+ "integrity": "sha512-D04H6O1c0Jv561yI0SVbpa8MpqpW3G43CwJxV2o6ALfI0DMJ45w07dGafmDchb6aCWTRTdggd3rjgmuzyNwPiQ==",
"dependencies": {
"@babel/runtime": "^7.19.0",
"@emotion/is-prop-valid": "^1.2.0",
@@ -3113,9 +3113,9 @@
}
},
"node_modules/@mui/core-downloads-tracker": {
- "version": "5.10.6",
- "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.6.tgz",
- "integrity": "sha512-dmyQBqrKmVU6yCSM4GGal5qNXpViXX+/V1t0GA1A5i9QF5Gx6noV/cw0hrSS2ffLT8L2oScq1oTdA6NVIiQ8lg==",
+ "version": "5.10.7",
+ "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.7.tgz",
+ "integrity": "sha512-3N0UYVy3MbrHzM3j6f7fIUCZ+bQ1/sSZq143tLxwSssW3Z4AqE83brpr5flEY1Lx+Aowv/cPyQMmZxzRlFCGqw==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/mui"
@@ -3147,19 +3147,19 @@
}
},
"node_modules/@mui/material": {
- "version": "5.10.6",
- "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.6.tgz",
- "integrity": "sha512-QilW5PAAGSQdN7Cpp4rwSQ1doJAt3ca1a2PHZtr8RLVlpHnXb+qQ8CeDo9+9V2fK5CDNdtTN1F+iJKO43aFBpQ==",
+ "version": "5.10.7",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.7.tgz",
+ "integrity": "sha512-o1jcQGii+q7ORrXhBiMmGzFDaboc1qTgOOC3zDW+NR9ryVzWzL7qEeqoORbgDB5zk9OBsXCjB91fUH/ls5xMwg==",
"dependencies": {
"@babel/runtime": "^7.19.0",
- "@mui/base": "5.0.0-alpha.98",
- "@mui/core-downloads-tracker": "^5.10.6",
- "@mui/system": "^5.10.6",
+ "@mui/base": "5.0.0-alpha.99",
+ "@mui/core-downloads-tracker": "^5.10.7",
+ "@mui/system": "^5.10.7",
"@mui/types": "^7.2.0",
"@mui/utils": "^5.10.6",
"@types/react-transition-group": "^4.4.5",
"clsx": "^1.2.1",
- "csstype": "^3.1.0",
+ "csstype": "^3.1.1",
"prop-types": "^15.8.1",
"react-is": "^18.2.0",
"react-transition-group": "^4.4.5"
@@ -3217,13 +3217,13 @@
}
},
"node_modules/@mui/styled-engine": {
- "version": "5.10.6",
- "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.6.tgz",
- "integrity": "sha512-OnVw5xnO4l0XzlJFhKif/RlLenBNhyEQQlSTwB9ApSWB05UAU5ZSbjNsRfyEKvgmQ/fPa+MqPD/dzxbIRCwyeg==",
+ "version": "5.10.7",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.7.tgz",
+ "integrity": "sha512-CCrtW+vvCKEm6pOE/QcutQ+ORC/iE6D1ghscN4l7LE2JXPvTXO/z0yu8Wxug1JEDlWm4r1Qa0PzJe1P9bjKzNA==",
"dependencies": {
"@babel/runtime": "^7.19.0",
"@emotion/cache": "^11.10.3",
- "csstype": "^3.1.0",
+ "csstype": "^3.1.1",
"prop-types": "^15.8.1"
},
"engines": {
@@ -3248,17 +3248,17 @@
}
},
"node_modules/@mui/system": {
- "version": "5.10.6",
- "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.6.tgz",
- "integrity": "sha512-HfQVX7e2xpQ3jtdB/WwtkFVtozMOozyN575/63u8ILHkE8wGDhblmCieAsnyJPFbm7WBW5PCMyzmfr4QyKLaYg==",
+ "version": "5.10.7",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.7.tgz",
+ "integrity": "sha512-kwyhjjKGsgtBRFl6vSqidDZcNKU5S1juTgm4Xi2fyWxaEbIQb9Sh9y0iVP2bNCJzgDr0alLaENOZOEaDWHISAQ==",
"dependencies": {
"@babel/runtime": "^7.19.0",
"@mui/private-theming": "^5.10.6",
- "@mui/styled-engine": "^5.10.6",
+ "@mui/styled-engine": "^5.10.7",
"@mui/types": "^7.2.0",
"@mui/utils": "^5.10.6",
"clsx": "^1.2.1",
- "csstype": "^3.1.0",
+ "csstype": "^3.1.1",
"prop-types": "^15.8.1"
},
"engines": {
@@ -3535,9 +3535,9 @@
"integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="
},
"node_modules/@sinclair/typebox": {
- "version": "0.24.42",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.42.tgz",
- "integrity": "sha512-d+2AtrHGyWek2u2ITF0lHRIv6Tt7X0dEHW+0rP+5aDCEjC3fiN2RBjrLD0yU0at52BcZbRGxLbAtXiR0hFCjYw=="
+ "version": "0.24.43",
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.43.tgz",
+ "integrity": "sha512-1orQTvtazZmsPeBroJjysvsOQCYV2yjWlebkSY38pl5vr2tdLjEJ+LoxITlGNZaH2RE19WlAwQMkH/7C14wLfw=="
},
"node_modules/@sinonjs/commons": {
"version": "1.8.3",
@@ -3819,9 +3819,9 @@
}
},
"node_modules/@types/babel__traverse": {
- "version": "7.18.1",
- "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.1.tgz",
- "integrity": "sha512-FSdLaZh2UxaMuLp9lixWaHq/golWTRWOnRsAXzDTDSDOQLuZb1nsdCt6pJSPWSEQt2eFZ2YVk3oYhn+1kLMeMA==",
+ "version": "7.18.2",
+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.2.tgz",
+ "integrity": "sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==",
"dependencies": {
"@babel/types": "^7.3.0"
}
@@ -3962,9 +3962,9 @@
"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
},
"node_modules/@types/node": {
- "version": "18.7.18",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz",
- "integrity": "sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="
+ "version": "18.7.23",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.23.tgz",
+ "integrity": "sha512-DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg=="
},
"node_modules/@types/parse-json": {
"version": "4.0.0",
@@ -3972,9 +3972,9 @@
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
},
"node_modules/@types/prettier": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz",
- "integrity": "sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A=="
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz",
+ "integrity": "sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow=="
},
"node_modules/@types/prop-types": {
"version": "15.7.5",
@@ -4097,13 +4097,13 @@
"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.0.tgz",
- "integrity": "sha512-GgHi/GNuUbTOeoJiEANi0oI6fF3gBQc3bGFYj40nnAPCbhrtEDf2rjBmefFadweBmO1Du1YovHeDP2h5JLhtTQ==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.1.tgz",
+ "integrity": "sha512-ky7EFzPhqz3XlhS7vPOoMDaQnQMn+9o5ICR9CPr/6bw8HrFkzhMSxuA3gRfiJVvs7geYrSeawGJjZoZQKCOglQ==",
"dependencies": {
- "@typescript-eslint/scope-manager": "5.38.0",
- "@typescript-eslint/type-utils": "5.38.0",
- "@typescript-eslint/utils": "5.38.0",
+ "@typescript-eslint/scope-manager": "5.38.1",
+ "@typescript-eslint/type-utils": "5.38.1",
+ "@typescript-eslint/utils": "5.38.1",
"debug": "^4.3.4",
"ignore": "^5.2.0",
"regexpp": "^3.2.0",
@@ -4142,11 +4142,11 @@
}
},
"node_modules/@typescript-eslint/experimental-utils": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.38.0.tgz",
- "integrity": "sha512-kzXBRfvGlicgGk4CYuRUqKvwc2s3wHXNssUWWJU18bhMRxriFm3BZWyQ6vEHBRpEIMKB6b7MIQHO+9lYlts19w==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.38.1.tgz",
+ "integrity": "sha512-Zv0EcU0iu64DiVG3pRZU0QYCgANO//U1fS3oEs3eqHD1eIVVcQsFd/T01ckaNbL2H2aCqRojY2xZuMAPcOArEA==",
"dependencies": {
- "@typescript-eslint/utils": "5.38.0"
+ "@typescript-eslint/utils": "5.38.1"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4160,13 +4160,13 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.38.0.tgz",
- "integrity": "sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.38.1.tgz",
+ "integrity": "sha512-LDqxZBVFFQnQRz9rUZJhLmox+Ep5kdUmLatLQnCRR6523YV+XhRjfYzStQ4MheFA8kMAfUlclHSbu+RKdRwQKw==",
"dependencies": {
- "@typescript-eslint/scope-manager": "5.38.0",
- "@typescript-eslint/types": "5.38.0",
- "@typescript-eslint/typescript-estree": "5.38.0",
+ "@typescript-eslint/scope-manager": "5.38.1",
+ "@typescript-eslint/types": "5.38.1",
+ "@typescript-eslint/typescript-estree": "5.38.1",
"debug": "^4.3.4"
},
"engines": {
@@ -4186,12 +4186,12 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.38.0.tgz",
- "integrity": "sha512-ByhHIuNyKD9giwkkLqzezZ9y5bALW8VNY6xXcP+VxoH4JBDKjU5WNnsiD4HJdglHECdV+lyaxhvQjTUbRboiTA==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.38.1.tgz",
+ "integrity": "sha512-BfRDq5RidVU3RbqApKmS7RFMtkyWMM50qWnDAkKgQiezRtLKsoyRKIvz1Ok5ilRWeD9IuHvaidaLxvGx/2eqTQ==",
"dependencies": {
- "@typescript-eslint/types": "5.38.0",
- "@typescript-eslint/visitor-keys": "5.38.0"
+ "@typescript-eslint/types": "5.38.1",
+ "@typescript-eslint/visitor-keys": "5.38.1"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4202,12 +4202,12 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.38.0.tgz",
- "integrity": "sha512-iZq5USgybUcj/lfnbuelJ0j3K9dbs1I3RICAJY9NZZpDgBYXmuUlYQGzftpQA9wC8cKgtS6DASTvF3HrXwwozA==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.38.1.tgz",
+ "integrity": "sha512-UU3j43TM66gYtzo15ivK2ZFoDFKKP0k03MItzLdq0zV92CeGCXRfXlfQX5ILdd4/DSpHkSjIgLLLh1NtkOJOAw==",
"dependencies": {
- "@typescript-eslint/typescript-estree": "5.38.0",
- "@typescript-eslint/utils": "5.38.0",
+ "@typescript-eslint/typescript-estree": "5.38.1",
+ "@typescript-eslint/utils": "5.38.1",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
@@ -4228,9 +4228,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.0.tgz",
- "integrity": "sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.1.tgz",
+ "integrity": "sha512-QTW1iHq1Tffp9lNfbfPm4WJabbvpyaehQ0SrvVK2yfV79SytD9XDVxqiPvdrv2LK7DGSFo91TB2FgWanbJAZXg==",
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
},
@@ -4240,12 +4240,12 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.0.tgz",
- "integrity": "sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.1.tgz",
+ "integrity": "sha512-99b5e/Enoe8fKMLdSuwrfH/C0EIbpUWmeEKHmQlGZb8msY33qn1KlkFww0z26o5Omx7EVjzVDCWEfrfCDHfE7g==",
"dependencies": {
- "@typescript-eslint/types": "5.38.0",
- "@typescript-eslint/visitor-keys": "5.38.0",
+ "@typescript-eslint/types": "5.38.1",
+ "@typescript-eslint/visitor-keys": "5.38.1",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -4280,14 +4280,14 @@
}
},
"node_modules/@typescript-eslint/utils": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.38.0.tgz",
- "integrity": "sha512-6sdeYaBgk9Fh7N2unEXGz+D+som2QCQGPAf1SxrkEr+Z32gMreQ0rparXTNGRRfYUWk/JzbGdcM8NSSd6oqnTA==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.38.1.tgz",
+ "integrity": "sha512-oIuUiVxPBsndrN81oP8tXnFa/+EcZ03qLqPDfSZ5xIJVm7A9V0rlkQwwBOAGtrdN70ZKDlKv+l1BeT4eSFxwXA==",
"dependencies": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.38.0",
- "@typescript-eslint/types": "5.38.0",
- "@typescript-eslint/typescript-estree": "5.38.0",
+ "@typescript-eslint/scope-manager": "5.38.1",
+ "@typescript-eslint/types": "5.38.1",
+ "@typescript-eslint/typescript-estree": "5.38.1",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
},
@@ -4323,11 +4323,11 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.0.tgz",
- "integrity": "sha512-MxnrdIyArnTi+XyFLR+kt/uNAcdOnmT+879os7qDRI+EYySR4crXJq9BXPfRzzLGq0wgxkwidrCJ9WCAoacm1w==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.1.tgz",
+ "integrity": "sha512-bSHr1rRxXt54+j2n4k54p4fj8AHJ49VDWtjpImOpzQj4qjAiOpPni+V1Tyajh19Api1i844F757cur8wH3YvOA==",
"dependencies": {
- "@typescript-eslint/types": "5.38.0",
+ "@typescript-eslint/types": "5.38.1",
"eslint-visitor-keys": "^3.3.0"
},
"engines": {
@@ -5439,9 +5439,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001410",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001410.tgz",
- "integrity": "sha512-QoblBnuE+rG0lc3Ur9ltP5q47lbguipa/ncNMyyGuqPk44FxbScWAeEO+k5fSQ8WekdAK4mWqNs1rADDAiN5xQ==",
+ "version": "1.0.30001412",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz",
+ "integrity": "sha512-+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA==",
"funding": [
{
"type": "opencollective",
@@ -5793,9 +5793,9 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
},
"node_modules/core-js": {
- "version": "3.25.2",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.2.tgz",
- "integrity": "sha512-YB4IAT1bjEfxTJ1XYy11hJAKskO+qmhuDBM8/guIfMz4JvdsAQAqvyb97zXX7JgSrfPLG5mRGFWJwJD39ruq2A==",
+ "version": "3.25.3",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.3.tgz",
+ "integrity": "sha512-y1hvKXmPHvm5B7w4ln1S4uc9eV/O5+iFExSRUimnvIph11uaizFR8LFMdONN8hG3P2pipUfX4Y/fR8rAEtcHcQ==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -5803,9 +5803,9 @@
}
},
"node_modules/core-js-compat": {
- "version": "3.25.2",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.2.tgz",
- "integrity": "sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==",
+ "version": "3.25.3",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.3.tgz",
+ "integrity": "sha512-xVtYpJQ5grszDHEUU9O7XbjjcZ0ccX3LgQsyqSvTnjX97ZqEgn9F5srmrwwwMtbKzDllyFPL+O+2OFMl1lU4TQ==",
"dependencies": {
"browserslist": "^4.21.4"
},
@@ -5815,9 +5815,9 @@
}
},
"node_modules/core-js-pure": {
- "version": "3.25.2",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.2.tgz",
- "integrity": "sha512-ItD7YpW1cUB4jaqFLZXe1AXkyqIxz6GqPnsDV4uF4hVcWh/WAGIqSqw5p0/WdsILM0Xht9s3Koyw05R3K6RtiA==",
+ "version": "3.25.3",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.3.tgz",
+ "integrity": "sha512-T/7qvgv70MEvRkZ8p6BasLZmOVYKzOaWNBEHAU8FmveCJkl4nko2quqPQOmy6AJIp5MBanhz9no3A94NoRb0XA==",
"hasInstallScript": true,
"funding": {
"type": "opencollective",
@@ -6682,9 +6682,9 @@
}
},
"node_modules/electron-to-chromium": {
- "version": "1.4.258",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.258.tgz",
- "integrity": "sha512-vutF4q0dTUXoAFI7Vbtdwen/BJVwPgj8GRg/SElOodfH7VTX+svUe62A5BG41QRQGk5HsZPB0M++KH1lAlOt0A=="
+ "version": "1.4.264",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.264.tgz",
+ "integrity": "sha512-AZ6ZRkucHOQT8wke50MktxtmcWZr67kE17X/nAXFf62NIdMdgY6xfsaJD5Szoy84lnkuPWH+4tTNE3s2+bPCiw=="
},
"node_modules/emittery": {
"version": "0.8.1",
@@ -6927,12 +6927,12 @@
}
},
"node_modules/eslint": {
- "version": "8.23.1",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.1.tgz",
- "integrity": "sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==",
+ "version": "8.24.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz",
+ "integrity": "sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==",
"dependencies": {
"@eslint/eslintrc": "^1.3.2",
- "@humanwhocodes/config-array": "^0.10.4",
+ "@humanwhocodes/config-array": "^0.10.5",
"@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
"@humanwhocodes/module-importer": "^1.0.1",
"ajv": "^6.10.0",
@@ -8963,9 +8963,9 @@
}
},
"node_modules/is-callable": {
- "version": "1.2.6",
- "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz",
- "integrity": "sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q==",
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+ "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
"engines": {
"node": ">= 0.4"
},
@@ -10908,9 +10908,9 @@
}
},
"node_modules/jest-watch-typeahead/node_modules/@types/yargs": {
- "version": "17.0.12",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.12.tgz",
- "integrity": "sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ==",
+ "version": "17.0.13",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.13.tgz",
+ "integrity": "sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==",
"dependencies": {
"@types/yargs-parser": "*"
}
@@ -19085,9 +19085,9 @@
"integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
},
"@mui/base": {
- "version": "5.0.0-alpha.98",
- "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.98.tgz",
- "integrity": "sha512-c0U51+K2m57MASpRrmNs6qTXSvktDbVcSjD8zCRPbfuwYWERGGwNxwM3/jsBa4dSojTSmLPnOBFDypl74Ds6yQ==",
+ "version": "5.0.0-alpha.99",
+ "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.99.tgz",
+ "integrity": "sha512-D04H6O1c0Jv561yI0SVbpa8MpqpW3G43CwJxV2o6ALfI0DMJ45w07dGafmDchb6aCWTRTdggd3rjgmuzyNwPiQ==",
"requires": {
"@babel/runtime": "^7.19.0",
"@emotion/is-prop-valid": "^1.2.0",
@@ -19100,9 +19100,9 @@
}
},
"@mui/core-downloads-tracker": {
- "version": "5.10.6",
- "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.6.tgz",
- "integrity": "sha512-dmyQBqrKmVU6yCSM4GGal5qNXpViXX+/V1t0GA1A5i9QF5Gx6noV/cw0hrSS2ffLT8L2oScq1oTdA6NVIiQ8lg=="
+ "version": "5.10.7",
+ "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.7.tgz",
+ "integrity": "sha512-3N0UYVy3MbrHzM3j6f7fIUCZ+bQ1/sSZq143tLxwSssW3Z4AqE83brpr5flEY1Lx+Aowv/cPyQMmZxzRlFCGqw=="
},
"@mui/icons-material": {
"version": "5.10.6",
@@ -19113,19 +19113,19 @@
}
},
"@mui/material": {
- "version": "5.10.6",
- "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.6.tgz",
- "integrity": "sha512-QilW5PAAGSQdN7Cpp4rwSQ1doJAt3ca1a2PHZtr8RLVlpHnXb+qQ8CeDo9+9V2fK5CDNdtTN1F+iJKO43aFBpQ==",
+ "version": "5.10.7",
+ "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.7.tgz",
+ "integrity": "sha512-o1jcQGii+q7ORrXhBiMmGzFDaboc1qTgOOC3zDW+NR9ryVzWzL7qEeqoORbgDB5zk9OBsXCjB91fUH/ls5xMwg==",
"requires": {
"@babel/runtime": "^7.19.0",
- "@mui/base": "5.0.0-alpha.98",
- "@mui/core-downloads-tracker": "^5.10.6",
- "@mui/system": "^5.10.6",
+ "@mui/base": "5.0.0-alpha.99",
+ "@mui/core-downloads-tracker": "^5.10.7",
+ "@mui/system": "^5.10.7",
"@mui/types": "^7.2.0",
"@mui/utils": "^5.10.6",
"@types/react-transition-group": "^4.4.5",
"clsx": "^1.2.1",
- "csstype": "^3.1.0",
+ "csstype": "^3.1.1",
"prop-types": "^15.8.1",
"react-is": "^18.2.0",
"react-transition-group": "^4.4.5"
@@ -19142,28 +19142,28 @@
}
},
"@mui/styled-engine": {
- "version": "5.10.6",
- "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.6.tgz",
- "integrity": "sha512-OnVw5xnO4l0XzlJFhKif/RlLenBNhyEQQlSTwB9ApSWB05UAU5ZSbjNsRfyEKvgmQ/fPa+MqPD/dzxbIRCwyeg==",
+ "version": "5.10.7",
+ "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.10.7.tgz",
+ "integrity": "sha512-CCrtW+vvCKEm6pOE/QcutQ+ORC/iE6D1ghscN4l7LE2JXPvTXO/z0yu8Wxug1JEDlWm4r1Qa0PzJe1P9bjKzNA==",
"requires": {
"@babel/runtime": "^7.19.0",
"@emotion/cache": "^11.10.3",
- "csstype": "^3.1.0",
+ "csstype": "^3.1.1",
"prop-types": "^15.8.1"
}
},
"@mui/system": {
- "version": "5.10.6",
- "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.6.tgz",
- "integrity": "sha512-HfQVX7e2xpQ3jtdB/WwtkFVtozMOozyN575/63u8ILHkE8wGDhblmCieAsnyJPFbm7WBW5PCMyzmfr4QyKLaYg==",
+ "version": "5.10.7",
+ "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.10.7.tgz",
+ "integrity": "sha512-kwyhjjKGsgtBRFl6vSqidDZcNKU5S1juTgm4Xi2fyWxaEbIQb9Sh9y0iVP2bNCJzgDr0alLaENOZOEaDWHISAQ==",
"requires": {
"@babel/runtime": "^7.19.0",
"@mui/private-theming": "^5.10.6",
- "@mui/styled-engine": "^5.10.6",
+ "@mui/styled-engine": "^5.10.7",
"@mui/types": "^7.2.0",
"@mui/utils": "^5.10.6",
"clsx": "^1.2.1",
- "csstype": "^3.1.0",
+ "csstype": "^3.1.1",
"prop-types": "^15.8.1"
}
},
@@ -19319,9 +19319,9 @@
"integrity": "sha512-sXo/qW2/pAcmT43VoRKOJbDOfV3cYpq3szSVfIThQXNt+E4DfKj361vaAt3c88U5tPUxzEswam7GW48PJqtKAg=="
},
"@sinclair/typebox": {
- "version": "0.24.42",
- "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.42.tgz",
- "integrity": "sha512-d+2AtrHGyWek2u2ITF0lHRIv6Tt7X0dEHW+0rP+5aDCEjC3fiN2RBjrLD0yU0at52BcZbRGxLbAtXiR0hFCjYw=="
+ "version": "0.24.43",
+ "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.43.tgz",
+ "integrity": "sha512-1orQTvtazZmsPeBroJjysvsOQCYV2yjWlebkSY38pl5vr2tdLjEJ+LoxITlGNZaH2RE19WlAwQMkH/7C14wLfw=="
},
"@sinonjs/commons": {
"version": "1.8.3",
@@ -19499,9 +19499,9 @@
}
},
"@types/babel__traverse": {
- "version": "7.18.1",
- "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.1.tgz",
- "integrity": "sha512-FSdLaZh2UxaMuLp9lixWaHq/golWTRWOnRsAXzDTDSDOQLuZb1nsdCt6pJSPWSEQt2eFZ2YVk3oYhn+1kLMeMA==",
+ "version": "7.18.2",
+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.2.tgz",
+ "integrity": "sha512-FcFaxOr2V5KZCviw1TnutEMVUVsGt4D2hP1TAfXZAMKuHYW3xQhe3jTxNPWutgCJ3/X1c5yX8ZoGVEItxKbwBg==",
"requires": {
"@babel/types": "^7.3.0"
}
@@ -19642,9 +19642,9 @@
"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
},
"@types/node": {
- "version": "18.7.18",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.18.tgz",
- "integrity": "sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="
+ "version": "18.7.23",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.23.tgz",
+ "integrity": "sha512-DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg=="
},
"@types/parse-json": {
"version": "4.0.0",
@@ -19652,9 +19652,9 @@
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
},
"@types/prettier": {
- "version": "2.7.0",
- "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz",
- "integrity": "sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A=="
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz",
+ "integrity": "sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow=="
},
"@types/prop-types": {
"version": "15.7.5",
@@ -19777,13 +19777,13 @@
"integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="
},
"@typescript-eslint/eslint-plugin": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.0.tgz",
- "integrity": "sha512-GgHi/GNuUbTOeoJiEANi0oI6fF3gBQc3bGFYj40nnAPCbhrtEDf2rjBmefFadweBmO1Du1YovHeDP2h5JLhtTQ==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.38.1.tgz",
+ "integrity": "sha512-ky7EFzPhqz3XlhS7vPOoMDaQnQMn+9o5ICR9CPr/6bw8HrFkzhMSxuA3gRfiJVvs7geYrSeawGJjZoZQKCOglQ==",
"requires": {
- "@typescript-eslint/scope-manager": "5.38.0",
- "@typescript-eslint/type-utils": "5.38.0",
- "@typescript-eslint/utils": "5.38.0",
+ "@typescript-eslint/scope-manager": "5.38.1",
+ "@typescript-eslint/type-utils": "5.38.1",
+ "@typescript-eslint/utils": "5.38.1",
"debug": "^4.3.4",
"ignore": "^5.2.0",
"regexpp": "^3.2.0",
@@ -19802,56 +19802,56 @@
}
},
"@typescript-eslint/experimental-utils": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.38.0.tgz",
- "integrity": "sha512-kzXBRfvGlicgGk4CYuRUqKvwc2s3wHXNssUWWJU18bhMRxriFm3BZWyQ6vEHBRpEIMKB6b7MIQHO+9lYlts19w==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.38.1.tgz",
+ "integrity": "sha512-Zv0EcU0iu64DiVG3pRZU0QYCgANO//U1fS3oEs3eqHD1eIVVcQsFd/T01ckaNbL2H2aCqRojY2xZuMAPcOArEA==",
"requires": {
- "@typescript-eslint/utils": "5.38.0"
+ "@typescript-eslint/utils": "5.38.1"
}
},
"@typescript-eslint/parser": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.38.0.tgz",
- "integrity": "sha512-/F63giJGLDr0ms1Cr8utDAxP2SPiglaD6V+pCOcG35P2jCqdfR7uuEhz1GIC3oy4hkUF8xA1XSXmd9hOh/a5EA==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.38.1.tgz",
+ "integrity": "sha512-LDqxZBVFFQnQRz9rUZJhLmox+Ep5kdUmLatLQnCRR6523YV+XhRjfYzStQ4MheFA8kMAfUlclHSbu+RKdRwQKw==",
"requires": {
- "@typescript-eslint/scope-manager": "5.38.0",
- "@typescript-eslint/types": "5.38.0",
- "@typescript-eslint/typescript-estree": "5.38.0",
+ "@typescript-eslint/scope-manager": "5.38.1",
+ "@typescript-eslint/types": "5.38.1",
+ "@typescript-eslint/typescript-estree": "5.38.1",
"debug": "^4.3.4"
}
},
"@typescript-eslint/scope-manager": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.38.0.tgz",
- "integrity": "sha512-ByhHIuNyKD9giwkkLqzezZ9y5bALW8VNY6xXcP+VxoH4JBDKjU5WNnsiD4HJdglHECdV+lyaxhvQjTUbRboiTA==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.38.1.tgz",
+ "integrity": "sha512-BfRDq5RidVU3RbqApKmS7RFMtkyWMM50qWnDAkKgQiezRtLKsoyRKIvz1Ok5ilRWeD9IuHvaidaLxvGx/2eqTQ==",
"requires": {
- "@typescript-eslint/types": "5.38.0",
- "@typescript-eslint/visitor-keys": "5.38.0"
+ "@typescript-eslint/types": "5.38.1",
+ "@typescript-eslint/visitor-keys": "5.38.1"
}
},
"@typescript-eslint/type-utils": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.38.0.tgz",
- "integrity": "sha512-iZq5USgybUcj/lfnbuelJ0j3K9dbs1I3RICAJY9NZZpDgBYXmuUlYQGzftpQA9wC8cKgtS6DASTvF3HrXwwozA==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.38.1.tgz",
+ "integrity": "sha512-UU3j43TM66gYtzo15ivK2ZFoDFKKP0k03MItzLdq0zV92CeGCXRfXlfQX5ILdd4/DSpHkSjIgLLLh1NtkOJOAw==",
"requires": {
- "@typescript-eslint/typescript-estree": "5.38.0",
- "@typescript-eslint/utils": "5.38.0",
+ "@typescript-eslint/typescript-estree": "5.38.1",
+ "@typescript-eslint/utils": "5.38.1",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
}
},
"@typescript-eslint/types": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.0.tgz",
- "integrity": "sha512-HHu4yMjJ7i3Cb+8NUuRCdOGu2VMkfmKyIJsOr9PfkBVYLYrtMCK/Ap50Rpov+iKpxDTfnqvDbuPLgBE5FwUNfA=="
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.38.1.tgz",
+ "integrity": "sha512-QTW1iHq1Tffp9lNfbfPm4WJabbvpyaehQ0SrvVK2yfV79SytD9XDVxqiPvdrv2LK7DGSFo91TB2FgWanbJAZXg=="
},
"@typescript-eslint/typescript-estree": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.0.tgz",
- "integrity": "sha512-6P0RuphkR+UuV7Avv7MU3hFoWaGcrgOdi8eTe1NwhMp2/GjUJoODBTRWzlHpZh6lFOaPmSvgxGlROa0Sg5Zbyg==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.38.1.tgz",
+ "integrity": "sha512-99b5e/Enoe8fKMLdSuwrfH/C0EIbpUWmeEKHmQlGZb8msY33qn1KlkFww0z26o5Omx7EVjzVDCWEfrfCDHfE7g==",
"requires": {
- "@typescript-eslint/types": "5.38.0",
- "@typescript-eslint/visitor-keys": "5.38.0",
+ "@typescript-eslint/types": "5.38.1",
+ "@typescript-eslint/visitor-keys": "5.38.1",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -19870,14 +19870,14 @@
}
},
"@typescript-eslint/utils": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.38.0.tgz",
- "integrity": "sha512-6sdeYaBgk9Fh7N2unEXGz+D+som2QCQGPAf1SxrkEr+Z32gMreQ0rparXTNGRRfYUWk/JzbGdcM8NSSd6oqnTA==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.38.1.tgz",
+ "integrity": "sha512-oIuUiVxPBsndrN81oP8tXnFa/+EcZ03qLqPDfSZ5xIJVm7A9V0rlkQwwBOAGtrdN70ZKDlKv+l1BeT4eSFxwXA==",
"requires": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.38.0",
- "@typescript-eslint/types": "5.38.0",
- "@typescript-eslint/typescript-estree": "5.38.0",
+ "@typescript-eslint/scope-manager": "5.38.1",
+ "@typescript-eslint/types": "5.38.1",
+ "@typescript-eslint/typescript-estree": "5.38.1",
"eslint-scope": "^5.1.1",
"eslint-utils": "^3.0.0"
},
@@ -19899,11 +19899,11 @@
}
},
"@typescript-eslint/visitor-keys": {
- "version": "5.38.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.0.tgz",
- "integrity": "sha512-MxnrdIyArnTi+XyFLR+kt/uNAcdOnmT+879os7qDRI+EYySR4crXJq9BXPfRzzLGq0wgxkwidrCJ9WCAoacm1w==",
+ "version": "5.38.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.38.1.tgz",
+ "integrity": "sha512-bSHr1rRxXt54+j2n4k54p4fj8AHJ49VDWtjpImOpzQj4qjAiOpPni+V1Tyajh19Api1i844F757cur8wH3YvOA==",
"requires": {
- "@typescript-eslint/types": "5.38.0",
+ "@typescript-eslint/types": "5.38.1",
"eslint-visitor-keys": "^3.3.0"
}
},
@@ -20756,9 +20756,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001410",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001410.tgz",
- "integrity": "sha512-QoblBnuE+rG0lc3Ur9ltP5q47lbguipa/ncNMyyGuqPk44FxbScWAeEO+k5fSQ8WekdAK4mWqNs1rADDAiN5xQ=="
+ "version": "1.0.30001412",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz",
+ "integrity": "sha512-+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA=="
},
"case-sensitive-paths-webpack-plugin": {
"version": "2.4.0",
@@ -21024,22 +21024,22 @@
"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
},
"core-js": {
- "version": "3.25.2",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.2.tgz",
- "integrity": "sha512-YB4IAT1bjEfxTJ1XYy11hJAKskO+qmhuDBM8/guIfMz4JvdsAQAqvyb97zXX7JgSrfPLG5mRGFWJwJD39ruq2A=="
+ "version": "3.25.3",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.25.3.tgz",
+ "integrity": "sha512-y1hvKXmPHvm5B7w4ln1S4uc9eV/O5+iFExSRUimnvIph11uaizFR8LFMdONN8hG3P2pipUfX4Y/fR8rAEtcHcQ=="
},
"core-js-compat": {
- "version": "3.25.2",
- "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.2.tgz",
- "integrity": "sha512-TxfyECD4smdn3/CjWxczVtJqVLEEC2up7/82t7vC0AzNogr+4nQ8vyF7abxAuTXWvjTClSbvGhU0RgqA4ToQaQ==",
+ "version": "3.25.3",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.25.3.tgz",
+ "integrity": "sha512-xVtYpJQ5grszDHEUU9O7XbjjcZ0ccX3LgQsyqSvTnjX97ZqEgn9F5srmrwwwMtbKzDllyFPL+O+2OFMl1lU4TQ==",
"requires": {
"browserslist": "^4.21.4"
}
},
"core-js-pure": {
- "version": "3.25.2",
- "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.2.tgz",
- "integrity": "sha512-ItD7YpW1cUB4jaqFLZXe1AXkyqIxz6GqPnsDV4uF4hVcWh/WAGIqSqw5p0/WdsILM0Xht9s3Koyw05R3K6RtiA=="
+ "version": "3.25.3",
+ "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.25.3.tgz",
+ "integrity": "sha512-T/7qvgv70MEvRkZ8p6BasLZmOVYKzOaWNBEHAU8FmveCJkl4nko2quqPQOmy6AJIp5MBanhz9no3A94NoRb0XA=="
},
"core-util-is": {
"version": "1.0.3",
@@ -21650,9 +21650,9 @@
}
},
"electron-to-chromium": {
- "version": "1.4.258",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.258.tgz",
- "integrity": "sha512-vutF4q0dTUXoAFI7Vbtdwen/BJVwPgj8GRg/SElOodfH7VTX+svUe62A5BG41QRQGk5HsZPB0M++KH1lAlOt0A=="
+ "version": "1.4.264",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.264.tgz",
+ "integrity": "sha512-AZ6ZRkucHOQT8wke50MktxtmcWZr67kE17X/nAXFf62NIdMdgY6xfsaJD5Szoy84lnkuPWH+4tTNE3s2+bPCiw=="
},
"emittery": {
"version": "0.8.1",
@@ -21834,12 +21834,12 @@
}
},
"eslint": {
- "version": "8.23.1",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.23.1.tgz",
- "integrity": "sha512-w7C1IXCc6fNqjpuYd0yPlcTKKmHlHHktRkzmBPZ+7cvNBQuiNjx0xaMTjAJGCafJhQkrFJooREv0CtrVzmHwqg==",
+ "version": "8.24.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.24.0.tgz",
+ "integrity": "sha512-dWFaPhGhTAiPcCgm3f6LI2MBWbogMnTJzFBbhXVRQDJPkr9pGZvVjlVfXd+vyDcWPA2Ic9L2AXPIQM0+vk/cSQ==",
"requires": {
"@eslint/eslintrc": "^1.3.2",
- "@humanwhocodes/config-array": "^0.10.4",
+ "@humanwhocodes/config-array": "^0.10.5",
"@humanwhocodes/gitignore-to-minimatch": "^1.0.2",
"@humanwhocodes/module-importer": "^1.0.1",
"ajv": "^6.10.0",
@@ -23295,9 +23295,9 @@
}
},
"is-callable": {
- "version": "1.2.6",
- "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.6.tgz",
- "integrity": "sha512-krO72EO2NptOGAX2KYyqbP9vYMlNAXdB53rq6f8LXY6RY7JdSR/3BD6wLUlPHSAesmY9vstNrjvqGaCiRK/91Q=="
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+ "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="
},
"is-core-module": {
"version": "2.10.0",
@@ -24688,9 +24688,9 @@
}
},
"@types/yargs": {
- "version": "17.0.12",
- "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.12.tgz",
- "integrity": "sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ==",
+ "version": "17.0.13",
+ "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.13.tgz",
+ "integrity": "sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg==",
"requires": {
"@types/yargs-parser": "*"
}
From 46fcbdb8277a93224f4b1cc9e58c1f536cda02da Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Tue, 27 Sep 2022 12:45:43 -0400
Subject: [PATCH 51/63] Deprecation warnings
---
.goreleaser.yml | 4 +---
util/gzip_handler.go | 3 +--
util/util_test.go | 4 ++--
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/.goreleaser.yml b/.goreleaser.yml
index ea728840..39642ba4 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -64,9 +64,7 @@ builds:
- "-X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}"
goos: [windows]
goarch: [amd64]
- hooks:
- post:
- - upx "{{ .Path }}" # apt install upx
+ # No "upx" for Windows to hopefully avoid Virus warnings
-
id: ntfy_darwin_all
binary: ntfy
diff --git a/util/gzip_handler.go b/util/gzip_handler.go
index 613df48e..637077c7 100644
--- a/util/gzip_handler.go
+++ b/util/gzip_handler.go
@@ -3,7 +3,6 @@ package util
import (
"compress/gzip"
"io"
- "io/ioutil"
"net/http"
"strings"
"sync"
@@ -32,7 +31,7 @@ func Gzip(next http.Handler) http.Handler {
var gzPool = sync.Pool{
New: func() interface{} {
- w := gzip.NewWriter(ioutil.Discard)
+ w := gzip.NewWriter(io.Discard)
return w
},
}
diff --git a/util/util_test.go b/util/util_test.go
index e63be2cd..58abe429 100644
--- a/util/util_test.go
+++ b/util/util_test.go
@@ -2,7 +2,7 @@ package util
import (
"github.com/stretchr/testify/require"
- "io/ioutil"
+ "os"
"path/filepath"
"testing"
)
@@ -19,7 +19,7 @@ func TestRandomString(t *testing.T) {
func TestFileExists(t *testing.T) {
filename := filepath.Join(t.TempDir(), "somefile.txt")
- require.Nil(t, ioutil.WriteFile(filename, []byte{0x25, 0x86}, 0600))
+ require.Nil(t, os.WriteFile(filename, []byte{0x25, 0x86}, 0600))
require.True(t, FileExists(filename))
require.False(t, FileExists(filename+".doesnotexist"))
}
From 903ba8df4d99aae452653147b19c93e836f71086 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Tue, 27 Sep 2022 12:49:20 -0400
Subject: [PATCH 52/63] Bump versions
---
go.sum | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/go.sum b/go.sum
index 693f36ba..5b070196 100644
--- a/go.sum
+++ b/go.sum
@@ -32,6 +32,7 @@ cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+
cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU=
cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8=
cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw=
cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI=
cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4=
cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ=
@@ -57,6 +58,7 @@ cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLq
cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U=
cloud.google.com/go/compute v1.10.0 h1:aoLIYaA1fX3ywihqpBk2APQKOo20nXsp1GEZQbx5Jk4=
cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I=
cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0=
cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs=
cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM=
@@ -76,6 +78,7 @@ cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJ
cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM=
cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o=
cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0=
+cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc=
cloud.google.com/go/iam v0.1.1/go.mod h1:CKqrcnI/suGpybEHxZ7BMehL0oA4LpdyJdUlTl9jVMw=
cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
cloud.google.com/go/iam v0.4.0 h1:YBYU00SCDzZJdHqVc4I5d6lsklcYIjQZa1YmEz4jlSE=
@@ -329,8 +332,6 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 h1:a5Yg6ylndHHYJqIPrdq0AhvR6KTvDTAvgBtaidhEevY=
-golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A=
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -414,8 +415,6 @@ golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.0.0-20220921203646-d300de134e69 h1:hUJpGDpnfwdJW8iNypFjmSY0sCBEL+spFTZ2eO+Sfps=
-golang.org/x/net v0.0.0-20220921203646-d300de134e69/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20220927155233-aa73b2587036 h1:GDWXwjBkdo4XMin5T4iul98eH4BfGOR7TucJ057FxjY=
golang.org/x/net v0.0.0-20220927155233-aa73b2587036/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -455,8 +454,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A=
-golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 h1:ZrnxWX62AgTKOSagEqxvb3ffipvEDX2pl7E1TdqLqIc=
golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -523,8 +520,6 @@ golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc=
-golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25 h1:nwzwVf0l2Y/lkov/+IYgMMbFyI+QypZDds9RxlSmsFQ=
golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -772,8 +767,6 @@ google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+S
google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw=
-google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737 h1:K1zaaMdYBXRyX+cwFnxj7M6zwDyumLQMZ5xqwGvjreQ=
-google.golang.org/genproto v0.0.0-20220921223823-23cae91e6737/go.mod h1:2r/26NEF3bFmT3eC3aZreahSal0C3Shl8Gi6vyDYqOQ=
google.golang.org/genproto v0.0.0-20220927151529-dcaddaf36704 h1:H1AcWFV69NFCMeBJ8nVLtv8uHZZ5Ozcgoq012hHEFuU=
google.golang.org/genproto v0.0.0-20220927151529-dcaddaf36704/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
From d3cfa3456cb26bb54f972b82b4f7d3d5253c4a9a Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Tue, 27 Sep 2022 12:50:07 -0400
Subject: [PATCH 53/63] Install docs
---
docs/install.md | 60 ++++++++++++++++++++++++-------------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/docs/install.md b/docs/install.md
index efbd2fb2..aea562de 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -26,37 +26,37 @@ deb/rpm packages.
=== "x86_64/amd64"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_linux_x86_64.tar.gz
- tar zxvf ntfy_1.27.2_linux_x86_64.tar.gz
- sudo cp -a ntfy_1.27.2_linux_x86_64/ntfy /usr/bin/ntfy
- sudo mkdir /etc/ntfy && sudo cp ntfy_1.27.2_linux_x86_64/{client,server}/*.yml /etc/ntfy
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_linux_x86_64.tar.gz
+ tar zxvf ntfy_1.28.0_linux_x86_64.tar.gz
+ sudo cp -a ntfy_1.28.0_linux_x86_64/ntfy /usr/bin/ntfy
+ sudo mkdir /etc/ntfy && sudo cp ntfy_1.28.0_linux_x86_64/{client,server}/*.yml /etc/ntfy
sudo ntfy serve
```
=== "armv6"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_linux_armv6.tar.gz
- tar zxvf ntfy_1.27.2_linux_armv6.tar.gz
- sudo cp -a ntfy_1.27.2_linux_armv6/ntfy /usr/bin/ntfy
- sudo mkdir /etc/ntfy && sudo cp ntfy_1.27.2_linux_armv6/{client,server}/*.yml /etc/ntfy
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_linux_armv6.tar.gz
+ tar zxvf ntfy_1.28.0_linux_armv6.tar.gz
+ sudo cp -a ntfy_1.28.0_linux_armv6/ntfy /usr/bin/ntfy
+ sudo mkdir /etc/ntfy && sudo cp ntfy_1.28.0_linux_armv6/{client,server}/*.yml /etc/ntfy
sudo ntfy serve
```
=== "armv7/armhf"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_linux_armv7.tar.gz
- tar zxvf ntfy_1.27.2_linux_armv7.tar.gz
- sudo cp -a ntfy_1.27.2_linux_armv7/ntfy /usr/bin/ntfy
- sudo mkdir /etc/ntfy && sudo cp ntfy_1.27.2_linux_armv7/{client,server}/*.yml /etc/ntfy
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_linux_armv7.tar.gz
+ tar zxvf ntfy_1.28.0_linux_armv7.tar.gz
+ sudo cp -a ntfy_1.28.0_linux_armv7/ntfy /usr/bin/ntfy
+ sudo mkdir /etc/ntfy && sudo cp ntfy_1.28.0_linux_armv7/{client,server}/*.yml /etc/ntfy
sudo ntfy serve
```
=== "arm64"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_linux_arm64.tar.gz
- tar zxvf ntfy_1.27.2_linux_arm64.tar.gz
- sudo cp -a ntfy_1.27.2_linux_arm64/ntfy /usr/bin/ntfy
- sudo mkdir /etc/ntfy && sudo cp ntfy_1.27.2_linux_arm64/{client,server}/*.yml /etc/ntfy
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_linux_arm64.tar.gz
+ tar zxvf ntfy_1.28.0_linux_arm64.tar.gz
+ sudo cp -a ntfy_1.28.0_linux_arm64/ntfy /usr/bin/ntfy
+ sudo mkdir /etc/ntfy && sudo cp ntfy_1.28.0_linux_arm64/{client,server}/*.yml /etc/ntfy
sudo ntfy serve
```
@@ -103,7 +103,7 @@ Manually installing the .deb file:
=== "x86_64/amd64"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_linux_amd64.deb
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_linux_amd64.deb
sudo dpkg -i ntfy_*.deb
sudo systemctl enable ntfy
sudo systemctl start ntfy
@@ -111,7 +111,7 @@ Manually installing the .deb file:
=== "armv6"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_linux_armv6.deb
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_linux_armv6.deb
sudo dpkg -i ntfy_*.deb
sudo systemctl enable ntfy
sudo systemctl start ntfy
@@ -119,7 +119,7 @@ Manually installing the .deb file:
=== "armv7/armhf"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_linux_armv7.deb
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_linux_armv7.deb
sudo dpkg -i ntfy_*.deb
sudo systemctl enable ntfy
sudo systemctl start ntfy
@@ -127,7 +127,7 @@ Manually installing the .deb file:
=== "arm64"
```bash
- wget https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_linux_arm64.deb
+ wget https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_linux_arm64.deb
sudo dpkg -i ntfy_*.deb
sudo systemctl enable ntfy
sudo systemctl start ntfy
@@ -137,28 +137,28 @@ Manually installing the .deb file:
=== "x86_64/amd64"
```bash
- sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_linux_amd64.rpm
+ sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_linux_amd64.rpm
sudo systemctl enable ntfy
sudo systemctl start ntfy
```
=== "armv6"
```bash
- sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_linux_armv6.rpm
+ sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_linux_armv6.rpm
sudo systemctl enable ntfy
sudo systemctl start ntfy
```
=== "armv7/armhf"
```bash
- sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_linux_armv7.rpm
+ sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_linux_armv7.rpm
sudo systemctl enable ntfy
sudo systemctl start ntfy
```
=== "arm64"
```bash
- sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_linux_arm64.rpm
+ sudo rpm -ivh https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_linux_arm64.rpm
sudo systemctl enable ntfy
sudo systemctl start ntfy
```
@@ -184,18 +184,18 @@ nix-env -iA ntfy-sh
## macOS
The [ntfy CLI](subscribe/cli.md) (`ntfy publish` and `ntfy subscribe` only) is supported on macOS as well.
-To install, please [download the tarball](https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_macOS_all.tar.gz),
+To install, please [download the tarball](https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_macOS_all.tar.gz),
extract it and place it somewhere in your `PATH` (e.g. `/usr/local/bin/ntfy`).
If run as `root`, ntfy will look for its config at `/etc/ntfy/client.yml`. For all other users, it'll look for it at
`~/Library/Application Support/ntfy/client.yml` (sample included in the tarball).
```bash
-curl -L https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_macOS_all.tar.gz > ntfy_1.27.2_macOS_all.tar.gz
-tar zxvf ntfy_1.27.2_macOS_all.tar.gz
-sudo cp -a ntfy_1.27.2_macOS_all/ntfy /usr/local/bin/ntfy
+curl -L https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_macOS_all.tar.gz > ntfy_1.28.0_macOS_all.tar.gz
+tar zxvf ntfy_1.28.0_macOS_all.tar.gz
+sudo cp -a ntfy_1.28.0_macOS_all/ntfy /usr/local/bin/ntfy
mkdir ~/Library/Application\ Support/ntfy
-cp ntfy_1.27.2_macOS_all/client/client.yml ~/Library/Application\ Support/ntfy/client.yml
+cp ntfy_1.28.0_macOS_all/client/client.yml ~/Library/Application\ Support/ntfy/client.yml
ntfy --help
```
@@ -207,7 +207,7 @@ ntfy --help
## Windows
The [ntfy CLI](subscribe/cli.md) (`ntfy publish` and `ntfy subscribe` only) is supported on Windows as well.
-To install, please [download the latest ZIP](https://github.com/binwiederhier/ntfy/releases/download/v1.27.2/ntfy_1.27.2_windows_x86_64.zip),
+To install, please [download the latest ZIP](https://github.com/binwiederhier/ntfy/releases/download/v1.28.0/ntfy_1.28.0_windows_x86_64.zip),
extract it and place the `ntfy.exe` binary somewhere in your `%Path%`.
The default path for the client config file is at `%AppData%\ntfy\client.yml` (not created automatically, sample in the ZIP file).
From 60043f14eabb46d39fc9b431157a6b6d0a1f2e6f Mon Sep 17 00:00:00 2001
From: YJSoft <yjsoft@yjsoft.xyz>
Date: Tue, 27 Sep 2022 09:35:09 +0000
Subject: [PATCH 54/63] Translated using Weblate (Korean)
Currently translated at 100.0% (189 of 189 strings)
Translation: ntfy/Web app
Translate-URL: https://hosted.weblate.org/projects/ntfy/web/ko/
---
web/public/static/langs/ko.json | 192 +++++++++++++++++++++++++++++++-
1 file changed, 191 insertions(+), 1 deletion(-)
diff --git a/web/public/static/langs/ko.json b/web/public/static/langs/ko.json
index 0967ef42..87be722f 100644
--- a/web/public/static/langs/ko.json
+++ b/web/public/static/langs/ko.json
@@ -1 +1,191 @@
-{}
+{
+ "action_bar_show_menu": "메뉴 표시",
+ "action_bar_logo_alt": "ntfy 로고",
+ "action_bar_settings": "설정",
+ "action_bar_send_test_notification": "시험용 알림 발송",
+ "action_bar_clear_notifications": "모든 알림 초기화",
+ "action_bar_unsubscribe": "구독 해제",
+ "action_bar_toggle_mute": "알림 음소거/해제",
+ "action_bar_toggle_action_menu": "액션 메뉴 열기/닫기",
+ "message_bar_type_message": "여기에 메세지를 입력하세요",
+ "message_bar_error_publishing": "메세지 발송 오류",
+ "message_bar_show_dialog": "발송 창 표시",
+ "message_bar_publish": "메세지 발송",
+ "nav_topics_title": "구독한 주제",
+ "nav_button_all_notifications": "모든 알림",
+ "nav_button_publish_message": "알림 보내기",
+ "nav_button_subscribe": "주제 구독하기",
+ "nav_button_muted": "알림 음소거됨",
+ "nav_button_connecting": "연결중",
+ "alert_grant_title": "알림이 비활성화되어 있습니다",
+ "alert_grant_description": "데스크톱 알림을 받기 위해서는 브라우저에서 권한을 부여해야 합니다.",
+ "alert_grant_button": "권한 부여하기",
+ "alert_not_supported_title": "알림이 지원되지 않습니다",
+ "notifications_list_item": "알림",
+ "notifications_mark_read": "읽음으로 표시",
+ "notifications_delete": "삭제",
+ "notifications_copied_to_clipboard": "클립보드에 복사됨",
+ "notifications_tags": "태그",
+ "notifications_priority_x": "우선순위 {{priority}}",
+ "notifications_new_indicator": "새 알림",
+ "notifications_attachment_image": "첨부 이미지",
+ "notifications_attachment_copy_url_title": "첨부 주소를 클립보드에 복사",
+ "notifications_attachment_copy_url_button": "URL 복사",
+ "notifications_attachment_open_title": "{{url}}로 가기",
+ "publish_dialog_attachment_limits_file_and_quota_reached": "첨부파일 크기 제한({{fileSizeLimit}}) 초과 및 할당량 초과({{remainingBytes}} 남음)",
+ "publish_dialog_attachment_limits_file_reached": "첨부파일 크기 제한({{fileSizeLimit}}) 초과",
+ "publish_dialog_attachment_limits_quota_reached": "할당량 초과({{remainingBytes}} 남음)",
+ "publish_dialog_emoji_picker_show": "이모지 선택",
+ "publish_dialog_priority_min": "우선순위 최소",
+ "publish_dialog_priority_low": "우선순위 낮음",
+ "publish_dialog_priority_default": "우선순위 기본",
+ "publish_dialog_priority_high": "우선순위 높음",
+ "publish_dialog_priority_max": "우선순위 최상",
+ "publish_dialog_base_url_label": "서비스 URL",
+ "publish_dialog_base_url_placeholder": "서비스 URL, 예를 들면 https://example.com",
+ "publish_dialog_topic_label": "주제 이름",
+ "publish_dialog_topic_placeholder": "주제 이름, 예를 들면 phil_alerts",
+ "publish_dialog_topic_reset": "주제 초기화",
+ "publish_dialog_title_label": "제목",
+ "publish_dialog_title_placeholder": "알림 제목, 예를 들면 디스크 공간 경고",
+ "publish_dialog_message_label": "메세지",
+ "publish_dialog_message_placeholder": "메세지를 여기에 입력하세요",
+ "publish_dialog_tags_label": "태그",
+ "publish_dialog_tags_placeholder": "반점으로 구분된 태그 목록, 예를 들면 warning, srv1-backup",
+ "publish_dialog_priority_label": "우선순위",
+ "publish_dialog_click_label": "클릭 URL",
+ "publish_dialog_click_placeholder": "알림이 클릭되었을때 이동할 URL",
+ "publish_dialog_click_reset": "클릭 URL 제거",
+ "publish_dialog_email_label": "이메일",
+ "publish_dialog_email_placeholder": "알림을 전달할 이메일 주소, 예를 들면 phil@example.com",
+ "publish_dialog_email_reset": "이메일 전달 삭제",
+ "publish_dialog_attach_label": "첨부 파일 URL",
+ "publish_dialog_attach_placeholder": "파일을 URL로 첨부하기, 예를 들면 https://f-droid.org/F-Droid.apk",
+ "publish_dialog_attach_reset": "첨부 파일 URL 삭제",
+ "publish_dialog_filename_label": "파일 이름",
+ "publish_dialog_filename_placeholder": "첨부 파일 이름",
+ "publish_dialog_delay_label": "지연",
+ "publish_dialog_chip_email_label": "이메일로 전달",
+ "publish_dialog_chip_attach_url_label": "URL로 파일 첨부",
+ "publish_dialog_chip_attach_file_label": "로컬 파일 첨부",
+ "publish_dialog_chip_delay_label": "발송 지연",
+ "publish_dialog_chip_topic_label": "주제 변경",
+ "publish_dialog_details_examples_description": "예제와 모든 전송 기능의 자세한 설명은 <docsLink>문서</docsLink>를 참고해주세요.",
+ "publish_dialog_button_cancel": "취소",
+ "publish_dialog_button_send": "보내기",
+ "publish_dialog_button_cancel_sending": "보내기 취소",
+ "publish_dialog_checkbox_publish_another": "다른 메세지 보내기",
+ "publish_dialog_attached_file_title": "첨부된 파일:",
+ "publish_dialog_attached_file_filename_placeholder": "첨부 파일 이름",
+ "publish_dialog_attached_file_remove": "첨부 파일 삭제",
+ "publish_dialog_drop_file_here": "여기에 파일을 끌어다 놓으세요",
+ "emoji_picker_search_placeholder": "이모지 검색",
+ "emoji_picker_search_clear": "검색 초기화",
+ "subscribe_dialog_subscribe_title": "주제 구독하기",
+ "subscribe_dialog_subscribe_description": "주제는 비밀번호로 보호되지 않을 수 있으니 추측하기 어려운 이름을 사용하십시오. 구독한 뒤 PUT/POST 알림을 보낼 수 있습니다.",
+ "subscribe_dialog_subscribe_topic_placeholder": "주제 이름, 예를 들면 phil_alerts",
+ "subscribe_dialog_subscribe_use_another_label": "다른 서버 사용",
+ "subscribe_dialog_subscribe_base_url_label": "서비스 URL",
+ "subscribe_dialog_subscribe_button_cancel": "취소",
+ "subscribe_dialog_subscribe_button_subscribe": "구독하기",
+ "subscribe_dialog_login_title": "로그인 필요함",
+ "subscribe_dialog_error_user_anonymous": "익명",
+ "subscribe_dialog_error_user_not_authorized": "사용자 {{username}} 은(는) 인증되지 않았습니다",
+ "subscribe_dialog_login_username_label": "사용자 이름, 예를 들면 phil",
+ "subscribe_dialog_login_password_label": "비밀번호",
+ "subscribe_dialog_login_button_back": "뒤로가기",
+ "subscribe_dialog_login_button_login": "로그인",
+ "prefs_notifications_title": "알림",
+ "prefs_notifications_sound_title": "알림 효과음",
+ "prefs_notifications_sound_description_none": "알림 도착시 효과음을 재생하지 않습니다",
+ "prefs_notifications_sound_description_some": "알림 도착시 {{sound}} 효과음이 재생됩니다",
+ "prefs_notifications_sound_no_sound": "효과음 없음",
+ "prefs_notifications_sound_play": "선택한 효과음 재생",
+ "prefs_notifications_min_priority_title": "우선순위 최소",
+ "prefs_notifications_min_priority_description_x_or_higher": "우선순위가 {{number}} ({{name}}) 이상인 알림만 보기",
+ "prefs_notifications_min_priority_description_max": "우선순위가 5 (최상)인 알림만 보기",
+ "prefs_notifications_min_priority_any": "아무 우선순위",
+ "prefs_notifications_min_priority_default_and_higher": "우선순위 기본 이상",
+ "prefs_notifications_min_priority_low_and_higher": "우선순위 낮음 이상",
+ "prefs_notifications_delete_after_three_hours": "3시간 뒤",
+ "prefs_notifications_delete_after_one_day": "1일 뒤",
+ "prefs_notifications_delete_after_one_week": "1주 뒤",
+ "prefs_notifications_delete_after_one_month": "1달 뒤",
+ "prefs_notifications_delete_after_never_description": "알림이 자동으로 삭제되지 않습니다",
+ "prefs_notifications_delete_after_three_hours_description": "알림이 3시간 뒤 자동으로 삭제됩니다",
+ "prefs_notifications_delete_after_one_day_description": "알림이 1일 뒤 자동으로 삭제됩니다",
+ "prefs_notifications_delete_after_one_week_description": "알림이 1주 뒤 자동으로 삭제됩니다",
+ "prefs_notifications_delete_after_one_month_description": "알림이 1달 뒤 자동으로 삭제됩니다",
+ "prefs_users_title": "사용자 관리",
+ "prefs_users_description": "이곳에서 보호된 주제를 위한 사용자를 추가하거나 삭제할 수 있습니다. 사용자 이름과 비밀번호는 브라우저의 로컬 저장소에 보관됩니다.",
+ "prefs_users_add_button": "사용자 추가",
+ "prefs_users_edit_button": "사용자 편집",
+ "prefs_users_delete_button": "사용자 삭제",
+ "prefs_users_table_user_header": "사용자",
+ "prefs_users_table_base_url_header": "서비스 URL",
+ "prefs_users_dialog_title_add": "사용자 추가",
+ "prefs_users_dialog_title_edit": "사용자 편집",
+ "prefs_users_dialog_base_url_label": "서비스 URL, 예를 들면 https://ntfy.sh",
+ "prefs_users_dialog_button_cancel": "취소",
+ "prefs_users_dialog_button_save": "저장",
+ "prefs_appearance_title": "표시 설정",
+ "prefs_users_dialog_button_add": "추가",
+ "prefs_appearance_language_title": "언어",
+ "priority_min": "최하",
+ "priority_low": "낮음",
+ "priority_default": "기본",
+ "priority_high": "높음",
+ "error_boundary_title": "이런, ntfy가 충돌했습니다",
+ "error_boundary_button_copy_stack_trace": "스택 트레이스 복사",
+ "error_boundary_stack_trace": "스택 트레이스",
+ "error_boundary_gathering_info": "더 많은 정보 모으기 …",
+ "error_boundary_unsupported_indexeddb_title": "시크릿 모드는 지원되지 않습니다",
+ "notifications_click_copy_url_button": "링크 복사",
+ "notifications_click_copy_url_title": "링크 URL을 클립보드에 복사",
+ "notifications_attachment_file_video": "동영상 파일",
+ "notifications_attachment_file_app": "안드로이드 앱 파일",
+ "notifications_attachment_file_document": "다른 문서",
+ "notifications_click_open_button": "링크 열기",
+ "notifications_actions_not_supported": "웹앱에서 지원되지 않는 동작입니다",
+ "publish_dialog_title_topic": "{{topic}}에 발송",
+ "alert_not_supported_description": "사용중인 브라우저에서 알림 기능을 지원하지 않습니다.",
+ "notifications_example": "예제",
+ "notifications_more_details": "더 많은 정보가 필요하시다면 <websiteLink>웹사이트</websiteLink>나 <docsLink>문서</docsLink>를 참고하세요.",
+ "notifications_list": "알림 목록",
+ "notifications_attachment_open_button": "첨부 파일 열기",
+ "notifications_no_subscriptions_title": "아직 아무런 구독을 추가하지 않으신 것 같습니다.",
+ "nav_button_settings": "설정",
+ "nav_button_documentation": "문서",
+ "notifications_attachment_link_expires": "링크가 {{date}}에 만료됨",
+ "notifications_attachment_link_expired": "다운로드 링크 만료됨",
+ "notifications_attachment_file_audio": "음성 파일",
+ "notifications_attachment_file_image": "사진 파일",
+ "notifications_actions_open_url_title": "{{url}]로 가기",
+ "notifications_actions_http_request_title": "HTTP {{method}}를 {{url}}에 보내기",
+ "notifications_none_for_topic_title": "아직 이 주제 관련 알림을 받지 않았습니다.",
+ "notifications_none_for_any_title": "아직 어떤 알림도 받지 않았습니다.",
+ "notifications_none_for_any_description": "알림을 받으려면 아래 주소로 PUT이나 POST 요청을 보내세요. 구독중이신 주제 중 하나로 예를 들자면 다음과 같습니다.",
+ "notifications_loading": "알림 불러오는중 …",
+ "publish_dialog_message_published": "알림 발송됨",
+ "notifications_none_for_topic_description": "알림을 받으려면 아래 주소로 PUT이나 POST 요청을 보내세요.",
+ "notifications_no_subscriptions_description": "\"{{linktext}}\" 링크를 눌러서 주제를 생성하거나 구독하세요. 그 다음, 메세지를 PUT이나 POST로 보내면 여기에서 알림을 받으실 수 있습니다.",
+ "publish_dialog_progress_uploading": "업로드중 …",
+ "publish_dialog_title_no_topic": "알림 발송",
+ "publish_dialog_progress_uploading_detail": "업로드중 {{loaded}}/{{total}} ({{percent}}%) …",
+ "publish_dialog_delay_placeholder": "알림 발송 지연, 예를 들면 {{unixTimestamp}}, {{relativeTime}} 또는 \"{{naturalLanguage}}\" (영어로 입력)",
+ "publish_dialog_delay_reset": "발송 지연 삭제",
+ "publish_dialog_chip_click_label": "클릭 URL",
+ "subscribe_dialog_login_description": "이 주제는 비밀번호로 보호되어 있습니다. 구독하시려면 사용자 이름과 비밀번호를 입력해주세요.",
+ "prefs_notifications_min_priority_max_only": "우선순위 최상만",
+ "publish_dialog_other_features": "다른 기능:",
+ "prefs_notifications_min_priority_description_any": "우선순위 무관 모든 알림 보기",
+ "prefs_notifications_min_priority_high_and_higher": "우선순위 높음 이상",
+ "error_boundary_unsupported_indexeddb_description": "ntfy 웹 앱은 동작하기 위해서 IndexedDB가 필요하지만 사용중이신 브라우저는 IndexedDB를 시크릿 모드에서 지원하지 않습니다.<br/><br/>안타깝지만 모든 정보는 브라우저에만 저장되므로 ntfy 웹앱을 시크릿 모드에서 사용할 이유는 존재하지 않습니다. <githubLink>이 깃허브 이슈</githubLink>를 참고해 보시거나, <discordLink>디스코드 서버</discordLink>나 <matrixLink>Matrix</matrixLink>에서 저희와 이야기를 나눌 수 있습니다.",
+ "prefs_notifications_delete_after_title": "알림 삭제",
+ "prefs_notifications_delete_after_never": "삭제하지 않음",
+ "prefs_users_table": "사용자 테이블",
+ "prefs_users_dialog_username_label": "사용자 이름, 예를 들면 phil",
+ "prefs_users_dialog_password_label": "비밀번호",
+ "priority_max": "최상",
+ "error_boundary_description": "이것은 당연히 발생되어서는 안됩니다. 굉장히 죄송합니다.<br/>가능하시다면 <githubLink>이 문제를 깃허브에 제보</githubLink>해 주시거나, <discordLink>디스코드 서버</discordLink>나 <matrixLink>Matrix</matrixLink>를 통해 알려주세요."
+}
From bcda08a01c03d5496e658e29d48b82691b2ae5a9 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Wed, 28 Sep 2022 09:22:36 -0400
Subject: [PATCH 55/63] Developer docs, closes #414
---
docs/develop.md | 6 +++---
docs/releases.md | 36 +++++++++++++++++++++---------------
2 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/docs/develop.md b/docs/develop.md
index 3c07d8f2..f3da274a 100644
--- a/docs/develop.md
+++ b/docs/develop.md
@@ -58,8 +58,8 @@ These steps **assume Ubuntu**. Steps may vary on different Linux distributions.
First, install [Go](https://go.dev/) (see [official instructions](https://go.dev/doc/install)):
``` shell
-wget https://go.dev/dl/go1.18.linux-amd64.tar.gz
-sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.18.linux-amd64.tar.gz
+wget https://go.dev/dl/go1.19.1.linux-amd64.tar.gz
+sudo rm -rf /usr/local/go && sudo tar -C /usr/local -xzf go1.19.1.linux-amd64.tar.gz
export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
go version # verifies that it worked
```
@@ -72,7 +72,7 @@ goreleaser -v # verifies that it worked
Install [nodejs](https://nodejs.org/en/) (see [official instructions](https://nodejs.org/en/download/package-manager/)):
``` shell
-curl -fsSL https://deb.nodesource.com/setup_17.x | sudo -E bash -
+curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
sudo apt-get install -y nodejs
npm -v # verifies that it worked
```
diff --git a/docs/releases.md b/docs/releases.md
index 9b74f77d..c4a203b0 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -2,6 +2,12 @@
Binaries for all releases can be found on the GitHub releases pages for the [ntfy server](https://github.com/binwiederhier/ntfy/releases)
and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/releases).
+## ntfy server v1.29.0 (UNRELEASED)
+
+**Documentation:**
+
+* Updated developer docs, bump nodejs and go version ([#414](https://github.com/binwiederhier/ntfy/issues/414), thanks to [@YJSoft](https://github.com/YJSoft) for reporting)
+
## ntfy Android app v1.14.0
Released September 27, 2022
@@ -18,7 +24,7 @@ languages. Hurray!
* Move action buttons in notification cards ([#236](https://github.com/binwiederhier/ntfy/issues/236), thanks to [@wunter8](https://github.com/wunter8))
* Icons can be set for each individual notification ([#126](https://github.com/binwiederhier/ntfy/issues/126), thanks to [@wunter8](https://github.com/wunter8))
-**Bugs:**
+**Bug fixes:**
* Long-click selecting of notifications doesn't scroll to the top anymore ([#235](https://github.com/binwiederhier/ntfy/issues/235), thanks to [@wunter8](https://github.com/wunter8))
* Add attachment and click URL extras to MESSAGE_RECEIVED broadcast ([#329](https://github.com/binwiederhier/ntfy/issues/329), thanks to [@wunter8](https://github.com/wunter8))
@@ -51,7 +57,7 @@ I would be very humbled if you consider donating.
* CLI: Allow default username/password in `client.yml` ([#372](https://github.com/binwiederhier/ntfy/pull/372), thanks to [@wunter8](https://github.com/wunter8))
* Build support for other Unix systems ([#393](https://github.com/binwiederhier/ntfy/pull/393), thanks to [@la-ninpre](https://github.com/la-ninpre))
-**Bugs:**
+**Bug fixes:**
* `ntfy user` commands don't work with `auth_file` but works with `auth-file` ([#344](https://github.com/binwiederhier/ntfy/issues/344), thanks to [@Histalek](https://github.com/Histalek) for reporting)
* Ignore new draft HTTP `Priority` header ([#351](https://github.com/binwiederhier/ntfy/issues/351), thanks to [@ksurl](https://github.com/ksurl) for reporting)
@@ -86,7 +92,7 @@ minute or so, due to competing stats gathering (personal installations will like
* Trace: Log entire HTTP request to simplify debugging (no ticket)
* Allow setting user password via `NTFY_PASSWORD` env variable ([#327](https://github.com/binwiederhier/ntfy/pull/327), thanks to [@Kenix3](https://github.com/Kenix3))
-**Bugs:**
+**Bug fixes:**
* Fix slow requests due to excessive locking ([#338](https://github.com/binwiederhier/ntfy/issues/338))
* Return HTTP 500 for `GET /_matrix/push/v1/notify` when `base-url` is not configured (no ticket)
@@ -111,7 +117,7 @@ CLI is now available via Scoop, and ntfy is now natively supported in Uptime Kum
* [Uptime Kuma](https://github.com/louislam/uptime-kuma) now allows publishing to ntfy ([uptime-kuma#1674](https://github.com/louislam/uptime-kuma/pull/1674), thanks to [@philippdormann](https://github.com/philippdormann))
* Display ntfy version in `ntfy serve` command ([#314](https://github.com/binwiederhier/ntfy/issues/314), thanks to [@poblabs](https://github.com/poblabs))
-**Bugs:**
+**Bug fixes:**
* Web app: Show "notifications not supported" alert on HTTP ([#323](https://github.com/binwiederhier/ntfy/issues/323), thanks to [@milksteakjellybeans](https://github.com/milksteakjellybeans) for reporting)
* Use last address in `X-Forwarded-For` header as visitor address ([#328](https://github.com/binwiederhier/ntfy/issues/328))
@@ -134,7 +140,7 @@ set your server as the default server for new topics.
* Support for auth and user management ([#277](https://github.com/binwiederhier/ntfy/issues/277))
* Ability to add default server ([#295](https://github.com/binwiederhier/ntfy/issues/295))
-**Bugs:**
+**Bug fixes:**
* Add validation for selfhosted server URL ([#290](https://github.com/binwiederhier/ntfy/issues/290))
@@ -197,7 +203,7 @@ for details).
* Cancel notifications when navigating to topic (no ticket)
* iOS 14.0 support (no ticket, [PR#1](https://github.com/binwiederhier/ntfy-ios/pull/1), thanks to [@callum-99](https://github.com/callum-99))
-**Bugs:**
+**Bug fixes:**
* iOS UI not always updating properly ([#267](https://github.com/binwiederhier/ntfy/issues/267))
@@ -214,7 +220,7 @@ Apple development environment.
* Add subscribe filter to query exact messages by ID (no ticket)
* Support for `poll_request` messages to support [iOS push notifications](https://ntfy.sh/docs/config/#ios-instant-notifications) for self-hosted servers (no ticket)
-**Bugs:**
+**Bug fixes:**
* Support emails without `Content-Type` ([#265](https://github.com/binwiederhier/ntfy/issues/265), thanks to [@dmbonsall](https://github.com/dmbonsall))
@@ -252,7 +258,7 @@ it adds support for APNs, the iOS messaging service. This is needed for the (soo
* Ability to disable the web app entirely ([#238](https://github.com/binwiederhier/ntfy/issues/238)/[#249](https://github.com/binwiederhier/ntfy/pull/249), thanks to [@Curid](https://github.com/Curid))
* Add APNs config to Firebase messages to support [iOS app](https://github.com/binwiederhier/ntfy/issues/4) ([#247](https://github.com/binwiederhier/ntfy/pull/247), thanks to [@Copephobia](https://github.com/Copephobia))
-**Bugs:**
+**Bug fixes:**
* Support underscores in server.yml config options ([#255](https://github.com/binwiederhier/ntfy/issues/255), thanks to [@ajdelgado](https://github.com/ajdelgado))
* Force MAKEFLAGS to --jobs=1 in `Makefile` ([#257](https://github.com/binwiederhier/ntfy/pull/257), thanks to [@oddlama](https://github.com/oddlama))
@@ -281,7 +287,7 @@ and custom icons. Aside from that, we've got tons of bug fixes as usual.
* Per-subscription settings, custom subscription icons ([#155](https://github.com/binwiederhier/ntfy/issues/155), thanks to [@mztiq](https://github.com/mztiq) for reporting)
* Cards in notification detail view ([#175](https://github.com/binwiederhier/ntfy/issues/175), thanks to [@cmeis](https://github.com/cmeis) for reporting)
-**Bugs:**
+**Bug fixes:**
* Accurate naming of "mute notifications" from "pause notifications" ([#224](https://github.com/binwiederhier/ntfy/issues/224), thanks to [@shadow00](https://github.com/shadow00) for reporting)
* Make messages with links selectable ([#226](https://github.com/binwiederhier/ntfy/issues/226), thanks to [@StoyanDimitrov](https://github.com/StoyanDimitrov) for reporting)
@@ -314,7 +320,7 @@ We've also improved the documentation a little and added translations for three
* Better parsing of the user actions, allowing quotes (no ticket)
* Add "mark as read" icon button to notification ([#243](https://github.com/binwiederhier/ntfy/pull/243), thanks to [@wunter8](https://github.com/wunter8))
-**Bugs:**
+**Bug fixes:**
* `Upgrade` header check is now case in-sensitive ([#228](https://github.com/binwiederhier/ntfy/issues/228), thanks to [@wunter8](https://github.com/wunter8) for finding it)
* Made web app sounds quieter ([#222](https://github.com/binwiederhier/ntfy/issues/222))
@@ -356,7 +362,7 @@ languages and fixed a ton of bugs.
thanks to [@StoyanDimitrov](https://github.com/StoyanDimitrov) for reporting)
* Channel settings option to configure DND override, sounds, etc. ([#91](https://github.com/binwiederhier/ntfy/issues/91))
-**Bugs:**
+**Bug fixes:**
* Validate URLs when changing default server and server in user management ([#193](https://github.com/binwiederhier/ntfy/issues/193),
thanks to [@StoyanDimitrov](https://github.com/StoyanDimitrov) for reporting)
@@ -397,7 +403,7 @@ Limited support is available in the web app.
* Added ARMv6 build ([#200](https://github.com/binwiederhier/ntfy/issues/200), thanks to [@jcrubioa](https://github.com/jcrubioa) for reporting)
* Web app internationalization support 🇧🇬 🇩🇪 🇺🇸 🌎 ([#189](https://github.com/binwiederhier/ntfy/issues/189))
-**Bugs:**
+**Bug fixes:**
* Web app: English language strings fixes, additional descriptions for settings ([#203](https://github.com/binwiederhier/ntfy/issues/203), thanks to [@StoyanDimitrov](https://github.com/StoyanDimitrov))
* Web app: Show error message snackbar when sending test notification fails ([#205](https://github.com/binwiederhier/ntfy/issues/205), thanks to [@cmeis](https://github.com/cmeis))
@@ -437,7 +443,7 @@ Released Apr 7, 2022
* Translations to different languages ([#188](https://github.com/binwiederhier/ntfy/issues/188), thanks to
[@StoyanDimitrov](https://github.com/StoyanDimitrov) for initiating things)
-**Bugs:**
+**Bug fixes:**
* IllegalStateException: Failed to build unique file ([#177](https://github.com/binwiederhier/ntfy/issues/177), thanks to [@Fallenbagel](https://github.com/Fallenbagel) for reporting)
* SQLiteConstraintException: Crash during UP registration ([#185](https://github.com/binwiederhier/ntfy/issues/185))
@@ -471,7 +477,7 @@ Released Apr 6, 2022
* Added message bar and publish dialog ([#196](https://github.com/binwiederhier/ntfy/issues/196))
-**Bugs:**
+**Bug fixes:**
* Added `EXPOSE 80/tcp` to Dockerfile to support auto-discovery in [Traefik](https://traefik.io/) ([#195](https://github.com/binwiederhier/ntfy/issues/195), thanks to [@s-h-a-r-d](https://github.com/s-h-a-r-d))
@@ -487,7 +493,7 @@ Released Apr 6, 2022
## ntfy server v1.19.0
Released Mar 30, 2022
-**Bugs:**
+**Bug fixes:**
* Do not pack binary with `upx` for armv7/arm64 due to `illegal instruction` errors ([#191](https://github.com/binwiederhier/ntfy/issues/191), thanks to [@iexos](https://github.com/iexos))
* Do not allow comma in topic name in publish via GET endpoint (no ticket)
From 4abd0e290adfad88178acc33b9988224aa8e5fb4 Mon Sep 17 00:00:00 2001
From: Christian Meis <christian@meis.de>
Date: Wed, 28 Sep 2022 14:08:37 +0000
Subject: [PATCH 56/63] Translated using Weblate (German)
Currently translated at 100.0% (189 of 189 strings)
Translation: ntfy/Web app
Translate-URL: https://hosted.weblate.org/projects/ntfy/web/de/
---
web/public/static/langs/de.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/public/static/langs/de.json b/web/public/static/langs/de.json
index 8f6cd441..be3b9a26 100644
--- a/web/public/static/langs/de.json
+++ b/web/public/static/langs/de.json
@@ -82,7 +82,7 @@
"publish_dialog_attach_placeholder": "Datei von URL anhängen, z.B. https://f-droid.org/F-Droid.apk",
"publish_dialog_filename_placeholder": "Dateiname des Anhangs",
"publish_dialog_delay_label": "Verzögerung",
- "publish_dialog_email_placeholder": "Adresse, an die die Benachrichtigung gesendet werden soll, z.B. phil@beispiel.com",
+ "publish_dialog_email_placeholder": "E-Mail-Adresse, an die die Benachrichtigung gesendet werden soll, z.B. phil@example.com",
"publish_dialog_chip_click_label": "Klick-URL",
"publish_dialog_button_cancel_sending": "Senden abbrechen",
"publish_dialog_drop_file_here": "Datei hierher ziehen",
From ea669c75a352937421562dfc7a32e90ba2b5b1f7 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Fri, 30 Sep 2022 12:00:30 -0400
Subject: [PATCH 57/63] Add sponsors to release notes
---
docs/releases.md | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/docs/releases.md b/docs/releases.md
index c4a203b0..6190f283 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -8,6 +8,24 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
* Updated developer docs, bump nodejs and go version ([#414](https://github.com/binwiederhier/ntfy/issues/414), thanks to [@YJSoft](https://github.com/YJSoft) for reporting)
+**Sponsorships:**:
+
+Thank you to the amazing folks who decided to [sponsor ntfy](https://github.com/sponsors/binwiederhier). Thank you for
+helping carry the cost of the public server and developer licenses, and more importantly: Thank you for believing in ntfy!
+You guys rock!
+
+Sponsors (alphabetical order):
+
+* [@aspyct](https://github.com/aspyct)
+* [@codinghipster](https://github.com/codinghipster)
+* [@HinFort](https://github.com/HinFort)
+* [@mckay115](https://github.com/mckay115)
+* [@neutralinsomniac](https://github.com/neutralinsomniac)
+* [@nickexyz](https://github.com/nickexyz)
+* [@qcasey](https://github.com/qcasey)
+* [@Salamafet](https://github.com/Salamafet)
+* +1 private sponsor
+
## ntfy Android app v1.14.0
Released September 27, 2022
From f01576e40dc4f131e66d65fb30cd16381ccea2ae Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Fri, 30 Sep 2022 12:06:31 -0400
Subject: [PATCH 58/63] Sponsors to README
---
README.md | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index ee043a42..bb2a5c80 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,16 @@ Or, if you'd like to help translate 🇩🇪 🇺🇸 🇧🇬, you can start im
## Donations
I have just very recently started accepting donations via [GitHub Sponsors](https://github.com/sponsors/binwiederhier).
I would be humbled if you helped me carry the server and developer account costs. Even small donations are very much
-appreciated.
+appreciated. A big fat Thank You to the folks already sponsoring ntfy:
+
+<a href="https://github.com/aspyct"><img src="https://github.com/aspyct.png" width="40px" /></a>
+<a href="https://github.com/codinghipster"><img src="https://github.com/codinghipster.png" width="40px" /></a>
+<a href="https://github.com/HinFort"><img src="https://github.com/HinFort.png" width="40px" /></a>
+<a href="https://github.com/mckay115"><img src="https://github.com/mckay115.png" width="40px" /></a>
+<a href="https://github.com/neutralinsomniac"><img src="https://github.com/neutralinsomniac.png" width="40px" /></a>
+<a href="https://github.com/nickexyz"><img src="https://github.com/nickexyz.png" width="40px" /></a>
+<a href="https://github.com/qcasey"><img src="https://github.com/qcasey.png" width="40px" /></a>
+<a href="https://github.com/Salamafet"><img src="https://github.com/Salamafet.png" width="40px" /></a>
## License
Made with ❤️ by [Philipp C. Heckel](https://heckel.io).
From f8c9945cc468768058ba7dd22cc222173837244e Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sat, 1 Oct 2022 14:54:16 -0400
Subject: [PATCH 59/63] Korean
---
docs/releases.md | 4 ++++
web/src/components/Preferences.js | 1 +
2 files changed, 5 insertions(+)
diff --git a/docs/releases.md b/docs/releases.md
index 6190f283..2afc07a3 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -8,6 +8,10 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
* Updated developer docs, bump nodejs and go version ([#414](https://github.com/binwiederhier/ntfy/issues/414), thanks to [@YJSoft](https://github.com/YJSoft) for reporting)
+**Additional translations:**
+
+* Korean (thanks to [@YJSofta0f97461d82447ac](https://hosted.weblate.org/user/YJSofta0f97461d82447ac/))
+
**Sponsorships:**:
Thank you to the amazing folks who decided to [sponsor ntfy](https://github.com/sponsors/binwiederhier). Thank you for
diff --git a/web/src/components/Preferences.js b/web/src/components/Preferences.js
index 13de5565..2bafa7e9 100644
--- a/web/src/components/Preferences.js
+++ b/web/src/components/Preferences.js
@@ -458,6 +458,7 @@ const Language = () => {
<MenuItem value="fr">Français</MenuItem>
<MenuItem value="it">Italiano</MenuItem>
<MenuItem value="hu">Magyar</MenuItem>
+ <MenuItem value="ko">한국어</MenuItem>
<MenuItem value="ja">日本語</MenuItem>
<MenuItem value="nl">Nederlands</MenuItem>
<MenuItem value="nb_NO">Norsk bokmål</MenuItem>
From b15ecd785e801c9553be4e05039b2609f3adf3da Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sat, 1 Oct 2022 15:23:14 -0400
Subject: [PATCH 60/63] Fix trailing slash issue for base-url
---
cmd/serve.go | 8 ++++++--
docs/releases.md | 4 ++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/cmd/serve.go b/cmd/serve.go
index 23e50ac0..126cf0dc 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -157,14 +157,18 @@ func execServe(c *cli.Context) error {
return errors.New("if smtp-server-listen is set, smtp-server-domain must also be set")
} else if attachmentCacheDir != "" && baseURL == "" {
return errors.New("if attachment-cache-dir is set, base-url must also be set")
- } else if baseURL != "" && !strings.HasPrefix(baseURL, "http://") && !strings.HasPrefix(baseURL, "https://") && strings.HasSuffix(baseURL, "/") {
- return errors.New("if set, base-url must start with http:// or https://, and must not end with a slash (/)")
+ } else if baseURL != "" && !strings.HasPrefix(baseURL, "http://") && !strings.HasPrefix(baseURL, "https://") {
+ return errors.New("if set, base-url must start with http:// or https://")
+ } else if baseURL != "" && strings.HasSuffix(baseURL, "/") {
+ return errors.New("if set, base-url must not end with a slash (/)")
} else if !util.InStringList([]string{"read-write", "read-only", "write-only", "deny-all"}, authDefaultAccess) {
return errors.New("if set, auth-default-access must start set to 'read-write', 'read-only', 'write-only' or 'deny-all'")
} else if !util.InStringList([]string{"app", "home", "disable"}, webRoot) {
return errors.New("if set, web-root must be 'home' or 'app'")
} else if upstreamBaseURL != "" && !strings.HasPrefix(upstreamBaseURL, "http://") && !strings.HasPrefix(upstreamBaseURL, "https://") {
return errors.New("if set, upstream-base-url must start with http:// or https://")
+ } else if upstreamBaseURL != "" && strings.HasSuffix(upstreamBaseURL, "/") {
+ return errors.New("if set, upstream-base-url must not end with a slash (/)")
} else if upstreamBaseURL != "" && baseURL == "" {
return errors.New("if upstream-base-url is set, base-url must also be set")
} else if upstreamBaseURL != "" && baseURL != "" && baseURL == upstreamBaseURL {
diff --git a/docs/releases.md b/docs/releases.md
index 2afc07a3..bc63ae22 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -4,6 +4,10 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
## ntfy server v1.29.0 (UNRELEASED)
+**Bug fixes:**
+
+* Subscriptions can now have a display name ([#370](https://github.com/binwiederhier/ntfy/issues/370), thanks to [@tfheen](https://github.com/tfheen) for reporting)
+
**Documentation:**
* Updated developer docs, bump nodejs and go version ([#414](https://github.com/binwiederhier/ntfy/issues/414), thanks to [@YJSoft](https://github.com/YJSoft) for reporting)
From bddde5c637c470dc6297751294571843ba5990fd Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sat, 1 Oct 2022 15:50:48 -0400
Subject: [PATCH 61/63] Bump Go version, Generics whoooo
---
.github/workflows/build.yaml | 2 +-
.github/workflows/release.yaml | 2 +-
.github/workflows/test.yaml | 4 ++--
cmd/access.go | 6 +++---
cmd/serve.go | 4 ++--
cmd/user.go | 2 +-
go.mod | 18 +++++++++---------
go.sum | 16 ++++++++++++++++
server/actions.go | 10 +++++-----
server/server.go | 4 ++--
server/smtp_sender.go | 2 +-
server/types.go | 4 ++--
util/util.go | 18 ++++--------------
util/util_test.go | 14 +++++++-------
14 files changed, 56 insertions(+), 50 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 45a5ae2a..c1e2a247 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -13,7 +13,7 @@ jobs:
name: Install node
uses: actions/setup-node@v2
with:
- node-version: '16'
+ node-version: '17'
-
name: Checkout code
uses: actions/checkout@v2
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a2a6e335..6ce2297b 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -16,7 +16,7 @@ jobs:
name: Install node
uses: actions/setup-node@v2
with:
- node-version: '16'
+ node-version: '17'
-
name: Checkout code
uses: actions/checkout@v2
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 96c43d85..852654ac 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -3,7 +3,7 @@ on: [push, pull_request]
jobs:
test:
runs-on: ubuntu-latest
- steps:
+ steps:
-
name: Install Go
uses: actions/setup-go@v2
@@ -13,7 +13,7 @@ jobs:
name: Install node
uses: actions/setup-node@v2
with:
- node-version: '16'
+ node-version: '17'
-
name: Checkout code
uses: actions/checkout@v2
diff --git a/cmd/access.go b/cmd/access.go
index e1f61bc1..9bd65f84 100644
--- a/cmd/access.go
+++ b/cmd/access.go
@@ -97,11 +97,11 @@ func execUserAccess(c *cli.Context) error {
}
func changeAccess(c *cli.Context, manager auth.Manager, username string, topic string, perms string) error {
- if !util.InStringList([]string{"", "read-write", "rw", "read-only", "read", "ro", "write-only", "write", "wo", "none", "deny"}, perms) {
+ if !util.Contains([]string{"", "read-write", "rw", "read-only", "read", "ro", "write-only", "write", "wo", "none", "deny"}, perms) {
return errors.New("permission must be one of: read-write, read-only, write-only, or deny (or the aliases: read, ro, write, wo, none)")
}
- read := util.InStringList([]string{"read-write", "rw", "read-only", "read", "ro"}, perms)
- write := util.InStringList([]string{"read-write", "rw", "write-only", "write", "wo"}, perms)
+ read := util.Contains([]string{"read-write", "rw", "read-only", "read", "ro"}, perms)
+ write := util.Contains([]string{"read-write", "rw", "write-only", "write", "wo"}, perms)
user, err := manager.User(username)
if err == auth.ErrNotFound {
return fmt.Errorf("user %s does not exist", username)
diff --git a/cmd/serve.go b/cmd/serve.go
index 126cf0dc..952c426e 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -161,9 +161,9 @@ func execServe(c *cli.Context) error {
return errors.New("if set, base-url must start with http:// or https://")
} else if baseURL != "" && strings.HasSuffix(baseURL, "/") {
return errors.New("if set, base-url must not end with a slash (/)")
- } else if !util.InStringList([]string{"read-write", "read-only", "write-only", "deny-all"}, authDefaultAccess) {
+ } else if !util.Contains([]string{"read-write", "read-only", "write-only", "deny-all"}, authDefaultAccess) {
return errors.New("if set, auth-default-access must start set to 'read-write', 'read-only', 'write-only' or 'deny-all'")
- } else if !util.InStringList([]string{"app", "home", "disable"}, webRoot) {
+ } else if !util.Contains([]string{"app", "home", "disable"}, webRoot) {
return errors.New("if set, web-root must be 'home' or 'app'")
} else if upstreamBaseURL != "" && !strings.HasPrefix(upstreamBaseURL, "http://") && !strings.HasPrefix(upstreamBaseURL, "https://") {
return errors.New("if set, upstream-base-url must start with http:// or https://")
diff --git a/cmd/user.go b/cmd/user.go
index e89ee5e5..052c0800 100644
--- a/cmd/user.go
+++ b/cmd/user.go
@@ -273,7 +273,7 @@ func createAuthManager(c *cli.Context) (auth.Manager, error) {
return nil, errors.New("option auth-file not set; auth is unconfigured for this server")
} else if !util.FileExists(authFile) {
return nil, errors.New("auth-file does not exist; please start the server at least once to create it")
- } else if !util.InStringList([]string{"read-write", "read-only", "write-only", "deny-all"}, authDefaultAccess) {
+ } else if !util.Contains([]string{"read-write", "read-only", "write-only", "deny-all"}, authDefaultAccess) {
return nil, errors.New("if set, auth-default-access must start set to 'read-write', 'read-only' or 'deny-all'")
}
authDefaultRead := authDefaultAccess == "read-write" || authDefaultAccess == "read-only"
diff --git a/go.mod b/go.mod
index a149167c..56c13e19 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module heckel.io/ntfy
-go 1.17
+go 1.18
require (
cloud.google.com/go/firestore v1.6.1 // indirect
@@ -13,13 +13,13 @@ require (
github.com/mattn/go-sqlite3 v1.14.15
github.com/olebedev/when v0.0.0-20211212231525-59bd4edcf9d6
github.com/stretchr/testify v1.7.0
- github.com/urfave/cli/v2 v2.16.3
+ github.com/urfave/cli/v2 v2.17.1
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
- golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7
+ golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0
golang.org/x/term v0.0.0-20220919170432-7a66f970e087
golang.org/x/time v0.0.0-20220922220347-f3bd1da661af
- google.golang.org/api v0.97.0
+ google.golang.org/api v0.98.0
gopkg.in/yaml.v2 v2.4.0
)
@@ -30,7 +30,7 @@ require firebase.google.com/go/v4 v4.8.0
require (
cloud.google.com/go v0.104.0 // indirect
cloud.google.com/go/compute v1.10.0 // indirect
- cloud.google.com/go/iam v0.4.0 // indirect
+ cloud.google.com/go/iam v0.5.0 // indirect
github.com/AlekSi/pointer v1.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead // indirect
@@ -38,19 +38,19 @@ require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/uuid v1.3.0 // indirect
- github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
+ github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
github.com/googleapis/gax-go/v2 v2.5.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
go.opencensus.io v0.23.0 // indirect
- golang.org/x/net v0.0.0-20220927155233-aa73b2587036 // indirect
- golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25 // indirect
+ golang.org/x/net v0.0.0-20220930213112-107f3e3c3b0b // indirect
+ golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/appengine/v2 v2.0.2 // indirect
- google.golang.org/genproto v0.0.0-20220927151529-dcaddaf36704 // indirect
+ google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91 // indirect
google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
index 5b070196..403df2d1 100644
--- a/go.sum
+++ b/go.sum
@@ -83,6 +83,8 @@ cloud.google.com/go/iam v0.1.1/go.mod h1:CKqrcnI/suGpybEHxZ7BMehL0oA4LpdyJdUlTl9
cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
cloud.google.com/go/iam v0.4.0 h1:YBYU00SCDzZJdHqVc4I5d6lsklcYIjQZa1YmEz4jlSE=
cloud.google.com/go/iam v0.4.0/go.mod h1:cbaZxyScUhxl7ZAkNWiALgihfP75wS/fUsVNaa1r3vA=
+cloud.google.com/go/iam v0.5.0 h1:fz9X5zyTWBmamZsqvqZqD7khbifcZF/q+Z1J8pfhIUg=
+cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc=
cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic=
cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8=
cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4=
@@ -262,6 +264,8 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
github.com/googleapis/enterprise-certificate-proxy v0.1.0 h1:zO8WHNx/MYiAKJ3d5spxZXZE6KHmIQGQcAzwUzV7qQw=
github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
+github.com/googleapis/enterprise-certificate-proxy v0.2.0 h1:y8Yozv7SZtlU//QXbezB6QkpuE6jMD2/gfzk4AftXjs=
+github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
@@ -311,6 +315,8 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/urfave/cli/v2 v2.16.3 h1:gHoFIwpPjoyIMbJp/VFd+/vuD0dAgFK4B6DpEMFJfQk=
github.com/urfave/cli/v2 v2.16.3/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
+github.com/urfave/cli/v2 v2.17.1 h1:UzjDEw2dJQUE3iRaiNQ1VrVFbyAtKGH3VdkMoHA58V0=
+github.com/urfave/cli/v2 v2.17.1/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -417,6 +423,8 @@ golang.org/x/net v0.0.0-20220708220712-1185a9018129/go.mod h1:XRhObCWvk6IyKnWLug
golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/net v0.0.0-20220927155233-aa73b2587036 h1:GDWXwjBkdo4XMin5T4iul98eH4BfGOR7TucJ057FxjY=
golang.org/x/net v0.0.0-20220927155233-aa73b2587036/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20220930213112-107f3e3c3b0b h1:uKO3Js8lXGjpjdc4J3rqs0/Ex5yDKUGfk43tTYWVLas=
+golang.org/x/net v0.0.0-20220930213112-107f3e3c3b0b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -456,6 +464,8 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 h1:ZrnxWX62AgTKOSagEqxvb3ffipvEDX2pl7E1TdqLqIc=
golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 h1:cu5kTvlzcw1Q5S9f5ip1/cpiB4nXvw1XYzFPGgzLUOY=
+golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -522,6 +532,8 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25 h1:nwzwVf0l2Y/lkov/+IYgMMbFyI+QypZDds9RxlSmsFQ=
golang.org/x/sys v0.0.0-20220926163933-8cfa568d3c25/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
+golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.0.0-20220919170432-7a66f970e087 h1:tPwmk4vmvVCMdr98VgL4JH+qZxPL8fqlUOHnyOM8N3w=
@@ -653,6 +665,8 @@ google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaE
google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
google.golang.org/api v0.97.0 h1:x/vEL1XDF/2V4xzdNgFPaKHluRESo2aTsL7QzHnBtGQ=
google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
+google.golang.org/api v0.98.0 h1:yxZrcxXESimy6r6mdL5Q6EnZwmewDJK2dVg3g75s5Dg=
+google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -769,6 +783,8 @@ google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+S
google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw=
google.golang.org/genproto v0.0.0-20220927151529-dcaddaf36704 h1:H1AcWFV69NFCMeBJ8nVLtv8uHZZ5Ozcgoq012hHEFuU=
google.golang.org/genproto v0.0.0-20220927151529-dcaddaf36704/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
+google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91 h1:Ezh2cpcnP5Rq60sLensUsFnxh7P6513NLvNtCm9iyJ4=
+google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
diff --git a/server/actions.go b/server/actions.go
index dc8ad970..80065873 100644
--- a/server/actions.go
+++ b/server/actions.go
@@ -60,13 +60,13 @@ func parseActions(s string) (actions []*action, err error) {
return nil, fmt.Errorf("only %d actions allowed", actionsMax)
}
for _, action := range actions {
- if !util.InStringList(actionsAll, action.Action) {
+ if !util.Contains(actionsAll, action.Action) {
return nil, fmt.Errorf("parameter 'action' cannot be '%s', valid values are 'view', 'broadcast' and 'http'", action.Action)
} else if action.Label == "" {
return nil, fmt.Errorf("parameter 'label' is required")
- } else if util.InStringList(actionsWithURL, action.Action) && action.URL == "" {
+ } else if util.Contains(actionsWithURL, action.Action) && action.URL == "" {
return nil, fmt.Errorf("parameter 'url' is required for action '%s'", action.Action)
- } else if action.Action == actionHTTP && util.InStringList([]string{"GET", "HEAD"}, action.Method) && action.Body != "" {
+ } else if action.Action == actionHTTP && util.Contains([]string{"GET", "HEAD"}, action.Method) && action.Body != "" {
return nil, fmt.Errorf("parameter 'body' cannot be set if method is %s", action.Method)
}
}
@@ -156,7 +156,7 @@ func populateAction(newAction *action, section int, key, value string) error {
key = "action"
} else if key == "" && section == 1 {
key = "label"
- } else if key == "" && section == 2 && util.InStringList(actionsWithURL, newAction.Action) {
+ } else if key == "" && section == 2 && util.Contains(actionsWithURL, newAction.Action) {
key = "url"
}
@@ -178,7 +178,7 @@ func populateAction(newAction *action, section int, key, value string) error {
newAction.Label = value
case "clear":
lvalue := strings.ToLower(value)
- if !util.InStringList([]string{"true", "yes", "1", "false", "no", "0"}, lvalue) {
+ if !util.Contains([]string{"true", "yes", "1", "false", "no", "0"}, lvalue) {
return fmt.Errorf("parameter 'clear' cannot be '%s', only boolean values are allowed (true/yes/1/false/no/0)", value)
}
newAction.Clear = lvalue == "true" || lvalue == "yes" || lvalue == "1"
diff --git a/server/server.go b/server/server.go
index 60261693..276e56fa 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1088,7 +1088,7 @@ func (s *Server) topicsFromIDs(ids ...string) ([]*topic, error) {
defer s.mu.Unlock()
topics := make([]*topic, 0)
for _, id := range ids {
- if util.InStringList(disallowedTopics, id) {
+ if util.Contains(disallowedTopics, id) {
return nil, errHTTPBadRequestTopicDisallowed
}
if _, ok := s.topics[id]; !ok {
@@ -1286,7 +1286,7 @@ func (s *Server) sendDelayedMessage(v *visitor, m *message) error {
func (s *Server) limitRequests(next handleFunc) handleFunc {
return func(w http.ResponseWriter, r *http.Request, v *visitor) error {
- if util.InStringList(s.config.VisitorRequestExemptIPAddrs, v.ip) {
+ if util.Contains(s.config.VisitorRequestExemptIPAddrs, v.ip) {
return next(w, r, v)
} else if err := v.RequestAllowed(); err != nil {
return errHTTPTooManyRequestsLimitRequests
diff --git a/server/smtp_sender.go b/server/smtp_sender.go
index 1ccaf084..ecefd9c2 100644
--- a/server/smtp_sender.go
+++ b/server/smtp_sender.go
@@ -137,7 +137,7 @@ func toEmojis(tags []string) (emojisOut []string, tagsOut []string, err error) {
nextTag:
for _, t := range tags { // TODO Super inefficient; we should just create a .json file with a map
for _, e := range emojis {
- if util.InStringList(e.Aliases, t) {
+ if util.Contains(e.Aliases, t) {
emojisOut = append(emojisOut, e.Emoji)
continue nextTag
}
diff --git a/server/types.go b/server/types.go
index b502dcd7..b217b9db 100644
--- a/server/types.go
+++ b/server/types.go
@@ -203,10 +203,10 @@ func (q *queryFilter) Pass(msg *message) bool {
if messagePriority == 0 {
messagePriority = 3 // For query filters, default priority (3) is the same as "not set" (0)
}
- if len(q.Priority) > 0 && !util.InIntList(q.Priority, messagePriority) {
+ if len(q.Priority) > 0 && !util.Contains(q.Priority, messagePriority) {
return false
}
- if len(q.Tags) > 0 && !util.InStringListAll(msg.Tags, q.Tags) {
+ if len(q.Tags) > 0 && !util.ContainsAll(msg.Tags, q.Tags) {
return false
}
return true
diff --git a/util/util.go b/util/util.go
index 6c7fab69..3f65c8b7 100644
--- a/util/util.go
+++ b/util/util.go
@@ -35,8 +35,8 @@ func FileExists(filename string) bool {
return stat != nil
}
-// InStringList returns true if needle is contained in haystack
-func InStringList(haystack []string, needle string) bool {
+// Contains returns true if needle is contained in haystack
+func Contains[T comparable](haystack []T, needle T) bool {
for _, s := range haystack {
if s == needle {
return true
@@ -45,8 +45,8 @@ func InStringList(haystack []string, needle string) bool {
return false
}
-// InStringListAll returns true if all needles are contained in haystack
-func InStringListAll(haystack []string, needles []string) bool {
+// ContainsAll returns true if all needles are contained in haystack
+func ContainsAll[T comparable](haystack []T, needles []T) bool {
matches := 0
for _, s := range haystack {
for _, needle := range needles {
@@ -58,16 +58,6 @@ func InStringListAll(haystack []string, needles []string) bool {
return matches == len(needles)
}
-// InIntList returns true if needle is contained in haystack
-func InIntList(haystack []int, needle int) bool {
- for _, s := range haystack {
- if s == needle {
- return true
- }
- }
- return false
-}
-
// SplitNoEmpty splits a string using strings.Split, but filters out empty strings
func SplitNoEmpty(s string, sep string) []string {
res := make([]string, 0)
diff --git a/util/util_test.go b/util/util_test.go
index 58abe429..807d5997 100644
--- a/util/util_test.go
+++ b/util/util_test.go
@@ -26,20 +26,20 @@ func TestFileExists(t *testing.T) {
func TestInStringList(t *testing.T) {
s := []string{"one", "two"}
- require.True(t, InStringList(s, "two"))
- require.False(t, InStringList(s, "three"))
+ require.True(t, Contains(s, "two"))
+ require.False(t, Contains(s, "three"))
}
func TestInStringListAll(t *testing.T) {
s := []string{"one", "two", "three", "four"}
- require.True(t, InStringListAll(s, []string{"two", "four"}))
- require.False(t, InStringListAll(s, []string{"three", "five"}))
+ require.True(t, ContainsAll(s, []string{"two", "four"}))
+ require.False(t, ContainsAll(s, []string{"three", "five"}))
}
-func TestInIntList(t *testing.T) {
+func TestContains(t *testing.T) {
s := []int{1, 2}
- require.True(t, InIntList(s, 2))
- require.False(t, InIntList(s, 3))
+ require.True(t, Contains(s, 2))
+ require.False(t, Contains(s, 3))
}
func TestSplitNoEmpty(t *testing.T) {
From eaf3e83e721a43ab19768b11d43bc0e7ae8a0e5c Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sat, 1 Oct 2022 15:58:39 -0400
Subject: [PATCH 62/63] Bump release log
---
docs/releases.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/docs/releases.md b/docs/releases.md
index bc63ae22..0e50d485 100644
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -4,9 +4,10 @@ and the [ntfy Android app](https://github.com/binwiederhier/ntfy-android/release
## ntfy server v1.29.0 (UNRELEASED)
-**Bug fixes:**
+**Bug fixes + maintenance:**
* Subscriptions can now have a display name ([#370](https://github.com/binwiederhier/ntfy/issues/370), thanks to [@tfheen](https://github.com/tfheen) for reporting)
+* Bump Go version to Go 18.x ([#422](https://github.com/binwiederhier/ntfy/issues/422))
**Documentation:**
From 5014bba0b35350c4d68241da346a5fbb188dc499 Mon Sep 17 00:00:00 2001
From: Philipp Heckel <pheckel@datto.com>
Date: Sat, 1 Oct 2022 16:31:48 -0400
Subject: [PATCH 63/63] Replace interface{}
---
cmd/config_loader.go | 2 +-
log/log.go | 14 +++++++-------
server/errors.go | 2 +-
server/server_firebase.go | 4 ++--
server/server_firebase_test.go | 8 ++++----
util/gzip_handler.go | 2 +-
util/util.go | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/cmd/config_loader.go b/cmd/config_loader.go
index 6d984840..9f0a5769 100644
--- a/cmd/config_loader.go
+++ b/cmd/config_loader.go
@@ -40,7 +40,7 @@ func initConfigFileInputSourceFunc(configFlag string, flags []cli.Flag, next cli
// This function also maps aliases, so a .yml file can contain short options, or options with underscores
// instead of dashes. See https://github.com/binwiederhier/ntfy/issues/255.
func newYamlSourceFromFile(file string, flags []cli.Flag) (altsrc.InputSourceContext, error) {
- var rawConfig map[interface{}]interface{}
+ var rawConfig map[any]any
b, err := os.ReadFile(file)
if err != nil {
return nil, err
diff --git a/log/log.go b/log/log.go
index 5dac2327..4061921d 100644
--- a/log/log.go
+++ b/log/log.go
@@ -40,32 +40,32 @@ var (
)
// Trace prints the given message, if the current log level is TRACE
-func Trace(message string, v ...interface{}) {
+func Trace(message string, v ...any) {
logIf(TraceLevel, message, v...)
}
// Debug prints the given message, if the current log level is DEBUG or lower
-func Debug(message string, v ...interface{}) {
+func Debug(message string, v ...any) {
logIf(DebugLevel, message, v...)
}
// Info prints the given message, if the current log level is INFO or lower
-func Info(message string, v ...interface{}) {
+func Info(message string, v ...any) {
logIf(InfoLevel, message, v...)
}
// Warn prints the given message, if the current log level is WARN or lower
-func Warn(message string, v ...interface{}) {
+func Warn(message string, v ...any) {
logIf(WarnLevel, message, v...)
}
// Error prints the given message, if the current log level is ERROR or lower
-func Error(message string, v ...interface{}) {
+func Error(message string, v ...any) {
logIf(ErrorLevel, message, v...)
}
// Fatal prints the given message, and exits the program
-func Fatal(v ...interface{}) {
+func Fatal(v ...any) {
log.Fatalln(v...)
}
@@ -122,7 +122,7 @@ func IsDebug() bool {
return Loggable(DebugLevel)
}
-func logIf(l Level, message string, v ...interface{}) {
+func logIf(l Level, message string, v ...any) {
if CurrentLevel() <= l {
log.Printf(l.String()+" "+message, v...)
}
diff --git a/server/errors.go b/server/errors.go
index 460138a7..63dffeef 100644
--- a/server/errors.go
+++ b/server/errors.go
@@ -23,7 +23,7 @@ func (e errHTTP) JSON() string {
return string(b)
}
-func wrapErrHTTP(err *errHTTP, message string, args ...interface{}) *errHTTP {
+func wrapErrHTTP(err *errHTTP, message string, args ...any) *errHTTP {
return &errHTTP{
Code: err.Code,
HTTPCode: err.HTTPCode,
diff --git a/server/server_firebase.go b/server/server_firebase.go
index 15d78952..ab9d7fad 100644
--- a/server/server_firebase.go
+++ b/server/server_firebase.go
@@ -217,7 +217,7 @@ func maybeTruncateFCMMessage(m *messaging.Message) *messaging.Message {
// We must set the Alert struct ("alert"), and we need to set MutableContent ("mutable-content"), so the Notification Service
// Extension in iOS can modify the message.
func createAPNSAlertConfig(m *message, data map[string]string) *messaging.APNSConfig {
- apnsData := make(map[string]interface{})
+ apnsData := make(map[string]any)
for k, v := range data {
apnsData[k] = v
}
@@ -241,7 +241,7 @@ func createAPNSAlertConfig(m *message, data map[string]string) *messaging.APNSCo
//
// See https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/pushing_background_updates_to_your_app
func createAPNSBackgroundConfig(data map[string]string) *messaging.APNSConfig {
- apnsData := make(map[string]interface{})
+ apnsData := make(map[string]any)
for k, v := range data {
apnsData[k] = v
}
diff --git a/server/server_firebase_test.go b/server/server_firebase_test.go
index 8d898db1..3e034c06 100644
--- a/server/server_firebase_test.go
+++ b/server/server_firebase_test.go
@@ -71,7 +71,7 @@ func TestToFirebaseMessage_Keepalive(t *testing.T) {
Aps: &messaging.Aps{
ContentAvailable: true,
},
- CustomData: map[string]interface{}{
+ CustomData: map[string]any{
"id": m.ID,
"time": fmt.Sprintf("%d", m.Time),
"event": m.Event,
@@ -102,7 +102,7 @@ func TestToFirebaseMessage_Open(t *testing.T) {
Aps: &messaging.Aps{
ContentAvailable: true,
},
- CustomData: map[string]interface{}{
+ CustomData: map[string]any{
"id": m.ID,
"time": fmt.Sprintf("%d", m.Time),
"event": m.Event,
@@ -166,7 +166,7 @@ func TestToFirebaseMessage_Message_Normal_Allowed(t *testing.T) {
Body: "this is a message",
},
},
- CustomData: map[string]interface{}{
+ CustomData: map[string]any{
"id": m.ID,
"time": fmt.Sprintf("%d", m.Time),
"event": "message",
@@ -242,7 +242,7 @@ func TestToFirebaseMessage_PollRequest(t *testing.T) {
Body: "New message",
},
},
- CustomData: map[string]interface{}{
+ CustomData: map[string]any{
"id": m.ID,
"time": fmt.Sprintf("%d", m.Time),
"event": "poll_request",
diff --git a/util/gzip_handler.go b/util/gzip_handler.go
index 637077c7..9b30fa8a 100644
--- a/util/gzip_handler.go
+++ b/util/gzip_handler.go
@@ -30,7 +30,7 @@ func Gzip(next http.Handler) http.Handler {
}
var gzPool = sync.Pool{
- New: func() interface{} {
+ New: func() any {
w := gzip.NewWriter(io.Discard)
return w
},
diff --git a/util/util.go b/util/util.go
index 3f65c8b7..05079180 100644
--- a/util/util.go
+++ b/util/util.go
@@ -241,7 +241,7 @@ func BasicAuth(user, pass string) string {
// MaybeMarshalJSON returns a JSON string of the given object, or "<cannot serialize>" if serialization failed.
// This is useful for logging purposes where a failure doesn't matter that much.
-func MaybeMarshalJSON(v interface{}) string {
+func MaybeMarshalJSON(v any) string {
jsonBytes, err := json.MarshalIndent(v, "", " ")
if err != nil {
return "<cannot serialize>"