From c9df4e5cb9802a015fcd3a5e7371222a0be1d22f Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Oct 2022 09:06:07 +0100 Subject: [PATCH 001/387] Update BB logo to black --- packages/builder/assets/bb-emblem.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/assets/bb-emblem.svg b/packages/builder/assets/bb-emblem.svg index 9f4f3690d5..7d499e4862 100644 --- a/packages/builder/assets/bb-emblem.svg +++ b/packages/builder/assets/bb-emblem.svg @@ -3,7 +3,7 @@ From d016ee9775836f4d348d10a83b89a27e7897b056 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Oct 2022 09:06:14 +0100 Subject: [PATCH 002/387] Update top nav bar and core layout --- .../src/pages/builder/portal/_layout.svelte | 146 ++++++++---------- 1 file changed, 67 insertions(+), 79 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index cf9cd55b19..0bb2c0f21c 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -3,16 +3,14 @@ import { Icon, Avatar, - Layout, - SideNavigation as Navigation, - SideNavigationItem as Item, ActionMenu, MenuItem, Modal, - clickOutside, notifications, + Tabs, + Tab, + Button, } from "@budibase/bbui" - import ConfigChecklist from "components/common/ConfigChecklist.svelte" import { organisation, auth, admin as adminStore } from "stores/portal" import { onMount } from "svelte" import UpdateUserInfoModal from "components/settings/UpdateUserInfoModal.svelte" @@ -26,6 +24,7 @@ let changePasswordModal let apiKeyModal let mobileMenuVisible = false + let activeTab = "Apps" $: menu = buildMenu($auth.isAdmin) @@ -122,12 +121,6 @@ badge: "New", }, ]) - } else if (!$adminStore.cloud && admin) { - menu = menu.concat({ - title: "Upgrade", - href: "/builder/portal/settings/upgrade", - badge: "New", - }) } // show the billing page to licensed account holders in cloud @@ -173,42 +166,28 @@ loaded = true } } + + // Find selected tab + for (let entry of menu) { + if ($isActive(entry.href)) { + activeTab = entry.title + break + } + } }) {#if $auth.user && loaded}
-
- -
-
$goto("./apps")}> - Logotype - {$organisation?.company || "Budibase"} -
-
- -
-
-
- - {#each menu as { title, href, heading, badge }} - {title} - {/each} - -
- -
-
+
+
$goto("./apps")}> + Logotype +
+ + {#each menu as { title, href }} + $goto(href)} /> + {/each} +
@@ -219,11 +198,20 @@ alt={$organisation?.company || "Budibase"} />
+ {#if !$adminStore.cloud && $auth.isAdmin} + + {/if}
@@ -256,6 +244,8 @@
+
+
@@ -276,79 +266,77 @@ .container { height: 100%; display: flex; - flex-direction: row; + flex-direction: column; justify-content: flex-start; align-items: stretch; } .nav { background: var(--background); - border-right: var(--border-light); - overflow: auto; - flex: 0 0 auto; - width: 250px; + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: stretch; + border-bottom: var(--border-light); + padding: 0 20px; + gap: 24px; } - .main { - flex: 1 1 auto; - display: grid; - grid-template-rows: auto 1fr; - overflow: hidden; + .nav :global(.spectrum-Tabs) { + margin-bottom: -2px; + padding: 7px 0; + } + .nav :global(.spectrum-Tabs-itemLabel) { + color: #d0d0d0; + } + .nav :global(.spectrum-Tabs-item.is-selected .spectrum-Tabs-itemLabel) { + color: #ffffff; } .branding { display: grid; - grid-gap: var(--spacing-s); - grid-template-columns: auto auto; - justify-content: space-between; - align-items: center; - } - .name { - display: grid; - grid-template-columns: auto auto; - grid-gap: var(--spacing-m); - align-items: center; - } - .name:hover { - cursor: pointer; + place-items: center; } .avatar { display: grid; grid-template-columns: auto auto; place-items: center; - grid-gap: var(--spacing-xs); + grid-gap: var(--spacing-s); } .avatar:hover { cursor: pointer; filter: brightness(110%); } .toolbar { - background: var(--background); - border-bottom: var(--border-light); + flex: 1 1 auto; display: flex; flex-direction: row; - justify-content: space-between; + justify-content: flex-end; align-items: center; - padding: var(--spacing-m) calc(var(--spacing-xl) * 2); + gap: 24px; } .mobile-toggle, .mobile-logo { display: none; } .user-dropdown { - flex: 1 1 auto; display: flex; flex-direction: row; justify-content: flex-end; } img { - width: 28px; - height: 28px; + width: 30px; + height: 30px; } - span { - overflow: hidden; - text-overflow: ellipsis; - font-weight: 600; + + .main { + flex: 1 1 auto; + display: flex; + flex-direction: row; + justify-content: center; + align-items: stretch; + overflow: auto; + padding: 50px; } .content { - overflow: auto; + max-width: 1080px; } @media (max-width: 640px) { From 0cdc814bcc1ccec46bc03f8cd291b733f94e96c0 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 27 Oct 2022 19:20:55 +0100 Subject: [PATCH 003/387] Add redesign for apps pages --- packages/bbui/src/Layout/Page.svelte | 6 +- .../src/components/common/AppLockModal.svelte | 14 +- .../components/common/TemplateDisplay.svelte | 190 ++++++++---------- .../components/portal/page/Breadcrumb.svelte | 34 ++++ .../components/portal/page/Breadcrumbs.svelte | 20 ++ .../src/components/portal/page/Content.svelte | 27 +++ .../src/components/portal/page/Header.svelte | 31 +++ .../src/components/portal/page/SideNav.svelte | 25 +++ .../components/portal/page/SideNavItem.svelte | 23 +++ .../src/components/portal/page/index.js | 6 + .../src/components/start/AppRow.svelte | 143 +++++++------ .../src/pages/builder/portal/_layout.svelte | 9 +- .../pages/builder/portal/apps/_layout.svelte | 33 +++ .../pages/builder/portal/apps/create.svelte | 118 +++-------- .../pages/builder/portal/apps/index.svelte | 186 ++++------------- .../builder/portal/apps/templates.svelte | 46 +---- 16 files changed, 466 insertions(+), 445 deletions(-) create mode 100644 packages/builder/src/components/portal/page/Breadcrumb.svelte create mode 100644 packages/builder/src/components/portal/page/Breadcrumbs.svelte create mode 100644 packages/builder/src/components/portal/page/Content.svelte create mode 100644 packages/builder/src/components/portal/page/Header.svelte create mode 100644 packages/builder/src/components/portal/page/SideNav.svelte create mode 100644 packages/builder/src/components/portal/page/SideNavItem.svelte create mode 100644 packages/builder/src/components/portal/page/index.js create mode 100644 packages/builder/src/pages/builder/portal/apps/_layout.svelte diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte index 2996bcc613..de497f396e 100644 --- a/packages/bbui/src/Layout/Page.svelte +++ b/packages/bbui/src/Layout/Page.svelte @@ -1,6 +1,6 @@ @@ -16,8 +16,8 @@ align-items: stretch; max-width: var(--max-width); margin: 0 auto; - padding: calc(var(--spacing-xl) * 2); - min-height: calc(100% - var(--spacing-xl) * 4); + flex: 1 1 auto; + padding-bottom: 50px; } .wide { diff --git a/packages/builder/src/components/common/AppLockModal.svelte b/packages/builder/src/components/common/AppLockModal.svelte index 9794e350d9..4a708fbd83 100644 --- a/packages/builder/src/components/common/AppLockModal.svelte +++ b/packages/builder/src/components/common/AppLockModal.svelte @@ -8,6 +8,7 @@ ProgressCircle, Layout, Body, + Icon, } from "@budibase/bbui" import { auth, apps } from "stores/portal" import { processStringSync } from "@budibase/string-templates" @@ -58,19 +59,14 @@
{#if lockedBy} - + /> {/if}
diff --git a/packages/builder/src/components/common/TemplateDisplay.svelte b/packages/builder/src/components/common/TemplateDisplay.svelte index d6ba4bd8e7..66da437118 100644 --- a/packages/builder/src/components/common/TemplateDisplay.svelte +++ b/packages/builder/src/components/common/TemplateDisplay.svelte @@ -1,128 +1,110 @@ -
- - Templates -
- - { - selectedTemplateCategory = null - }} - > - All - - {#each templateCategories as templateCategoryKey} - { - selectedTemplateCategory = templateCategoryKey - }} - > - {templateCategoryKey} - - {/each} - -
- -
- -
- - {#each filteredTemplateCategories as templateCategoryKey} -
- {templateCategoryKey} -
- {#each filteredTemplates[templateCategoryKey] as templateEntry} - - {#if !($licensing?.usageMetrics?.apps >= 100)} - - {/if} - +
+ + (selectedCategory = null)} + text="All" + active={selectedCategory == null} + /> + {#each categories as category} + (selectedCategory = category.name)} + text={category.name} + active={selectedCategory === category.name} + /> + {/each} + +
+
+ + {#each filteredCategories as category} +
+ {category.name} +
+ {#each category.templates as templateEntry} + - Details - - - {/each} + {#if !($licensing?.usageMetrics?.apps >= 100)} + + {/if} + + Details + + + {/each} +
-
- {/each} - -
+ {/each} + +
+ + import { Icon } from "@budibase/bbui" + + export let url + export let text + + + + + diff --git a/packages/builder/src/components/portal/page/Breadcrumbs.svelte b/packages/builder/src/components/portal/page/Breadcrumbs.svelte new file mode 100644 index 0000000000..6fa311f0f7 --- /dev/null +++ b/packages/builder/src/components/portal/page/Breadcrumbs.svelte @@ -0,0 +1,20 @@ +
+ +
+ + diff --git a/packages/builder/src/components/portal/page/Content.svelte b/packages/builder/src/components/portal/page/Content.svelte new file mode 100644 index 0000000000..365ddd40fa --- /dev/null +++ b/packages/builder/src/components/portal/page/Content.svelte @@ -0,0 +1,27 @@ + + +
+
+ +
+
+ +
+
+ + diff --git a/packages/builder/src/components/portal/page/Header.svelte b/packages/builder/src/components/portal/page/Header.svelte new file mode 100644 index 0000000000..72515af8a6 --- /dev/null +++ b/packages/builder/src/components/portal/page/Header.svelte @@ -0,0 +1,31 @@ + + +
+ {title} +
+ +
+
+ + diff --git a/packages/builder/src/components/portal/page/SideNav.svelte b/packages/builder/src/components/portal/page/SideNav.svelte new file mode 100644 index 0000000000..01097f9c3a --- /dev/null +++ b/packages/builder/src/components/portal/page/SideNav.svelte @@ -0,0 +1,25 @@ + + +
+ {#if title} +
{title}
+ {/if} + +
+ + diff --git a/packages/builder/src/components/portal/page/SideNavItem.svelte b/packages/builder/src/components/portal/page/SideNavItem.svelte new file mode 100644 index 0000000000..66c7ce101d --- /dev/null +++ b/packages/builder/src/components/portal/page/SideNavItem.svelte @@ -0,0 +1,23 @@ + + + + {text} + + + diff --git a/packages/builder/src/components/portal/page/index.js b/packages/builder/src/components/portal/page/index.js new file mode 100644 index 0000000000..05caf565dc --- /dev/null +++ b/packages/builder/src/components/portal/page/index.js @@ -0,0 +1,6 @@ +export { default as Breadcrumb } from "./Breadcrumb.svelte" +export { default as Breadcrumbs } from "./Breadcrumbs.svelte" +export { default as Header } from "./Header.svelte" +export { default as Content } from "./Content.svelte" +export { default as SideNavItem } from "./SideNavItem.svelte" +export { default as SideNav } from "./SideNav.svelte" diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index eee8aa19b2..c741fe6749 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -1,5 +1,5 @@ -
-
-
- +
+
+
+
+ +
+
editApp(app)}> + + {app.name} + +
-
editApp(app)}> - - {app.name} - + +
+ {#if app.updatedAt} + {processStringSync("Updated {{ duration time 'millisecond' }} ago", { + time: new Date().getTime() - new Date(app.updatedAt).getTime(), + })} + {:else} + Never updated + {/if}
-
-
- {#if app.updatedAt} - {processStringSync("Updated {{ duration time 'millisecond' }} ago", { - time: new Date().getTime() - new Date(app.updatedAt).getTime(), - })} - {:else} - Never updated - {/if} -
-
- -
-
-
- {#if app.deployed} - - Published - {:else} - - Unpublished - {/if} + +
+ + {`${window.origin}/app${app.url}`}
-
-
-
- - + +
+
+ + + +
diff --git a/packages/builder/src/components/portal/page/SideNavItem.svelte b/packages/builder/src/components/portal/page/SideNavItem.svelte index 66c7ce101d..b31afb683f 100644 --- a/packages/builder/src/components/portal/page/SideNavItem.svelte +++ b/packages/builder/src/components/portal/page/SideNavItem.svelte @@ -4,7 +4,7 @@ export let active = false - + {text} diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 52f2b8e8ee..9c2aa8da33 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -40,16 +40,8 @@ menu = menu.concat([ { title: "Users", - href: "/builder/portal/manage/users", - heading: "Manage", + href: "/builder/portal/users/users", }, - isEnabled(TENANT_FEATURE_FLAGS.USER_GROUPS) - ? { - title: "User Groups", - href: "/builder/portal/manage/groups", - badge: "New", - } - : undefined, { title: "Auth", href: "/builder/portal/manage/auth" }, { title: "Email", href: "/builder/portal/manage/email" }, { diff --git a/packages/builder/src/pages/builder/portal/manage/groups/_layout.svelte b/packages/builder/src/pages/builder/portal/manage/groups/_layout.svelte deleted file mode 100644 index a13211a9bb..0000000000 --- a/packages/builder/src/pages/builder/portal/manage/groups/_layout.svelte +++ /dev/null @@ -1,3 +0,0 @@ -
- -
diff --git a/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte b/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte index b121e04c7b..37c45e7854 100644 --- a/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte +++ b/packages/builder/src/pages/builder/portal/overview/_components/OverviewTab.svelte @@ -9,7 +9,7 @@ import { createEventDispatcher } from "svelte" import { fetchData } from "@budibase/frontend-core" import { API } from "api" - import GroupIcon from "../../manage/groups/_components/GroupIcon.svelte" + import GroupIcon from "../../users/groups/_components/GroupIcon.svelte" export let app export let deployments diff --git a/packages/builder/src/pages/builder/portal/users/_layout.svelte b/packages/builder/src/pages/builder/portal/users/_layout.svelte new file mode 100644 index 0000000000..944e0396b5 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/users/_layout.svelte @@ -0,0 +1,30 @@ + + + + +
+ + + + + + +
+ + + diff --git a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte similarity index 67% rename from packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte rename to packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte index 5e8fb0d170..0528b34843 100644 --- a/packages/builder/src/pages/builder/portal/manage/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -1,7 +1,6 @@ diff --git a/packages/builder/src/components/portal/page/SideNav.svelte b/packages/builder/src/components/portal/page/SideNav.svelte index 01097f9c3a..fdd54b2182 100644 --- a/packages/builder/src/components/portal/page/SideNav.svelte +++ b/packages/builder/src/components/portal/page/SideNav.svelte @@ -15,6 +15,7 @@ flex-direction: column; justify-content: flex-start; align-items: stretch; + gap: 4px; } .title { margin-left: var(--spacing-m); diff --git a/packages/builder/src/components/settings/UpdateAPIKeyModal.svelte b/packages/builder/src/components/settings/UpdateAPIKeyModal.svelte deleted file mode 100644 index 4322822ec8..0000000000 --- a/packages/builder/src/components/settings/UpdateAPIKeyModal.svelte +++ /dev/null @@ -1,41 +0,0 @@ - - - - - You can find information about your developer account here, such as the API - key used to access the Budibase API. - - - diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index c741fe6749..7d350b0973 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -11,8 +11,12 @@
-
- +
+
editApp(app)}> @@ -96,7 +100,7 @@ .app-status:not(.deployed) :global(.spectrum-Icon), .app-status:not(.deployed) :global(.spectrum-Body) { - color: var(--spectrum-global-color-gray-700); + color: var(--spectrum-global-color-gray-600); } .app-row-actions { diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte index d175edabad..4b2c336f6c 100644 --- a/packages/builder/src/pages/builder/apps/index.svelte +++ b/packages/builder/src/pages/builder/apps/index.svelte @@ -89,7 +89,7 @@ {#if $auth.user && loaded}
- +
@@ -196,6 +196,11 @@ .container { height: 100%; overflow: auto; + display: flex; + flex-direction: column; + justify-content: flex-start; + align-items: center; + padding: 80px; } .content { width: 100%; diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 9c2aa8da33..b98c21105c 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -15,14 +15,12 @@ import { onMount } from "svelte" import UpdateUserInfoModal from "components/settings/UpdateUserInfoModal.svelte" import ChangePasswordModal from "components/settings/ChangePasswordModal.svelte" - import UpdateAPIKeyModal from "components/settings/UpdateAPIKeyModal.svelte" import Logo from "assets/bb-emblem.svg" import { isEnabled, TENANT_FEATURE_FLAGS } from "helpers/featureFlags" let loaded = false let userInfoModal let changePasswordModal - let apiKeyModal let mobileMenuVisible = false let activeTab = "Apps" @@ -42,92 +40,79 @@ title: "Users", href: "/builder/portal/users/users", }, - { title: "Auth", href: "/builder/portal/manage/auth" }, - { title: "Email", href: "/builder/portal/manage/email" }, { title: "Plugins", - href: "/builder/portal/manage/plugins", + href: "/builder/portal/plugins", badge: "New", }, - { - title: "Organisation", - href: "/builder/portal/settings/organisation", - heading: "Settings", + title: "Usage", + href: "/builder/portal/usage", }, { - title: "Theming", - href: "/builder/portal/settings/theming", - }, - ]) - - if (!$adminStore.cloud) { - menu = menu.concat([ - { - title: "Update", - href: "/builder/portal/settings/update", - }, - ]) - } - } else { - menu = menu.concat([ - { - title: "Theming", - href: "/builder/portal/settings/theming", - heading: "Settings", + title: "Settings", + href: "/builder/portal/settings", }, ]) + // if (!$adminStore.cloud) { + // menu = menu.concat([ + // { + // title: "Update", + // href: "/builder/portal/settings/update", + // }, + // ]) + // } } // add link to account portal if the user has access let accountSectionAdded = false // link out to account-portal if account holder in cloud or always in self-host - if ($auth?.user?.accountPortalAccess || (!$adminStore.cloud && admin)) { - accountSectionAdded = true - menu = menu.concat([ - { - title: "Account", - href: $adminStore.accountPortalUrl, - heading: "Account", - }, - ]) - } - - if (isEnabled(TENANT_FEATURE_FLAGS.LICENSING)) { - // always show usage in self-host or cloud if licensing enabled - menu = menu.concat([ - { - title: "Usage", - href: "/builder/portal/settings/usage", - heading: accountSectionAdded ? "" : "Account", - }, - ]) - - // show the relevant hosting upgrade page - if ($adminStore.cloud && $auth?.user?.accountPortalAccess) { - menu = menu.concat([ - { - title: "Upgrade", - href: $adminStore.accountPortalUrl + "/portal/upgrade", - badge: "New", - }, - ]) - } - - // show the billing page to licensed account holders in cloud - if ( - $auth?.user?.accountPortalAccess && - $auth.user.account.stripeCustomerId - ) { - menu = menu.concat([ - { - title: "Billing", - href: $adminStore.accountPortalUrl + "/portal/billing", - }, - ]) - } - } + // if ($auth?.user?.accountPortalAccess || (!$adminStore.cloud && admin)) { + // accountSectionAdded = true + // menu = menu.concat([ + // { + // title: "Account", + // href: $adminStore.accountPortalUrl, + // heading: "Account", + // }, + // ]) + // } + // + // if (isEnabled(TENANT_FEATURE_FLAGS.LICENSING)) { + // // always show usage in self-host or cloud if licensing enabled + // menu = menu.concat([ + // { + // title: "Usage", + // href: "/builder/portal/settings/usage", + // heading: accountSectionAdded ? "" : "Account", + // }, + // ]) + // + // // show the relevant hosting upgrade page + // if ($adminStore.cloud && $auth?.user?.accountPortalAccess) { + // menu = menu.concat([ + // { + // title: "Upgrade", + // href: $adminStore.accountPortalUrl + "/portal/upgrade", + // badge: "New", + // }, + // ]) + // } + // + // // show the billing page to licensed account holders in cloud + // if ( + // $auth?.user?.accountPortalAccess && + // $auth.user.account.stripeCustomerId + // ) { + // menu = menu.concat([ + // { + // title: "Billing", + // href: $adminStore.accountPortalUrl + "/portal/billing", + // }, + // ]) + // } + // } menu = menu.filter(item => !!item) return menu @@ -216,11 +201,6 @@ > Update user information - {#if $auth.isBuilder} - apiKeyModal.show()}> - View API key - - {/if} changePasswordModal.show()} @@ -247,9 +227,6 @@ - - - {/if} diff --git a/packages/builder/src/pages/builder/portal/manage/auth/_logos/Google.svelte b/packages/builder/src/pages/builder/portal/settings/auth/_logos/Google.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/auth/_logos/Google.svelte rename to packages/builder/src/pages/builder/portal/settings/auth/_logos/Google.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/auth/_logos/OIDC.svelte b/packages/builder/src/pages/builder/portal/settings/auth/_logos/OIDC.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/auth/_logos/OIDC.svelte rename to packages/builder/src/pages/builder/portal/settings/auth/_logos/OIDC.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/auth/index.svelte rename to packages/builder/src/pages/builder/portal/settings/auth/index.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/email/[template].svelte b/packages/builder/src/pages/builder/portal/settings/email/[template].svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/email/[template].svelte rename to packages/builder/src/pages/builder/portal/settings/email/[template].svelte diff --git a/packages/builder/src/pages/builder/portal/manage/email/_components/TemplateBindings.svelte b/packages/builder/src/pages/builder/portal/settings/email/_components/TemplateBindings.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/email/_components/TemplateBindings.svelte rename to packages/builder/src/pages/builder/portal/settings/email/_components/TemplateBindings.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/email/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/email/_layout.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/email/_layout.svelte rename to packages/builder/src/pages/builder/portal/settings/email/_layout.svelte diff --git a/packages/builder/src/pages/builder/portal/manage/email/index.svelte b/packages/builder/src/pages/builder/portal/settings/email/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/email/index.svelte rename to packages/builder/src/pages/builder/portal/settings/email/index.svelte diff --git a/packages/builder/src/pages/builder/portal/settings/index.svelte b/packages/builder/src/pages/builder/portal/settings/index.svelte index 57825a095b..b7f09de51a 100644 --- a/packages/builder/src/pages/builder/portal/settings/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/index.svelte @@ -1,4 +1,4 @@ diff --git a/packages/builder/src/pages/builder/portal/settings/theming.svelte b/packages/builder/src/pages/builder/portal/settings/theme.svelte similarity index 90% rename from packages/builder/src/pages/builder/portal/settings/theming.svelte rename to packages/builder/src/pages/builder/portal/settings/theme.svelte index 815c0d2813..977dc80ed7 100644 --- a/packages/builder/src/pages/builder/portal/settings/theming.svelte +++ b/packages/builder/src/pages/builder/portal/settings/theme.svelte @@ -6,13 +6,13 @@ - Theming + Theme Customize how Budibase looks and feels.
- + x.key} /> + + diff --git a/packages/frontend-core/src/api/rows.js b/packages/frontend-core/src/api/rows.js index 3734310eed..41ba505d81 100644 --- a/packages/frontend-core/src/api/rows.js +++ b/packages/frontend-core/src/api/rows.js @@ -67,12 +67,13 @@ export const buildRowEndpoints = API => ({ * @param format the format to export (csv or json) * @param columns which columns to export (all if undefined) */ - exportRows: async ({ tableId, rows, format, columns }) => { + exportRows: async ({ tableId, rows, format, columns, search }) => { return await API.post({ url: `/api/${tableId}/rows/exportRows?format=${format}`, body: { rows, columns, + ...search, }, parseResponse: async response => { return await response.text() diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts index 83564564b8..77168b61c9 100644 --- a/packages/server/src/api/controllers/row/external.ts +++ b/packages/server/src/api/controllers/row/external.ts @@ -20,6 +20,8 @@ import { Datasource, } from "@budibase/types" +const { cleanExportRows } = require("../row/utils") + export async function handleRequest( operation: Operation, tableId: string, @@ -178,7 +180,7 @@ export async function validate(ctx: BBContext) { } export async function exportRows(ctx: BBContext) { - const { datasourceId } = breakExternalTableId(ctx.params.tableId) + const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId) const db = context.getAppDB() const format = ctx.query.format const { columns } = ctx.request.body @@ -186,20 +188,24 @@ export async function exportRows(ctx: BBContext) { if (!datasource || !datasource.entities) { ctx.throw(400, "Datasource has not been configured for plus API.") } - ctx.request.body = { - query: { - oneOf: { - _id: ctx.request.body.rows.map( - (row: string) => JSON.parse(decodeURI(row))[0] - ), + + if (ctx.request.body.rows) { + ctx.request.body = { + query: { + oneOf: { + _id: ctx.request.body.rows.map( + (row: string) => JSON.parse(decodeURI(row))[0] + ), + }, }, - }, + } } let result = await search(ctx) let rows: Row[] = [] // Filter data to only specified columns if required + if (columns && columns.length) { for (let i = 0; i < result.rows.length; i++) { rows[i] = {} @@ -211,14 +217,19 @@ export async function exportRows(ctx: BBContext) { rows = result.rows } - let headers = Object.keys(rows[0]) + // @ts-ignore + let schema = datasource.entities[tableName].schema + let exportRows = cleanExportRows(rows, schema, format, columns) + + let headers = Object.keys(schema) + // @ts-ignore const exporter = exporters[format] const filename = `export.${format}` // send down the file ctx.attachment(filename) - return apiFileReturn(exporter(headers, rows)) + return apiFileReturn(exporter(headers, exportRows)) } export async function fetchEnrichedRow(ctx: BBContext) { diff --git a/packages/server/src/api/controllers/row/internal.ts b/packages/server/src/api/controllers/row/internal.ts index ea3277cd59..03c410ff62 100644 --- a/packages/server/src/api/controllers/row/internal.ts +++ b/packages/server/src/api/controllers/row/internal.ts @@ -13,7 +13,7 @@ import { cleanupAttachments, } from "../../../utilities/rowProcessor" import { FieldTypes } from "../../../constants" -import { validate as rowValidate, findRow } from "./utils" +import { validate as rowValidate, findRow, cleanExportRows } from "./utils" import { fullSearch, paginatedSearch } from "./internalSearch" import { getGlobalUsersFromMetadata } from "../../../utilities/global" import * as inMemoryViews from "../../../db/inMemoryView" @@ -356,6 +356,14 @@ export async function search(ctx: BBContext) { params.version = ctx.version params.tableId = tableId + let table + if (params.sort && !params.sortType) { + table = await db.get(tableId) + const schema = table.schema + const sortField = schema[params.sort] + params.sortType = sortField.type == "number" ? "number" : "string" + } + let response if (paginate) { response = await paginatedSearch(query, params) @@ -369,7 +377,7 @@ export async function search(ctx: BBContext) { if (tableId === InternalTables.USER_METADATA) { response.rows = await getGlobalUsersFromMetadata(response.rows) } - const table = await db.get(tableId) + table = table || (await db.get(tableId)) response.rows = await outputProcessing(table, response.rows) } @@ -388,18 +396,27 @@ export async function exportRows(ctx: BBContext) { const table = await db.get(ctx.params.tableId) const rowIds = ctx.request.body.rows let format = ctx.query.format - const { columns } = ctx.request.body - let response = ( - await db.allDocs({ - include_docs: true, - keys: rowIds, - }) - ).rows.map(row => row.doc) + const { columns, query } = ctx.request.body + + let result + if (rowIds) { + let response = ( + await db.allDocs({ + include_docs: true, + keys: rowIds, + }) + ).rows.map(row => row.doc) + + result = await outputProcessing(table, response) + } else if (query) { + let searchResponse = await exports.search(ctx) + result = searchResponse.rows + } - let result = (await outputProcessing(table, response)) as Row[] let rows: Row[] = [] + let schema = table.schema - // Filter data to only specified columns if required + // // Filter data to only specified columns if required if (columns && columns.length) { for (let i = 0; i < result.length; i++) { rows[i] = {} @@ -411,14 +428,17 @@ export async function exportRows(ctx: BBContext) { rows = result } - let headers = Object.keys(rows[0]) + // @ts-ignore + let exportRows = cleanExportRows(rows, schema, format, columns) //this isnt correct + let headers = Object.keys(schema) + // @ts-ignore const exporter = exporters[format] const filename = `export.${format}` // send down the file ctx.attachment(filename) - return apiFileReturn(exporter(headers, rows)) + return apiFileReturn(exporter(headers, exportRows)) } export async function fetchEnrichedRow(ctx: BBContext) { diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts index c003a16266..09b2a9311e 100644 --- a/packages/server/src/api/controllers/row/utils.ts +++ b/packages/server/src/api/controllers/row/utils.ts @@ -7,6 +7,7 @@ import { BBContext, Row, Table } from "@budibase/types" export { removeKeyNumbering } from "../../../integrations/base/utils" const validateJs = require("validate.js") const { cloneDeep } = require("lodash/fp") +import { ExportFormats } from "../view/exporters" validateJs.extend(validateJs.validators.datetime, { parse: function (value: string) { @@ -116,3 +117,40 @@ export async function validate({ } return { valid: Object.keys(errors).length === 0, errors } } + +export function cleanExportRows( + rows: any[], + schema: any, + format: string, + columns: string[] +) { + let cleanRows = [...rows] + + const relationships = Object.entries(schema) + .filter((entry: any[]) => entry[1].type === FieldTypes.LINK) + .map(entry => entry[0]) + + relationships.forEach(column => { + cleanRows.forEach(row => { + delete row[column] + }) + delete schema[column] + }) + + // Intended to avoid 'undefined' in export + if (format === ExportFormats.CSV) { + const schemaKeys = Object.keys(schema) + for (let key of schemaKeys) { + if (columns?.length && columns.indexOf(key) > 0) { + continue + } + for (let row of cleanRows) { + if (row[key] == null) { + row[key] = "" + } + } + } + } + + return cleanRows +} diff --git a/packages/server/src/api/controllers/view/index.ts b/packages/server/src/api/controllers/view/index.ts index 17c3ee301d..3145bda900 100644 --- a/packages/server/src/api/controllers/view/index.ts +++ b/packages/server/src/api/controllers/view/index.ts @@ -15,6 +15,7 @@ import { TableSchema, View, } from "@budibase/types" +import { cleanExportRows } from "../row/utils" const { cloneDeep, isEqual } = require("lodash") @@ -158,29 +159,7 @@ export async function exportView(ctx: BBContext) { schema = table.schema } - // remove any relationships - const relationships = Object.entries(schema) - .filter(entry => entry[1].type === FieldTypes.LINK) - .map(entry => entry[0]) - // iterate relationship columns and remove from and row and schema - relationships.forEach(column => { - rows.forEach(row => { - delete row[column] - }) - delete schema[column] - }) - - // make sure no "undefined" entries appear in the CSV - if (format === exporters.ExportFormats.CSV) { - const schemaKeys = Object.keys(schema) - for (let key of schemaKeys) { - for (let row of rows) { - if (row[key] == null) { - row[key] = "" - } - } - } - } + let exportRows = cleanExportRows(rows, schema, format, []) // Export part let headers = Object.keys(schema) @@ -188,7 +167,7 @@ export async function exportView(ctx: BBContext) { const filename = `${viewName}.${format}` // send down the file ctx.attachment(filename) - ctx.body = apiFileReturn(exporter(headers, rows)) + ctx.body = apiFileReturn(exporter(headers, exportRows)) if (viewName.startsWith(DocumentType.TABLE)) { await events.table.exported(table, format as TableExportFormat) From e1093fc07d509ad57516fddc797c47708cde8e21 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 13 Dec 2022 15:55:59 +0000 Subject: [PATCH 010/387] Fix top nav colours and fix selected tab not updating --- packages/bbui/src/Tabs/Tab.svelte | 3 +- .../src/pages/builder/portal/_layout.svelte | 31 ++++++++++--------- .../builder/portal/settings/_layout.svelte | 10 ------ 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/packages/bbui/src/Tabs/Tab.svelte b/packages/bbui/src/Tabs/Tab.svelte index c25be7dbc9..637371ded2 100644 --- a/packages/bbui/src/Tabs/Tab.svelte +++ b/packages/bbui/src/Tabs/Tab.svelte @@ -82,7 +82,8 @@ .spectrum-Tabs-item { color: var(--spectrum-global-color-gray-600); } - .spectrum-Tabs-item.is-selected { + .spectrum-Tabs-item.is-selected, + .spectrum-Tabs-item:hover { color: var(--spectrum-global-color-gray-900); } diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index ff735fbc76..336867f5de 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -1,5 +1,5 @@ @@ -255,10 +259,7 @@ padding: 7px 0; } .nav :global(.spectrum-Tabs-itemLabel) { - color: #d0d0d0; - } - .nav :global(.spectrum-Tabs-item.is-selected .spectrum-Tabs-itemLabel) { - color: #ffffff; + font-weight: 600; } .branding { display: grid; diff --git a/packages/builder/src/pages/builder/portal/settings/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/_layout.svelte index 142196bd91..c1103bdaa7 100644 --- a/packages/builder/src/pages/builder/portal/settings/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/settings/_layout.svelte @@ -43,16 +43,6 @@ url={$url("./upgrade")} active={$isActive("./upgrade")} /> - -
From 7a48db02e7213e1d3bcb45b9ed0e2cce3810b9a7 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 13 Dec 2022 16:10:31 +0000 Subject: [PATCH 011/387] Remove log --- .../builder/src/pages/builder/portal/users/users/[userId].svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte index 2f13364d62..fd47092a14 100644 --- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte @@ -68,7 +68,6 @@ } return availableApps.map(app => { const prodAppId = apps.getProdAppID(app.appId) - console.log(prodAppId) return { name: app.name, devId: app.devId, From 97e36ed7a9bd36c2604a62b4833b6ce9106b7157 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 13 Dec 2022 16:19:20 +0000 Subject: [PATCH 012/387] Update copy on settings pages --- .../src/components/portal/page/Content.svelte | 6 +++++- .../src/pages/builder/portal/settings/api.svelte | 2 +- .../builder/portal/settings/email/index.svelte | 13 ++++++------- .../src/pages/builder/portal/settings/index.svelte | 4 ++-- .../builder/portal/settings/organisation.svelte | 6 +----- .../src/pages/builder/portal/settings/theme.svelte | 2 +- .../pages/builder/portal/settings/version.svelte | 4 ++-- .../src/pages/builder/portal/users/_layout.svelte | 4 ++-- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/packages/builder/src/components/portal/page/Content.svelte b/packages/builder/src/components/portal/page/Content.svelte index 365ddd40fa..e6ef93a179 100644 --- a/packages/builder/src/components/portal/page/Content.svelte +++ b/packages/builder/src/components/portal/page/Content.svelte @@ -1,11 +1,12 @@
-
+
@@ -24,4 +25,7 @@ .main { flex: 1 1 auto; } + .main.narrow { + max-width: 600px; + } diff --git a/packages/builder/src/pages/builder/portal/settings/api.svelte b/packages/builder/src/pages/builder/portal/settings/api.svelte index 127ae43c66..af4123d9c0 100644 --- a/packages/builder/src/pages/builder/portal/settings/api.svelte +++ b/packages/builder/src/pages/builder/portal/settings/api.svelte @@ -37,7 +37,7 @@ API Key - You API key to access the Budibase public API + Your API key to access the Budibase public API
diff --git a/packages/builder/src/pages/builder/portal/settings/email/index.svelte b/packages/builder/src/pages/builder/portal/settings/email/index.svelte index 71583222da..71687bcc70 100644 --- a/packages/builder/src/pages/builder/portal/settings/email/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/email/index.svelte @@ -126,11 +126,7 @@ Email - - Sending email is not required, but highly recommended for processes such - as password recovery. To setup automated auth emails, simply add the - values below and click activate. - + Add your SMTP details to send automated emails from Budibase {#if smtpConfig} @@ -164,7 +160,10 @@
- +
+ + +
{#if requireAuth}
@@ -191,7 +190,7 @@ Templates Budibase comes out of the box with ready-made email templates to help - with user onboarding. Please refrain from changing the links. + with user onboarding. - import { goto } from "@roxi/routify" - $goto("./api") + import { redirect } from "@roxi/routify" + $redirect("./api") diff --git a/packages/builder/src/pages/builder/portal/settings/organisation.svelte b/packages/builder/src/pages/builder/portal/settings/organisation.svelte index d6d7149ced..788e2d7e81 100644 --- a/packages/builder/src/pages/builder/portal/settings/organisation.svelte +++ b/packages/builder/src/pages/builder/portal/settings/organisation.svelte @@ -77,11 +77,7 @@ Organisation - - Organisation settings is where you can edit your organisation name and - logo. You can also configure your platform URL and enable or disable - analytics. - + Edit and manage all of your organisation settings diff --git a/packages/builder/src/pages/builder/portal/settings/theme.svelte b/packages/builder/src/pages/builder/portal/settings/theme.svelte index 977dc80ed7..2b08f3934b 100644 --- a/packages/builder/src/pages/builder/portal/settings/theme.svelte +++ b/packages/builder/src/pages/builder/portal/settings/theme.svelte @@ -7,7 +7,7 @@ Theme - Customize how Budibase looks and feels. + Customize how Budibase looks and feels
diff --git a/packages/builder/src/pages/builder/portal/settings/version.svelte b/packages/builder/src/pages/builder/portal/settings/version.svelte index 1e25a04da2..68686f37ab 100644 --- a/packages/builder/src/pages/builder/portal/settings/version.svelte +++ b/packages/builder/src/pages/builder/portal/settings/version.svelte @@ -54,10 +54,10 @@ {#if $auth.isAdmin} - Updates + Version Keep your budibase installation up to date to take advantage of the - latest features, security updates and much more. + latest features, security updates and much more diff --git a/packages/builder/src/pages/builder/portal/users/_layout.svelte b/packages/builder/src/pages/builder/portal/users/_layout.svelte index 944e0396b5..23e7aab9db 100644 --- a/packages/builder/src/pages/builder/portal/users/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/users/_layout.svelte @@ -7,8 +7,8 @@ $: narrow = !$isActive("./users/index") && !$isActive("./groups/index") - - + +
Date: Tue, 13 Dec 2022 16:50:31 +0000 Subject: [PATCH 013/387] Adding base test image --- hosting/scripts/install-minio.sh | 10 ++++++++++ hosting/tests/Dockerfile | 22 ++++++++++++++++++++++ hosting/tests/runner.sh | 8 ++++++++ package.json | 1 + 4 files changed, 41 insertions(+) create mode 100755 hosting/scripts/install-minio.sh create mode 100644 hosting/tests/Dockerfile create mode 100644 hosting/tests/runner.sh diff --git a/hosting/scripts/install-minio.sh b/hosting/scripts/install-minio.sh new file mode 100755 index 0000000000..8297593599 --- /dev/null +++ b/hosting/scripts/install-minio.sh @@ -0,0 +1,10 @@ +#!/bin/bash +if [[ $TARGETARCH == arm* ]] ; +then + echo "INSTALLING ARM64 MINIO" + wget https://dl.min.io/server/minio/release/linux-arm64/minio +else + echo "INSTALLING AMD64 MINIO" + wget https://dl.min.io/server/minio/release/linux-amd64/minio +fi +chmod +x minio diff --git a/hosting/tests/Dockerfile b/hosting/tests/Dockerfile new file mode 100644 index 0000000000..9753796383 --- /dev/null +++ b/hosting/tests/Dockerfile @@ -0,0 +1,22 @@ +FROM budibase/couchdb + +ENV DATA_DIR /data +RUN mkdir /data + +RUN apt-get update && \ + apt-get install -y --no-install-recommends redis-server + +WORKDIR /minio +ADD scripts/install-minio.sh ./install.sh +RUN chmod +x install.sh && ./install.sh + +WORKDIR / + +ADD tests/runner.sh . +RUN chmod +x ./runner.sh + +EXPOSE 5984 +EXPOSE 9000 +EXPOSE 6379 + +CMD ["./runner.sh"] diff --git a/hosting/tests/runner.sh b/hosting/tests/runner.sh new file mode 100644 index 0000000000..54a00490c8 --- /dev/null +++ b/hosting/tests/runner.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 & +/bbcouch-runner.sh & +/minio/minio server ${DATA_DIR}/minio > /dev/stdout 2>&1 & + +echo "Test environment started..." +sleep infinity \ No newline at end of file diff --git a/package.json b/package.json index 194ce73873..361bf99fe2 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "build:docker:single:image": "docker build -f hosting/single/Dockerfile -t budibase:latest .", "build:docker:single": "npm run build:docker:pre && npm run build:docker:single:image", "build:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.2.1 --push ./hosting/couchdb", + "build:docker:tests": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/tests/Dockerfile -t budibase/tests:latest -t budibase/tests:v3.2.1 --push ./hosting", "build:docs": "lerna run build:docs", "release:helm": "node scripts/releaseHelmChart", "env:multi:enable": "lerna run env:multi:enable", From efbc3f1e921969a0404e4ec1ca1f9cfd770c91ce Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 13 Dec 2022 17:14:08 +0000 Subject: [PATCH 014/387] Updating dev compose to use test image. --- hosting/docker-compose.dev.yaml | 64 +++++++-------------------------- hosting/nginx.dev.conf.hbs | 4 +-- hosting/tests/Dockerfile | 1 + hosting/tests/runner.sh | 2 +- 4 files changed, 17 insertions(+), 54 deletions(-) diff --git a/hosting/docker-compose.dev.yaml b/hosting/docker-compose.dev.yaml index 7322b0e8a9..b4556b5688 100644 --- a/hosting/docker-compose.dev.yaml +++ b/hosting/docker-compose.dev.yaml @@ -3,24 +3,23 @@ version: "3" # optional ports are specified throughout for more advanced use cases. services: - minio-service: - container_name: budi-minio-dev + dev-service: + container_name: budi-dev restart: on-failure - image: minio/minio - volumes: - - minio_data:/data + image: budibase/tests ports: - "${MINIO_PORT}:9000" - "9001:9001" + - "${COUCH_DB_PORT}:5984" + - "${REDIS_PORT}:6379" environment: MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY} MINIO_SECRET_KEY: ${MINIO_SECRET_KEY} - command: server /data --console-address ":9001" - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] - interval: 30s - timeout: 20s - retries: 3 + COUCHDB_PASSWORD: ${COUCH_DB_PASSWORD} + COUCHDB_USER: ${COUCH_DB_USER} + REDIS_PASSWORD: ${REDIS_PASSWORD} + volumes: + - dev_data:/data proxy-service: container_name: budi-nginx-dev @@ -32,47 +31,10 @@ services: ports: - "${MAIN_PORT}:10000" depends_on: - - minio-service - - couchdb-service + - dev-service extra_hosts: - "host.docker.internal:host-gateway" - couchdb-service: - # platform: linux/amd64 - container_name: budi-couchdb-dev - restart: on-failure - image: ibmcom/couchdb3 - environment: - - COUCHDB_PASSWORD=${COUCH_DB_PASSWORD} - - COUCHDB_USER=${COUCH_DB_USER} - ports: - - "${COUCH_DB_PORT}:5984" - volumes: - - couchdb3_data:/opt/couchdb/data - - couch-init: - container_name: budi-couchdb-init-dev - image: curlimages/curl - environment: - PUT_CALL: "curl -u ${COUCH_DB_USER}:${COUCH_DB_PASSWORD} -X PUT couchdb-service:5984" - depends_on: - - couchdb-service - command: ["sh","-c","sleep 10 && $${PUT_CALL}/_users && $${PUT_CALL}/_replicator; fg;"] - - redis-service: - container_name: budi-redis-dev - restart: on-failure - image: redis - command: redis-server --requirepass ${REDIS_PASSWORD} - ports: - - "${REDIS_PORT}:6379" - volumes: - - redis_data:/data - volumes: - couchdb3_data: - driver: local - minio_data: - driver: local - redis_data: - driver: local + dev_data: + driver: local \ No newline at end of file diff --git a/hosting/nginx.dev.conf.hbs b/hosting/nginx.dev.conf.hbs index 93a07435e5..51678d23e8 100644 --- a/hosting/nginx.dev.conf.hbs +++ b/hosting/nginx.dev.conf.hbs @@ -53,7 +53,7 @@ http { } location /db/ { - proxy_pass http://couchdb-service:5984; + proxy_pass http://dev-service:5984; rewrite ^/db/(.*)$ /$1 break; } @@ -183,7 +183,7 @@ http { proxy_set_header Connection ""; chunked_transfer_encoding off; - proxy_pass http://minio-service:9000; + proxy_pass http://dev-service:9000; } client_header_timeout 60; diff --git a/hosting/tests/Dockerfile b/hosting/tests/Dockerfile index 9753796383..c39cb62931 100644 --- a/hosting/tests/Dockerfile +++ b/hosting/tests/Dockerfile @@ -17,6 +17,7 @@ RUN chmod +x ./runner.sh EXPOSE 5984 EXPOSE 9000 +EXPOSE 9001 EXPOSE 6379 CMD ["./runner.sh"] diff --git a/hosting/tests/runner.sh b/hosting/tests/runner.sh index 54a00490c8..ddef044b3c 100644 --- a/hosting/tests/runner.sh +++ b/hosting/tests/runner.sh @@ -2,7 +2,7 @@ redis-server --requirepass $REDIS_PASSWORD > /dev/stdout 2>&1 & /bbcouch-runner.sh & -/minio/minio server ${DATA_DIR}/minio > /dev/stdout 2>&1 & +/minio/minio server ${DATA_DIR}/minio --console-address ":9001" > /dev/stdout 2>&1 & echo "Test environment started..." sleep infinity \ No newline at end of file From 6091d00f93789d8b5a3bde636282d4402047557d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 14 Dec 2022 12:27:05 +0000 Subject: [PATCH 015/387] Update and standardise page headers and subtitles, and remove side nav titles --- packages/builder/src/App.svelte | 3 --- .../backend/TableNavigator/TableDataImport.svelte | 1 - .../src/components/common/TemplateDisplay.svelte | 2 +- .../src/pages/builder/portal/plugins/index.svelte | 2 +- .../pages/builder/portal/settings/_layout.svelte | 2 +- .../builder/portal/settings/auth/index.svelte | 6 +----- .../src/pages/builder/portal/usage/index.svelte | 14 +++++--------- .../src/pages/builder/portal/users/_layout.svelte | 2 +- .../pages/builder/portal/users/groups/index.svelte | 10 ++++------ .../users/_components/ImportUsersModal.svelte | 1 - .../pages/builder/portal/users/users/index.svelte | 2 +- 11 files changed, 15 insertions(+), 30 deletions(-) diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte index 4d193df104..04846e01bf 100644 --- a/packages/builder/src/App.svelte +++ b/packages/builder/src/App.svelte @@ -11,11 +11,8 @@
- +
+ { + if (licensePlan?.type === Constants.PlanType.FREE) { + return ["1-w", "30-d", "90-d"].indexOf(x.value) < 0 + } else if (licensePlan?.type === Constants.PlanType.TEAM) { + return ["90-d"].indexOf(x.value) < 0 + } else if (licensePlan?.type === Constants.PlanType.PRO) { + return ["30-d", "90-d"].indexOf(x.value) < 0 + } + return true + }} + /> +
+ {#if (licensePlan?.type !== Constants.PlanType.ENTERPRISE && $auth.user.accountPortalAccess) || !$admin.cloud} +
+
{/if} - -
- { - showPanel = false - }} - />
+ + {#if runHistory} +
+
+ + + {/if} + + +
+ { + showPanel = false + }} + />
From 7ca61c8bca85ed00296641a3a61876282b823f52 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Dec 2022 17:01:50 +0000 Subject: [PATCH 029/387] Rewrite app overview access tab --- packages/bbui/src/Form/Core/Picker.svelte | 11 +- packages/bbui/src/Table/Table.svelte | 10 + .../src/components/common/RoleSelect.svelte | 43 ++- .../portal/overview/[appId]/access.svelte | 207 --------------- .../_components/AssignmentModal.svelte | 0 .../_components/GroupRoleRenderer.svelte | 26 ++ .../_components/UserRoleRenderer.svelte | 26 ++ .../overview/[appId]/access/index.svelte | 245 ++++++++++++++++++ 8 files changed, 354 insertions(+), 214 deletions(-) delete mode 100644 packages/builder/src/pages/builder/portal/overview/[appId]/access.svelte rename packages/builder/src/pages/builder/portal/overview/[appId]/{ => access}/_components/AssignmentModal.svelte (100%) create mode 100644 packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/GroupRoleRenderer.svelte create mode 100644 packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/UserRoleRenderer.svelte create mode 100644 packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index 97bd1394b4..63f07b7cd6 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -88,8 +88,8 @@ on:click={onClick} > {#if fieldIcon} - - + + {/if} {#if fieldColour} @@ -168,8 +168,8 @@ class:is-disabled={!isOptionEnabled(option)} > {#if getOptionIcon(option, idx)} - - + + {/if} {#if getOptionColour(option, idx)} @@ -241,6 +241,9 @@ .option-extra { padding-right: 8px; } + .option-extra.icon { + margin: 0 -1px; + } .spectrum-Popover :global(.spectrum-Search) { margin-top: -1px; diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte index cec270486a..3a4446b5b1 100644 --- a/packages/bbui/src/Table/Table.svelte +++ b/packages/bbui/src/Table/Table.svelte @@ -21,6 +21,8 @@ * template: a HBS or JS binding to use as the value * background: the background color * color: the text color + * borderLeft: show a left border + * borderRight: show a right border */ export let data = [] export let schema = {} @@ -270,6 +272,14 @@ if (schema[field].align === "Right") { styles[field] += "justify-content: flex-end; text-align: right;" } + if (schema[field].borderLeft) { + styles[field] += + "border-left: 1px solid var(--spectrum-global-color-gray-200);" + } + if (schema[field].borderLeft) { + styles[field] += + "border-right: 1px solid var(--spectrum-global-color-gray-200);" + } }) return styles } diff --git a/packages/builder/src/components/common/RoleSelect.svelte b/packages/builder/src/components/common/RoleSelect.svelte index aa39e5cb60..645e82c8ba 100644 --- a/packages/builder/src/components/common/RoleSelect.svelte +++ b/packages/builder/src/components/common/RoleSelect.svelte @@ -2,6 +2,7 @@ import { Select } from "@budibase/bbui" import { roles } from "stores/backend" import { Constants, RoleUtils } from "@budibase/frontend-core" + import { createEventDispatcher } from "svelte" export let value export let error @@ -9,26 +10,62 @@ export let autoWidth = false export let quiet = false export let allowPublic = true + export let allowRemove = false - $: options = getOptions($roles, allowPublic) + const dispatch = createEventDispatcher() + const RemoveID = "remove" + + $: options = getOptions($roles, allowPublic, allowRemove) const getOptions = (roles, allowPublic) => { + if (allowRemove) { + roles = [ + ...roles, + { + _id: RemoveID, + name: "Remove", + }, + ] + } if (allowPublic) { return roles } return roles.filter(role => role._id !== Constants.Roles.PUBLIC) } + + const getColor = role => { + if (allowRemove && role._id === RemoveID) { + return null + } + return RoleUtils.getRoleColour(role._id) + } + + const getIcon = role => { + if (allowRemove && role._id === RemoveID) { + return "Close" + } + return null + } + + const onChange = e => { + if (allowRemove && e.detail === RemoveID) { + dispatch("remove") + } else { + dispatch("change", e.detail) + } + }
+
+ You have no users assigned yet +
+
+ {#if $usersFetch.hasPrevPage || $usersFetch.hasNextPage} + + {/if} + + + {#if $licensing.groupsEnabled && appGroups.length} + +
+ Groups + +
+ +
+ You have no groups assigned yet +
+
+ + {/if} + + + + + + + + From 75af4cbfbfd934ab1325306749f638481a1157b4 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Dec 2022 17:07:14 +0000 Subject: [PATCH 030/387] Update table hover colours --- packages/bbui/src/Table/Table.svelte | 18 +----- .../overview/[appId]/access/index.svelte | 58 ++++++++++--------- 2 files changed, 32 insertions(+), 44 deletions(-) diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte index 3a4446b5b1..e7f0f9442c 100644 --- a/packages/bbui/src/Table/Table.svelte +++ b/packages/bbui/src/Table/Table.svelte @@ -558,10 +558,7 @@ display: contents; } .spectrum-Table-row:hover .spectrum-Table-cell { - /*background-color: var(--hover-bg) !important;*/ - } - .spectrum-Table-row:hover .spectrum-Table-cell:after { - background-color: var(--spectrum-alias-highlight-hover); + background-color: var(--spectrum-global-color-gray-100); } .wrapper--quiet .spectrum-Table-row { border-left: none; @@ -594,24 +591,13 @@ border-bottom: 1px solid var(--spectrum-alias-border-color-mid); background-color: var(--table-bg); z-index: auto; + transition: background-color 130ms ease-out; } .spectrum-Table-cell--edit { position: sticky; left: 0; z-index: 2; } - .spectrum-Table-cell:after { - content: ""; - position: absolute; - width: 100%; - height: 100%; - background-color: transparent; - top: 0; - left: 0; - pointer-events: none; - transition: background-color - var(--spectrum-global-animation-duration-100, 0.13s) ease-in-out; - } /* Placeholder */ .placeholder { diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte index f88f678b44..2a17e6172b 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte @@ -166,36 +166,38 @@ - -
- Users - -
- -
- You have no users assigned yet + {#if $usersFetch.loaded} + +
+ Users +
-
- {#if $usersFetch.hasPrevPage || $usersFetch.hasNextPage} - - {/if} - + +
+ You have no users assigned yet +
+
+ {#if $usersFetch.hasPrevPage || $usersFetch.hasNextPage} + + {/if} + + {/if} - {#if $licensing.groupsEnabled && appGroups.length} + {#if $usersFetch.loaded && $licensing.groupsEnabled && appGroups.length}
Groups From 5d74763c42326517cfce2a916716ebf91f4751b2 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 20 Dec 2022 17:12:36 +0000 Subject: [PATCH 031/387] Remove scrolling from tables when not required and stop selects from updating their own state locally --- packages/bbui/src/Form/Select.svelte | 9 +-------- packages/bbui/src/Table/Table.svelte | 10 ++++++++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte index 69126e648d..fe5d19d92f 100644 --- a/packages/bbui/src/Form/Select.svelte +++ b/packages/bbui/src/Form/Select.svelte @@ -1,7 +1,6 @@ @@ -61,16 +63,16 @@ - {#if version} + {#if loaded} - {version} + {version || "-"} +
+ +
{/if} -
- -
{/if} From df1e1b0c3fe3590bd48ada087d0d4cd0b406086b Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 21 Dec 2022 08:52:49 +0000 Subject: [PATCH 036/387] Fix loading bugs in app backups page --- .../builder/portal/overview/[appId]/backups/index.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte index ebf50a8df1..860d8dacad 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte @@ -165,8 +165,8 @@ } } - onMount(() => { - fetchBackups(filterOpt, page, startDate, endDate) + onMount(async () => { + await fetchBackups(filterOpt, page, startDate, endDate) loaded = true }) @@ -208,7 +208,7 @@ View plans
- {:else if backupData?.length === 0 && loaded && !filterOpt && !startDate} + {:else if !backupData?.length && loaded && !filterOpt && !startDate}
BackupsDefault From 285f11eca5c356ddf8bd937b4d184885f212c284 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 21 Dec 2022 09:47:17 +0000 Subject: [PATCH 037/387] Add sidebar for portal and use it for automation history. Fix multiple overflow and scrolling issues --- .../bbui/src/InlineAlert/InlineAlert.svelte | 1 + packages/bbui/src/Layout/Page.svelte | 67 +++++++++- packages/builder/package.json | 2 +- .../src/pages/builder/portal/_layout.svelte | 1 - .../pages/builder/portal/account/usage.svelte | 101 +++++++-------- .../_components/HistoryDetailsPanel.svelte | 120 +++++++----------- .../[appId]/automation-history/index.svelte | 48 +++---- packages/builder/yarn.lock | 8 +- 8 files changed, 179 insertions(+), 169 deletions(-) diff --git a/packages/bbui/src/InlineAlert/InlineAlert.svelte b/packages/bbui/src/InlineAlert/InlineAlert.svelte index 94ac6b2c2a..57e7296234 100644 --- a/packages/bbui/src/InlineAlert/InlineAlert.svelte +++ b/packages/bbui/src/InlineAlert/InlineAlert.svelte @@ -56,5 +56,6 @@ --spectrum-semantic-positive-icon-color: #2d9d78; --spectrum-semantic-negative-icon-color: #e34850; min-width: 100px; + margin: 0; } diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte index 6750005c74..02f089b340 100644 --- a/packages/bbui/src/Layout/Page.svelte +++ b/packages/bbui/src/Layout/Page.svelte @@ -1,15 +1,52 @@ -
- +
+
+
+ +
+
+
{ + sidePanelVisble = false + }} + > + +
diff --git a/packages/builder/package.json b/packages/builder/package.json index 4a09ede0ac..e809d3fef9 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -87,7 +87,7 @@ "shortid": "2.2.15", "svelte-dnd-action": "^0.9.8", "svelte-loading-spinners": "^0.1.1", - "svelte-portal": "0.1.0", + "svelte-portal": "1.0.0", "uuid": "8.3.1", "yup": "0.29.2" }, diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index cc9dbc37e3..2a5b5ed4df 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -304,7 +304,6 @@ justify-content: center; align-items: stretch; overflow: auto; - padding: 50px 50px 0 50px; } @media (max-width: 640px) { diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte index 12e3a56d31..9ffdee1e42 100644 --- a/packages/builder/src/pages/builder/portal/account/usage.svelte +++ b/packages/builder/src/pages/builder/portal/account/usage.svelte @@ -177,68 +177,63 @@ {#if loaded} - - - - Usage - -
Get information about your current usage within Budibase
- - - + + + Usage - To upgrade your plan and usage limits visit your - account. +
Get information about your current usage within Budibase
- -
+ + + + To upgrade your plan and usage limits visit your + account. + + +
+
+ + {#each staticUsage as usage} +
+ +
+ {/each} + +
+ + {#if monthlyUsage.length}
- - {#each staticUsage as usage} -
+ + + Monthly limits +
+ + + Resets in {daysRemainingInMonth} days + + +
+ + + {#each monthlyUsage as usage} -
- {/each} + {/each} +
- - {#if monthlyUsage.length} -
- - - Monthly limits -
- - - Resets in {daysRemainingInMonth} days - - -
- - - {#each monthlyUsage as usage} - - {/each} - - -
- {/if} -
- - - + {/if} +
+ + {/if} diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte index 02414f4a2b..3968011914 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte @@ -14,14 +14,16 @@ import HistoryDetailsPanel from "./_components/HistoryDetailsPanel.svelte" import { automationStore } from "builderStore" import { createPaginationStore } from "helpers/pagination" - import { onMount } from "svelte" + import { getContext, onDestroy, onMount } from "svelte" import dayjs from "dayjs" import { auth, licensing, admin, overview } from "stores/portal" import { Constants } from "@budibase/frontend-core" + import Portal from "svelte-portal" const ERROR = "error", SUCCESS = "success", STOPPED = "stopped" + const sidePanel = getContext("side-panel") let pageInfo = createPaginationStore() let runHistory = null @@ -109,7 +111,7 @@ function viewDetails({ detail }) { selectedHistory = detail - showPanel = true + sidePanel.open() } onMount(async () => { @@ -130,6 +132,10 @@ automationOptions.push({ value: automation._id, label: automation.name }) } }) + + onDestroy(() => { + sidePanel.close() + }) @@ -209,15 +215,15 @@ {/if} -
- { - showPanel = false - }} - /> -
+{#if selectedHistory} + + + +{/if} diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index 21ad9bcb8b..4ca6636207 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -5813,10 +5813,10 @@ svelte-loading-spinners@^0.1.1: resolved "https://registry.yarnpkg.com/svelte-loading-spinners/-/svelte-loading-spinners-0.1.7.tgz#3fa6fa0ef67ab635773bf20b07d0b071debbadaa" integrity sha512-EKCId1DjVL2RSUVJJsvtNcqQHox03XIgh4xh/4p7r6ST7d8mut6INY9/LqK4A17PFU64+3quZmqiSfOlf480CA== -svelte-portal@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-0.1.0.tgz#cc2821cc84b05ed5814e0218dcdfcbebc53c1742" - integrity sha512-kef+ksXVKun224mRxat+DdO4C+cGHla+fEcZfnBAvoZocwiaceOfhf5azHYOPXSSB1igWVFTEOF3CDENPnuWxg== +svelte-portal@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" + integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== svelte@^3.48.0: version "3.49.0" From 1e522d6696f19dc31a34ac3e1952c4bb48e4c2b3 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 21 Dec 2022 09:54:39 +0000 Subject: [PATCH 038/387] Tidy up --- .../overview/[appId]/access/index.svelte | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte index 001ca67eff..9e5aceedaa 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte @@ -181,17 +181,15 @@ You have no users assigned yet
- {#if $usersFetch.hasPrevPage || $usersFetch.hasNextPage} - - {/if} + {/if} From 7526bc83879b80cb96101dbd59e3d1c6667b196d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 21 Dec 2022 11:52:25 +0000 Subject: [PATCH 039/387] Update user details page to use tables and match designs --- .../users/_components/AppRoleTableRenderer.svelte | 0 ...er.svelte => PasswordCopyTableRenderer.svelte} | 0 .../_components/RemoveGroupTableRenderer.svelte | 15 +++++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte rename packages/builder/src/pages/builder/portal/users/users/_components/{PasswordCopyRenderer.svelte => PasswordCopyTableRenderer.svelte} (100%) create mode 100644 packages/builder/src/pages/builder/portal/users/users/_components/RemoveGroupTableRenderer.svelte diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/PasswordCopyRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/PasswordCopyTableRenderer.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/users/users/_components/PasswordCopyRenderer.svelte rename to packages/builder/src/pages/builder/portal/users/users/_components/PasswordCopyTableRenderer.svelte diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/RemoveGroupTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/RemoveGroupTableRenderer.svelte new file mode 100644 index 0000000000..afff99da0f --- /dev/null +++ b/packages/builder/src/pages/builder/portal/users/users/_components/RemoveGroupTableRenderer.svelte @@ -0,0 +1,15 @@ + + +Remove From e91ed89d724c9d1b9a59d03183d366f433c27e33 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 21 Dec 2022 11:53:16 +0000 Subject: [PATCH 040/387] Update users detail page --- .../portal/users/users/[userId].svelte | 147 ++++++++++-------- .../_components/AppNameTableRenderer.svelte | 30 ++++ .../_components/AppRoleTableRenderer.svelte | 16 ++ .../users/_components/PasswordModal.svelte | 4 +- 4 files changed, 134 insertions(+), 63 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/users/users/_components/AppNameTableRenderer.svelte diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte index 67ea23ceed..d3e709db69 100644 --- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte @@ -18,20 +18,63 @@ Modal, notifications, Banner, - StatusLight, + Table, } from "@budibase/bbui" - import { onMount } from "svelte" + import { onMount, setContext } from "svelte" import { users, auth, groups, apps, licensing } from "stores/portal" import { roles } from "stores/backend" import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte" import UserGroupPicker from "components/settings/UserGroupPicker.svelte" import DeleteUserModal from "./_components/DeleteUserModal.svelte" import GroupIcon from "../groups/_components/GroupIcon.svelte" - import { Constants, RoleUtils } from "@budibase/frontend-core" + import { Constants } from "@budibase/frontend-core" import { Breadcrumbs, Breadcrumb } from "components/portal/page" + import RemoveGroupTableRenderer from "./_components/RemoveGroupTableRenderer.svelte" + import GroupNameTableRenderer from "../groups/_components/GroupNameTableRenderer.svelte" + import AppNameTableRenderer from "./_components/AppNameTableRenderer.svelte" + import AppRoleTableRenderer from "./_components/AppRoleTableRenderer.svelte" export let userId + const groupSchema = { + name: { + width: "1fr", + }, + _id: { + displayName: "", + width: "auto", + borderLeft: true, + }, + } + const appSchema = { + name: { + width: "2fr", + }, + role: { + width: "1fr", + }, + } + const customGroupTableRenderers = [ + { + column: "name", + component: GroupNameTableRenderer, + }, + { + column: "_id", + component: RemoveGroupTableRenderer, + }, + ] + const customAppTableRenderers = [ + { + column: "name", + component: AppNameTableRenderer, + }, + { + column: "role", + component: AppRoleTableRenderer, + }, + ] + let deleteModal let resetPasswordModal let popoverAnchor @@ -113,11 +156,6 @@ .join("") } - const getRoleLabel = roleId => { - const role = $roles.find(x => x._id === roleId) - return role?.name || "Custom role" - } - async function updateUserFirstName(evt) { try { await users.save({ ...user, firstName: evt.target.value }) @@ -172,6 +210,10 @@ await fetchUser() } + setContext("groups", { + removeGroup, + }) + onMount(async () => { try { await Promise.all([ @@ -272,61 +314,43 @@ />
- - {#if userGroups.length} - {#each userGroups as group} - $goto(`../groups/${group._id}`)} - > - { - removeGroup(group._id) - e.stopPropagation() - }} - hoverable - size="S" - name="Close" - /> - - {/each} - {:else} - - {/if} - + $goto(`../groups/${e.detail._id}`)} + > +
+ This user is not in any groups +
+
{/if} Apps - - {#if privileged} - - This user's role grants admin access to all apps - - {:else if availableApps.length} - {#each availableApps as app} - $goto(`../../overview/${app.devId}`)} - > -
- - {getRoleLabel(app.role)} - -
- - {/each} - {:else} - - {/if} - + {#if privileged} + + This user's role grants admin access to all apps + + {:else} + $goto(`../../overview/${e.detail.devId}`)} + > +
+ + This user doesn't have access to any apps + +
+
+ {/if} {/if} @@ -348,19 +372,16 @@ grid-template-columns: 120px 1fr; align-items: center; } - .title { display: flex; align-items: center; justify-content: space-between; } - .tableTitle { display: flex; justify-content: space-between; align-items: flex-end; } - .subtitle { padding: 0 0 0 var(--spacing-m); display: flex; @@ -368,4 +389,8 @@ justify-content: center; align-items: stretch; } + .placeholder { + width: 100%; + text-align: center; + } diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AppNameTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AppNameTableRenderer.svelte new file mode 100644 index 0000000000..c5d6a55848 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/users/users/_components/AppNameTableRenderer.svelte @@ -0,0 +1,30 @@ + + +
+ +
+ {value} +
+
+ + diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte index e69de29bb2..5664a95045 100644 --- a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte @@ -0,0 +1,16 @@ + + + + {getRoleLabel(value)} + diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/PasswordModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/PasswordModal.svelte index 990a54610c..7b0d95719d 100644 --- a/packages/builder/src/pages/builder/portal/users/users/_components/PasswordModal.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/_components/PasswordModal.svelte @@ -1,6 +1,6 @@ - -
- rolesContext.updateGroupRole(e.detail, row._id)} - on:remove={() => rolesContext.removeGroupRole(row._id)} - /> -
- - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte index 9e5aceedaa..4acec6aaec 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte @@ -16,15 +16,14 @@ import { roles } from "stores/backend" import { API } from "api" import { fetchData } from "@budibase/frontend-core" - import UserRoleRenderer from "./_components/UserRoleRenderer.svelte" - import GroupRoleRenderer from "./_components/GroupRoleRenderer.svelte" + import EditableRoleRenderer from "./_components/EditableRoleRenderer.svelte" const userSchema = { email: { type: "string", width: "1fr", }, - userAppRole: { + role: { displayName: "Access", width: "150px", borderLeft: true, @@ -35,7 +34,7 @@ type: "string", width: "1fr", }, - groupAppRole: { + role: { displayName: "Access", width: "150px", borderLeft: true, @@ -43,12 +42,8 @@ } const customRenderers = [ { - column: "userAppRole", - component: UserRoleRenderer, - }, - { - column: "groupAppRole", - component: GroupRoleRenderer, + column: "role", + component: EditableRoleRenderer, }, ] @@ -76,7 +71,7 @@ const getAppUsers = (users, appId) => { return users.map(user => ({ ...user, - userAppRole: user.roles[Object.keys(user.roles).find(x => x === appId)], + role: user.roles[Object.keys(user.roles).find(x => x === appId)], })) } @@ -90,13 +85,30 @@ }) .map(group => ({ ...group, - groupAppRole: - group.roles[ - groups.actions.getGroupAppIds(group).find(x => x === appId) - ], + role: group.roles[ + groups.actions.getGroupAppIds(group).find(x => x === appId) + ], })) } + const updateRole = async (role, id) => { + // Check if this is a user or a group + if ($usersFetch.rows.some(user => user._id === id)) { + await updateUserRole(role, id) + } else { + await updateGroupRole(role, id) + } + } + + const removeRole = async id => { + // Check if this is a user or a group + if ($usersFetch.rows.some(user => user._id === id)) { + await removeUserRole(id) + } else { + await removeGroupRole(id) + } + } + const updateUserRole = async (role, userId) => { const user = $usersFetch.rows.find(user => user._id === userId) if (!user) { @@ -142,10 +154,8 @@ } setContext("roles", { - updateUserRole, - removeUserRole, - updateGroupRole, - removeGroupRole, + updateRole, + removeRole, }) onMount(async () => { diff --git a/packages/builder/src/pages/builder/portal/settings/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/_layout.svelte index a17f625634..0ae25c17b4 100644 --- a/packages/builder/src/pages/builder/portal/settings/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/settings/_layout.svelte @@ -2,6 +2,8 @@ import { url, isActive } from "@roxi/routify" import { Page } from "@budibase/bbui" import { Content, SideNav, SideNavItem } from "components/portal/page" + + $: narrow = !$isActive("./users/index") && !$isActive("./groups/index") diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte index 6e5bf63dba..b92ccc2769 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -7,10 +7,7 @@ Icon, Popover, notifications, - List, - ListItem, - StatusLight, - Divider, + Table, ActionMenu, MenuItem, Modal, @@ -18,32 +15,76 @@ import UserGroupPicker from "components/settings/UserGroupPicker.svelte" import { createPaginationStore } from "helpers/pagination" import { users, apps, groups } from "stores/portal" - import { onMount } from "svelte" - import { RoleUtils } from "@budibase/frontend-core" + import { onMount, setContext } from "svelte" import { roles } from "stores/backend" import ConfirmDialog from "components/common/ConfirmDialog.svelte" import CreateEditGroupModal from "./_components/CreateEditGroupModal.svelte" import GroupIcon from "./_components/GroupIcon.svelte" - import AppAddModal from "./_components/AppAddModal.svelte" import { Breadcrumbs, Breadcrumb } from "components/portal/page" + import AppNameTableRenderer from "../users/_components/AppNameTableRenderer.svelte" + import RemoveUserTableRenderer from "./_components/RemoveUserTableRenderer.svelte" + import AppRoleTableRenderer from "../users/_components/AppRoleTableRenderer.svelte" export let groupId + const userSchema = { + email: { + width: "1fr", + }, + _id: { + displayName: "", + width: "auto", + borderLeft: true, + }, + } + const appSchema = { + name: { + width: "2fr", + }, + role: { + width: "1fr", + }, + } + const customUserTableRenderers = [ + { + column: "_id", + component: RemoveUserTableRenderer, + }, + ] + const customAppTableRenderers = [ + { + column: "name", + component: AppNameTableRenderer, + }, + { + column: "role", + component: AppRoleTableRenderer, + }, + ] + let popoverAnchor let popover let searchTerm = "" let prevSearch = undefined let pageInfo = createPaginationStore() let loaded = false - let editModal, deleteModal, appAddModal + let editModal, deleteModal $: page = $pageInfo.page $: fetchUsers(page, searchTerm) $: group = $groups.find(x => x._id === groupId) $: filtered = $users.data - $: groupApps = $apps.filter(app => - groups.actions.getGroupAppIds(group).includes(apps.getProdAppID(app.devId)) - ) + $: groupApps = $apps + .filter(app => + groups.actions + .getGroupAppIds(group) + .includes(apps.getProdAppID(app.devId)) + ) + .map(app => ({ + ...app, + role: group?.roles?.[apps.getProdAppID(app.devId)], + })) + $: console.log(groupApps) $: { if (loaded && !group?._id) { $goto("./") @@ -93,6 +134,22 @@ } } + const removeUser = async id => { + await groups.actions.removeUser(groupId, id) + } + + const removeApp = async app => { + await groups.actions.removeApp(groupId, apps.getProdAppID(app.devId)) + } + + setContext("users", { + removeUser, + }) + setContext("roles", { + updateRole: () => {}, + removeRole: removeApp, + }) + onMount(async () => { try { await Promise.all([groups.actions.init(), apps.load(), roles.fetch()]) @@ -143,76 +200,35 @@ />
- - {#if group?.users.length} - {#each group.users as user} - $goto(`../users/${user._id}`)} - hoverable - > - { - groups.actions.removeUser(groupId, user._id) - e.stopPropagation() - }} - hoverable - size="S" - name="Close" - /> - - {/each} - {:else} - - {/if} - + + $goto(`../users/${e.detail._id}`)} + > +
+ This user group doesn't have any users +
+
-
- Apps -
- + Apps + $goto(`../../overview/${e.detail.devId}`)} + > +
+ This group doesn't have access to any apps
- - - {#if groupApps.length} - {#each groupApps as app} - $goto(`../../overview/${app.devId}`)} - hoverable - > -
- - {getRoleLabel(app.devId)} - -
- { - groups.actions.removeApp( - groupId, - apps.getProdAppID(app.devId) - ) - e.stopPropagation() - }} - hoverable - size="S" - name="Close" - /> - - {/each} - {:else} - - {/if} - +
{/if} @@ -221,10 +237,6 @@ - - - - diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/CreateEditGroupModal.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/CreateEditGroupModal.svelte index 22a59c2193..d8f3a81e28 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/_components/CreateEditGroupModal.svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/_components/CreateEditGroupModal.svelte @@ -14,10 +14,10 @@ saveGroup(group)} size="M" - title="Create User Group" + title={group?._rev ? "Edit group" : "Create group"} confirmText="Save" > - +
Icon diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/RemoveUserTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/RemoveUserTableRenderer.svelte new file mode 100644 index 0000000000..dcf947d4fe --- /dev/null +++ b/packages/builder/src/pages/builder/portal/users/groups/_components/RemoveUserTableRenderer.svelte @@ -0,0 +1,15 @@ + + +Remove From ea5b515783d2896bace11d02dff2ba6851090ffa Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 4 Jan 2023 19:47:56 +0000 Subject: [PATCH 042/387] Playing around with getting tests working. --- packages/backend-core/src/db/db.ts | 10 +++++----- packages/server/src/tests/jestSetup.ts | 2 ++ packages/worker/src/tests/jestSetup.ts | 3 +++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/backend-core/src/db/db.ts b/packages/backend-core/src/db/db.ts index 3887e8b09f..c54a4faea4 100644 --- a/packages/backend-core/src/db/db.ts +++ b/packages/backend-core/src/db/db.ts @@ -7,11 +7,11 @@ const dbList = new Set() export function getDB(dbName?: string, opts?: any): Database { // TODO: once using the test image, need to remove this - if (env.isTest()) { - dbList.add(dbName) - // @ts-ignore - return getPouchDB(dbName, opts) - } + // if (env.isTest()) { + // dbList.add(dbName) + // // @ts-ignore + // return getPouchDB(dbName, opts) + // } return new DatabaseImpl(dbName, opts) } diff --git a/packages/server/src/tests/jestSetup.ts b/packages/server/src/tests/jestSetup.ts index b53ac2d9fa..cebc01b864 100644 --- a/packages/server/src/tests/jestSetup.ts +++ b/packages/server/src/tests/jestSetup.ts @@ -11,6 +11,8 @@ env._set("PORT", 0) env._set("MINIO_URL", "http://localhost") env._set("MINIO_ACCESS_KEY", "test") env._set("MINIO_SECRET_KEY", "test") +env._set("COUCH_DB_USER", "budibase") +env._set("COUCH_DB_PASSWORD", "budibase") import { mocks } from "@budibase/backend-core/tests" diff --git a/packages/worker/src/tests/jestSetup.ts b/packages/worker/src/tests/jestSetup.ts index ab82cb5be7..467ea73c79 100644 --- a/packages/worker/src/tests/jestSetup.ts +++ b/packages/worker/src/tests/jestSetup.ts @@ -1,4 +1,5 @@ import env from "../environment" +import { env as coreEnv } from "@budibase/backend-core" env._set("SELF_HOSTED", "0") env._set("NODE_ENV", "jest") @@ -11,6 +12,8 @@ env._set("MINIO_SECRET_KEY", "test") env._set("PLATFORM_URL", "http://localhost:10000") env._set("INTERNAL_API_KEY", "test") env._set("DISABLE_ACCOUNT_PORTAL", false) +coreEnv._set("COUCH_DB_USER", "budibase") +coreEnv._set("COUCH_DB_PASSWORD", "budibase") import { mocks } from "@budibase/backend-core/tests" From 701e2ff860af721c9944670abb07e9ddc6d15b7b Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 6 Jan 2023 16:41:45 +0000 Subject: [PATCH 043/387] Types and stubs for environment variables feature. --- packages/backend-core/yarn.lock | 5 ----- .../src/api/web/global/environmentVariables.ts | 14 ++++++++++++++ packages/types/src/api/web/global/index.ts | 1 + packages/types/src/api/web/index.ts | 1 + .../src/documents/global/environmentVariables.ts | 16 ++++++++++++++++ packages/types/src/documents/global/index.ts | 1 + 6 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 packages/types/src/api/web/global/environmentVariables.ts create mode 100644 packages/types/src/api/web/global/index.ts create mode 100644 packages/types/src/documents/global/environmentVariables.ts diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock index db3857101e..5f25c6ba8e 100644 --- a/packages/backend-core/yarn.lock +++ b/packages/backend-core/yarn.lock @@ -482,11 +482,6 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/types@2.2.10-alpha.13": - version "2.2.10-alpha.13" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.10-alpha.13.tgz#abc1a5bd9295a0fa63db67912c6520d12e8d6f66" - integrity sha512-XRmLQXCLKdOADxEoGB3h4QOrHlPIqbk9jOSxyOK2RDQIy8NdQ+aXanPw3TEHkgrDIYxrClVcf4KXrujqNnrk6g== - "@cspotcode/source-map-support@^0.8.0": version "0.8.1" resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" diff --git a/packages/types/src/api/web/global/environmentVariables.ts b/packages/types/src/api/web/global/environmentVariables.ts new file mode 100644 index 0000000000..9c39f1c239 --- /dev/null +++ b/packages/types/src/api/web/global/environmentVariables.ts @@ -0,0 +1,14 @@ +export interface CreateEnvironmentVariableRequest { + name: string + production: string + development: string +} + +export interface UpdateEnvironmentVariableRequest { + production: string + development: string +} + +export interface GetEnvironmentVariablesResponse { + variables: string[] +} diff --git a/packages/types/src/api/web/global/index.ts b/packages/types/src/api/web/global/index.ts new file mode 100644 index 0000000000..a99934c39c --- /dev/null +++ b/packages/types/src/api/web/global/index.ts @@ -0,0 +1 @@ +export * from "./environmentVariables" diff --git a/packages/types/src/api/web/index.ts b/packages/types/src/api/web/index.ts index 1dbe22aa46..9688a89c7b 100644 --- a/packages/types/src/api/web/index.ts +++ b/packages/types/src/api/web/index.ts @@ -3,3 +3,4 @@ export * from "./user" export * from "./errors" export * from "./schedule" export * from "./app" +export * from "./global" diff --git a/packages/types/src/documents/global/environmentVariables.ts b/packages/types/src/documents/global/environmentVariables.ts new file mode 100644 index 0000000000..62bd1e5633 --- /dev/null +++ b/packages/types/src/documents/global/environmentVariables.ts @@ -0,0 +1,16 @@ +import { Document } from "../document" + +export interface EnvironmentVariablesDoc extends Document { + variables: string +} + +export type EnvironmentVariableValue = { + production: string + development: string +} + +// what comes out of the "variables" when it is decrypted +export type EnvironmentVariablesDecrypted = Record< + string, + EnvironmentVariableValue +> diff --git a/packages/types/src/documents/global/index.ts b/packages/types/src/documents/global/index.ts index 40a30ee477..11ce7513f2 100644 --- a/packages/types/src/documents/global/index.ts +++ b/packages/types/src/documents/global/index.ts @@ -5,3 +5,4 @@ export * from "./plugin" export * from "./quotas" export * from "./schedule" export * from "./templates" +export * from "./environmentVariables" From 183bf9a84a4c445a714ed64f482a37571fa1da35 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 Jan 2023 09:20:26 +0000 Subject: [PATCH 044/387] Fix automation error linking from apps page and improve automation fetching logic in automation history --- .../pages/builder/portal/apps/index.svelte | 3 +-- .../[appId]/automation-history/index.svelte | 24 +++++++++++++------ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 07f9cce35e..69d3d3c69b 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -95,10 +95,9 @@ const goToAutomationError = appId => { const params = new URLSearchParams({ - tab: "Automation History", open: "error", }) - $goto(`../overview/${appId}?${params.toString()}`) + $goto(`../overview/${appId}/automation-history?${params.toString()}`) } const errorCount = errors => { diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte index 3968011914..30f77696f4 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte @@ -33,6 +33,7 @@ let automationId = null let status = null let timeRange = null + let loaded = false $: licensePlan = $auth.user?.license?.plan $: app = $overview.selectedApp @@ -66,7 +67,16 @@ { column: "status", component: StatusRenderer }, ] - async function fetchLogs(automationId, status, page, timeRange) { + async function fetchLogs( + automationId, + status, + page, + timeRange, + force = false + ) { + if (!force && !loaded) { + return + } let startDate = null if (timeRange) { const [length, units] = timeRange.split("-") @@ -118,19 +128,19 @@ await automationStore.actions.fetch() const params = new URLSearchParams(window.location.search) const shouldOpen = params.get("open") === ERROR - // open with errors, open panel for latest if (shouldOpen) { status = ERROR } - await automationStore.actions.fetch() - await fetchLogs(null, status) - if (shouldOpen) { - viewDetails({ detail: runHistory[0] }) - } automationOptions = [] for (let automation of $automationStore.automations) { automationOptions.push({ value: automation._id, label: automation.name }) } + await fetchLogs(automationId, status, 0, timeRange, true) + // Open the first automation info if one exists + if (shouldOpen && runHistory?.[0]) { + viewDetails({ detail: runHistory[0] }) + } + loaded = true }) onDestroy(() => { From 85f4648f6faee0436a713c8e5736e7c37ffd0c17 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 Jan 2023 09:42:51 +0000 Subject: [PATCH 045/387] Move theme and API key into user profile dropdown instead of settings --- .../components/settings/APIKeyModal.svelte | 40 ++++++++++++ ...erInfoModal.svelte => ProfileModal.svelte} | 6 +- .../src/components/settings/ThemeModal.svelte | 16 +++++ .../src/pages/builder/apps/index.svelte | 4 +- .../src/pages/builder/portal/_layout.svelte | 41 +++++++++--- .../builder/portal/settings/_layout.svelte | 10 --- .../pages/builder/portal/settings/api.svelte | 64 ------------------- .../builder/portal/settings/index.svelte | 2 +- .../builder/portal/settings/theme.svelte | 37 ----------- 9 files changed, 93 insertions(+), 127 deletions(-) create mode 100644 packages/builder/src/components/settings/APIKeyModal.svelte rename packages/builder/src/components/settings/{UpdateUserInfoModal.svelte => ProfileModal.svelte} (89%) create mode 100644 packages/builder/src/components/settings/ThemeModal.svelte delete mode 100644 packages/builder/src/pages/builder/portal/settings/api.svelte delete mode 100644 packages/builder/src/pages/builder/portal/settings/theme.svelte diff --git a/packages/builder/src/components/settings/APIKeyModal.svelte b/packages/builder/src/components/settings/APIKeyModal.svelte new file mode 100644 index 0000000000..6fb2c88634 --- /dev/null +++ b/packages/builder/src/components/settings/APIKeyModal.svelte @@ -0,0 +1,40 @@ + + + + Your API key for accessing the Budibase public API: + + diff --git a/packages/builder/src/components/settings/UpdateUserInfoModal.svelte b/packages/builder/src/components/settings/ProfileModal.svelte similarity index 89% rename from packages/builder/src/components/settings/UpdateUserInfoModal.svelte rename to packages/builder/src/components/settings/ProfileModal.svelte index 5734f613ad..850bde2f35 100644 --- a/packages/builder/src/components/settings/UpdateUserInfoModal.svelte +++ b/packages/builder/src/components/settings/ProfileModal.svelte @@ -18,11 +18,7 @@ } - + Personalise the platform by adding your first name and last name. diff --git a/packages/builder/src/components/settings/ThemeModal.svelte b/packages/builder/src/components/settings/ThemeModal.svelte new file mode 100644 index 0000000000..fd7460327a --- /dev/null +++ b/packages/builder/src/components/settings/ThemeModal.svelte @@ -0,0 +1,16 @@ + + + + x.name} - getOptionValue={x => x.class} - /> -
-
- - - From 8933bc2be8f96bd3fd943a369bf746586d8b6795 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 Jan 2023 09:46:27 +0000 Subject: [PATCH 046/387] Move settings before account and show plugins for devs --- .../src/pages/builder/portal/_layout.svelte | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 12f47d0f0d..f1dfc6ed99 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -50,10 +50,18 @@ title: "Apps", href: "/builder/portal/apps", }, + { + title: "Plugins", + href: "/builder/portal/plugins", + }, ] if (admin) { - menu = menu.concat([ + menu = [ + { + title: "Apps", + href: "/builder/portal/apps", + }, { title: "Users", href: "/builder/portal/users/users", @@ -62,15 +70,15 @@ title: "Plugins", href: "/builder/portal/plugins", }, - { - title: "Account", - href: "/builder/portal/account", - }, { title: "Settings", href: "/builder/portal/settings", }, - ]) + { + title: "Account", + href: "/builder/portal/account", + }, + ] // if (!$adminStore.cloud) { // menu = menu.concat([ // { From f805f6d7f3d16816fd0b5b75f7b3c85c9222e8f7 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 Jan 2023 11:12:54 +0000 Subject: [PATCH 047/387] Convert plugins page to table and update components and modals --- packages/bbui/src/Table/StringRenderer.svelte | 8 +- .../_components/DeletePluginModal.svelte | 5 +- .../_components/EditPluginModal.svelte | 83 +++++++++++++++++++ .../_components/EditPluginRenderer.svelte | 14 ++++ .../_components/PluginNameRenderer.svelte | 26 ++++++ .../pages/builder/portal/plugins/index.svelte | 78 +++++++++++------ 6 files changed, 185 insertions(+), 29 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/plugins/_components/EditPluginModal.svelte create mode 100644 packages/builder/src/pages/builder/portal/plugins/_components/EditPluginRenderer.svelte create mode 100644 packages/builder/src/pages/builder/portal/plugins/_components/PluginNameRenderer.svelte diff --git a/packages/bbui/src/Table/StringRenderer.svelte b/packages/bbui/src/Table/StringRenderer.svelte index 52eb656c26..fd7ff3bcda 100644 --- a/packages/bbui/src/Table/StringRenderer.svelte +++ b/packages/bbui/src/Table/StringRenderer.svelte @@ -1,8 +1,11 @@ -
{typeof value === "object" ? JSON.stringify(value) : value}
+
+ {typeof value === "object" ? JSON.stringify(value) : value} +
diff --git a/packages/builder/src/pages/builder/portal/plugins/_components/DeletePluginModal.svelte b/packages/builder/src/pages/builder/portal/plugins/_components/DeletePluginModal.svelte index 6b09e7b276..1782b44f2b 100644 --- a/packages/builder/src/pages/builder/portal/plugins/_components/DeletePluginModal.svelte +++ b/packages/builder/src/pages/builder/portal/plugins/_components/DeletePluginModal.svelte @@ -9,8 +9,9 @@ async function deletePlugin() { try { + const name = plugin.name await plugins.deletePlugin(plugin._id) - notifications.success(`Plugin ${plugin?.name} deleted`) + notifications.success(`Plugin ${name} deleted successfully`) dispatch("deleted") } catch (error) { const msg = error?.message ? error.message : JSON.stringify(error) @@ -28,6 +29,6 @@ showCloseIcon={false} > - Are you sure you want to delete {plugin?.name} + Are you sure you want to delete {plugin?.name}? diff --git a/packages/builder/src/pages/builder/portal/plugins/_components/EditPluginModal.svelte b/packages/builder/src/pages/builder/portal/plugins/_components/EditPluginModal.svelte new file mode 100644 index 0000000000..762be44528 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/plugins/_components/EditPluginModal.svelte @@ -0,0 +1,83 @@ + + + +
+ + +
+ +
+ + +
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ +
+ + + + + + + diff --git a/packages/builder/src/pages/builder/portal/plugins/_components/EditPluginRenderer.svelte b/packages/builder/src/pages/builder/portal/plugins/_components/EditPluginRenderer.svelte new file mode 100644 index 0000000000..e9d1bdd138 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/plugins/_components/EditPluginRenderer.svelte @@ -0,0 +1,14 @@ + + +Edit + + + + diff --git a/packages/builder/src/pages/builder/portal/plugins/_components/PluginNameRenderer.svelte b/packages/builder/src/pages/builder/portal/plugins/_components/PluginNameRenderer.svelte new file mode 100644 index 0000000000..8d9d71f636 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/plugins/_components/PluginNameRenderer.svelte @@ -0,0 +1,26 @@ + + +
+ {#if icon} + + {/if} + {friendlyName || value} +
+ + diff --git a/packages/builder/src/pages/builder/portal/plugins/index.svelte b/packages/builder/src/pages/builder/portal/plugins/index.svelte index 60e4a9d517..32a5f7b977 100644 --- a/packages/builder/src/pages/builder/portal/plugins/index.svelte +++ b/packages/builder/src/pages/builder/portal/plugins/index.svelte @@ -9,11 +9,36 @@ Modal, Search, Page, + Table, } from "@budibase/bbui" import { onMount } from "svelte" import { plugins, admin } from "stores/portal" - import PluginRow from "./_components/PluginRow.svelte" import AddPluginModal from "./_components/AddPluginModal.svelte" + import PluginNameRenderer from "./_components/PluginNameRenderer.svelte" + import EditPluginRenderer from "./_components/EditPluginRenderer.svelte" + + const schema = { + name: { + width: "2fr", + }, + version: { + width: "1fr", + }, + "schema.type": { + width: "1fr", + displayName: "Type", + capitalise: true, + }, + edit: { + width: "auto", + borderLeft: true, + displayName: "", + }, + } + const customRenderers = [ + { column: "name", component: PluginNameRenderer }, + { column: "edit", component: EditPluginRenderer }, + ] let modal let searchTerm = "" @@ -50,33 +75,34 @@ Add your own custom datasources and components - -
-
- -
- {#if $plugins?.length} -
-
- +
+ +
{/if} - +
+ + From e461c4d6762a138ed5e6946a14f027e157cb4ac5 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 Jan 2023 11:22:12 +0000 Subject: [PATCH 048/387] Update links when going back from the builder --- .../builder/app/[application]/_layout.svelte | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index 5296604dc7..06ae57fa85 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -105,32 +105,34 @@ - $goto(`../../portal/overview/${application}?tab=Access`)} + $goto(`../../portal/overview/${application}/access`)} > Access - $goto( - `../../portal/overview/${application}?tab=${encodeURIComponent( - "Automation History" - )}` - )} + $goto(`../../portal/overview/${application}/automation-history`)} > Automation history - $goto(`../../portal/overview/${application}?tab=Backups`)} + $goto(`../../portal/overview/${application}/backups`)} > Backups - $goto(`../../portal/overview/${application}?tab=Settings`)} + $goto(`../../portal/overview/${application}/name-and-url`)} > - Settings + Name and URL + + + $goto(`../../portal/overview/${application}/version`)} + > + Version {$store.name || "App"} From 7c11b82e5764832fa6cb436385bfe3e0ecd87379 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 Jan 2023 11:22:47 +0000 Subject: [PATCH 049/387] Update plugin search placeholder --- packages/builder/src/pages/builder/portal/plugins/index.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/plugins/index.svelte b/packages/builder/src/pages/builder/portal/plugins/index.svelte index 32a5f7b977..6c87661986 100644 --- a/packages/builder/src/pages/builder/portal/plugins/index.svelte +++ b/packages/builder/src/pages/builder/portal/plugins/index.svelte @@ -90,7 +90,7 @@ autoWidth /> - + {/if} From 6b392561840d9cc1a1050961955cef181c07b6da Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 Jan 2023 11:22:59 +0000 Subject: [PATCH 050/387] Fix URLs in app overview --- .../src/pages/builder/portal/overview/[appId]/overview.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte index 385784ff2d..82bfc50628 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/overview.svelte @@ -168,7 +168,7 @@ title={"Version"} showIcon={true} action={() => { - $goto("../version") + $goto("./version") }} dataCy={"app-version"} > @@ -196,7 +196,7 @@ title={"Access"} showIcon={true} action={() => { - $goto("../access") + $goto("./access") }} dataCy={"access"} > From ee6abf9200b7c2e278fca5edfc26ea5157252afb Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 Jan 2023 11:26:01 +0000 Subject: [PATCH 051/387] Properly handle text overflow in plugins table --- .../_components/PluginNameRenderer.svelte | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/plugins/_components/PluginNameRenderer.svelte b/packages/builder/src/pages/builder/portal/plugins/_components/PluginNameRenderer.svelte index 8d9d71f636..c6642f3b4b 100644 --- a/packages/builder/src/pages/builder/portal/plugins/_components/PluginNameRenderer.svelte +++ b/packages/builder/src/pages/builder/portal/plugins/_components/PluginNameRenderer.svelte @@ -8,19 +8,29 @@ $: friendlyName = row?.schema?.schema?.friendlyName -
+
{#if icon} {/if} - {friendlyName || value} +
+ {friendlyName || value} +
From a456e18bde59b469365eda1c58b4a9b5a04b38ff Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 Jan 2023 11:33:14 +0000 Subject: [PATCH 052/387] Remove getting started checklist --- .../components/common/ConfigChecklist.svelte | 46 ------------------- .../src/pages/builder/portal/_layout.svelte | 3 -- packages/builder/src/stores/portal/admin.js | 6 --- 3 files changed, 55 deletions(-) delete mode 100644 packages/builder/src/components/common/ConfigChecklist.svelte diff --git a/packages/builder/src/components/common/ConfigChecklist.svelte b/packages/builder/src/components/common/ConfigChecklist.svelte deleted file mode 100644 index 91c5894f0d..0000000000 --- a/packages/builder/src/components/common/ConfigChecklist.svelte +++ /dev/null @@ -1,46 +0,0 @@ - - - -
- -
- -
- Get Started Checklist - -
- - {#each Object.keys($admin.checklist) as checklistItem, idx} - -
$goto($admin.checklist[checklistItem].link)} - > - {idx + 1}. {$admin.checklist[checklistItem].label} - -
- - {/each} - - - diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index f1dfc6ed99..ae9e21773f 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -187,9 +187,6 @@ {/each}
- {#if $auth.user?.admin?.global} - - {/if}
diff --git a/packages/builder/src/stores/portal/admin.js b/packages/builder/src/stores/portal/admin.js index 69a2c82349..ba95db64b7 100644 --- a/packages/builder/src/stores/portal/admin.js +++ b/packages/builder/src/stores/portal/admin.js @@ -12,7 +12,6 @@ export function createAdminStore() { disableAccountPortal: false, accountPortalUrl: "", importComplete: false, - onboardingProgress: 0, checklist: { apps: { checked: false }, smtp: { checked: false }, @@ -76,13 +75,8 @@ export function createAdminStore() { async function getChecklist() { const tenantId = get(auth).tenantId const checklist = await API.getChecklist(tenantId) - const totalSteps = Object.keys(checklist).length - const completedSteps = Object.values(checklist).filter( - x => x?.checked - ).length admin.update(store => { store.checklist = checklist - store.onboardingProgress = (completedSteps / totalSteps) * 100 return store }) } From 531fe63b4b3ae6936b75fec983a014d5ae11c4c9 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 Jan 2023 11:35:31 +0000 Subject: [PATCH 053/387] Fix checklist removal and fix profile modal --- packages/builder/src/pages/builder/portal/_layout.svelte | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index ae9e21773f..6e4557e106 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -18,13 +18,11 @@ import ThemeModal from "components/settings/ThemeModal.svelte" import APIKeyModal from "components/settings/APIKeyModal.svelte" import Logo from "assets/bb-emblem.svg" - import ConfigChecklist from "components/common/ConfigChecklist.svelte" // import { isEnabled, TENANT_FEATURE_FLAGS } from "helpers/featureFlags" let loaded = false let themeModal let profileModal - let userInfoModal let updatePasswordModal let apiKeyModal let mobileMenuVisible = false @@ -220,7 +218,7 @@ userInfoModal.show()} + on:click={() => profileModal.show()} dataCy="user-info" > My profile @@ -255,7 +253,7 @@ - + From b6e237874aab2ac0fb7d2ab71d0e16eecd22870f Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 Jan 2023 12:01:16 +0000 Subject: [PATCH 054/387] Update email details page to match new designs --- .../builder/portal/settings/_layout.svelte | 6 +- .../portal/settings/email/[template].svelte | 55 ++++++++----------- .../email/_components/TemplateBindings.svelte | 33 +++++++++-- .../pages/builder/portal/users/_layout.svelte | 4 +- 4 files changed, 56 insertions(+), 42 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/settings/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/_layout.svelte index 7f92d8b710..b2f9c029ae 100644 --- a/packages/builder/src/pages/builder/portal/settings/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/settings/_layout.svelte @@ -3,11 +3,11 @@ import { Page } from "@budibase/bbui" import { Content, SideNav, SideNavItem } from "components/portal/page" - $: narrow = !$isActive("./users/index") && !$isActive("./groups/index") + $: wide = $isActive("./email/:template") - - + +
- + + + + + + -
- $goto("./")} - quiet - size="S" - icon="BackAndroid" - > - Back to email settings - -
-
- - Email Template: {name} - - -
+ {name} {description}
@@ -96,8 +87,9 @@ on the right. +
- +
@@ -112,9 +104,9 @@ />
- Bindings + Bindings {#if mounted} - +
+ +
+ +
diff --git a/packages/builder/src/pages/builder/portal/users/_layout.svelte b/packages/builder/src/pages/builder/portal/users/_layout.svelte index 6507241ea6..08d5686fb7 100644 --- a/packages/builder/src/pages/builder/portal/users/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/users/_layout.svelte @@ -4,11 +4,11 @@ import { isEnabled, TENANT_FEATURE_FLAGS } from "helpers/featureFlags" import { isActive, url } from "@roxi/routify" - $: narrow = !$isActive("./users/index") && !$isActive("./groups/index") + $: wide = $isActive("./users/index") || $isActive("./groups/index") - +
Date: Mon, 9 Jan 2023 12:06:45 +0000 Subject: [PATCH 055/387] Cleanup --- packages/builder/src/pages/builder/portal/users/_layout.svelte | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/users/_layout.svelte b/packages/builder/src/pages/builder/portal/users/_layout.svelte index 08d5686fb7..f9c9be94b7 100644 --- a/packages/builder/src/pages/builder/portal/users/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/users/_layout.svelte @@ -1,7 +1,6 @@
+ - + + {#if $admin.cloud && $auth?.user?.accountPortalAccess} + + {:else if !$admin.cloud && admin} + + {/if} + + {#if $auth?.user?.accountPortalAccess && $auth.user.account.stripeCustomerId} + + {/if}
diff --git a/packages/builder/src/pages/builder/portal/settings/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/_layout.svelte index b2f9c029ae..57410bcaeb 100644 --- a/packages/builder/src/pages/builder/portal/settings/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/settings/_layout.svelte @@ -2,6 +2,7 @@ import { url, isActive } from "@roxi/routify" import { Page } from "@budibase/bbui" import { Content, SideNav, SideNavItem } from "components/portal/page" + import { admin } from "stores/portal" $: wide = $isActive("./email/:template") @@ -25,11 +26,13 @@ url={$url("./organisation")} active={$isActive("./organisation")} /> - + {#if !$admin.cloud} + + {/if}
From c9d8668062898855420bab2f77c1d5b6a95bd1af Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 9 Jan 2023 15:42:09 +0000 Subject: [PATCH 057/387] Licensing updates for environment variables. --- packages/backend-core/src/constants/db.ts | 1 + packages/server/src/api/routes/index.ts | 2 ++ packages/types/src/sdk/licensing/feature.ts | 1 + 3 files changed, 4 insertions(+) diff --git a/packages/backend-core/src/constants/db.ts b/packages/backend-core/src/constants/db.ts index 92392457d6..f7d15b3880 100644 --- a/packages/backend-core/src/constants/db.ts +++ b/packages/backend-core/src/constants/db.ts @@ -77,6 +77,7 @@ export const StaticDatabases = { apiKeys: "apikeys", usageQuota: "usage_quota", licenseInfo: "license_info", + environmentVariables: "environmentvariables", }, }, // contains information about tenancy and so on diff --git a/packages/server/src/api/routes/index.ts b/packages/server/src/api/routes/index.ts index 8d6b1754a7..9dc119ec83 100644 --- a/packages/server/src/api/routes/index.ts +++ b/packages/server/src/api/routes/index.ts @@ -33,6 +33,7 @@ export { default as publicRoutes } from "./public" const appBackupRoutes = pro.appBackups const scheduleRoutes = pro.schedules +const environmentVariableRoutes = pro.environmentVariables export const mainRoutes: Router[] = [ appBackupRoutes, @@ -63,6 +64,7 @@ export const mainRoutes: Router[] = [ migrationRoutes, pluginRoutes, scheduleRoutes, + environmentVariableRoutes, // these need to be handled last as they still use /api/:tableId // this could be breaking as koa may recognise other routes as this tableRoutes, diff --git a/packages/types/src/sdk/licensing/feature.ts b/packages/types/src/sdk/licensing/feature.ts index f06a8d1382..a39bcab18b 100644 --- a/packages/types/src/sdk/licensing/feature.ts +++ b/packages/types/src/sdk/licensing/feature.ts @@ -1,4 +1,5 @@ export enum Feature { USER_GROUPS = "userGroups", APP_BACKUPS = "appBackups", + ENVIRONMENT_VARIABLES = "environmentVariables", } From 0aa72e51473ec492ff53f2f9dec703d9b4e01aed Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 9 Jan 2023 16:16:03 +0000 Subject: [PATCH 058/387] Update upgrade button URL for cloud accounts --- .../builder/src/pages/builder/portal/_layout.svelte | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 99a140f16a..ad8330f52f 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -140,7 +140,16 @@ alt={$organisation?.company || "Budibase"} />
- {#if !$adminStore.cloud && $auth.isAdmin} + {#if $adminStore.cloud && $auth?.user?.accountPortalAccess} + + {:else if !$adminStore.cloud && $auth.isAdmin} From 7378d21fea565c388759ba4964cfcf58039738b8 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Mon, 9 Jan 2023 16:48:39 +0000 Subject: [PATCH 059/387] environment variables ui boilerplate --- .../portal/manage/envVars/index.svelte | 39 +++++++++++++++++++ packages/builder/src/stores/portal/envVars.js | 20 ++++++++++ packages/frontend-core/src/api/envVars.js | 11 ++++++ 3 files changed, 70 insertions(+) create mode 100644 packages/builder/src/pages/builder/portal/manage/envVars/index.svelte create mode 100644 packages/builder/src/stores/portal/envVars.js create mode 100644 packages/frontend-core/src/api/envVars.js diff --git a/packages/builder/src/pages/builder/portal/manage/envVars/index.svelte b/packages/builder/src/pages/builder/portal/manage/envVars/index.svelte new file mode 100644 index 0000000000..9fb19fe676 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/manage/envVars/index.svelte @@ -0,0 +1,39 @@ + + + + + Envrironment Variables + Add and manage environment variable for development and production + + + + {#each $envVars as envVar} + + {envVar} + + + {/each} + + + + diff --git a/packages/builder/src/stores/portal/envVars.js b/packages/builder/src/stores/portal/envVars.js new file mode 100644 index 0000000000..9c9880511a --- /dev/null +++ b/packages/builder/src/stores/portal/envVars.js @@ -0,0 +1,20 @@ +import { writable } from "svelte/store" +import { API } from "api" + +export function createEnvVarsStore() { + const { subscribe, set, update } = writable([]) + + async function load() { + const envVars = await API.fetchEnvVars() + + let testVars = ['blah', 'blah123'] + set(testVars) + } + + return { + subscribe, + load, + } +} + +export const envVars = createEnvVarsStore() diff --git a/packages/frontend-core/src/api/envVars.js b/packages/frontend-core/src/api/envVars.js new file mode 100644 index 0000000000..5f02a2b889 --- /dev/null +++ b/packages/frontend-core/src/api/envVars.js @@ -0,0 +1,11 @@ +export const buildEnvironmentVariableEndpoints = API => ({ + /** + * Fetches a list of environment variables + */ + fetchEnvVars: async () => { + return await API.get({ + url: `/api/env/variables`, + json: false, + }) + } +}) From 7a78a0bf669dbeb0b2438651f78a61ef06886bfd Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Mon, 9 Jan 2023 16:49:29 +0000 Subject: [PATCH 060/387] more boilerplate --- packages/builder/src/pages/builder/portal/_layout.svelte | 4 ++++ .../portal/{manage/envVars => environment}/index.svelte | 0 2 files changed, 4 insertions(+) rename packages/builder/src/pages/builder/portal/{manage/envVars => environment}/index.svelte (100%) diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 99a140f16a..a4bd22a692 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -53,6 +53,10 @@ title: "Plugins", href: "/builder/portal/plugins", }, + { + title: "Environment", + href: "/builder/portal/environment", + }, ] // Admin only pages diff --git a/packages/builder/src/pages/builder/portal/manage/envVars/index.svelte b/packages/builder/src/pages/builder/portal/environment/index.svelte similarity index 100% rename from packages/builder/src/pages/builder/portal/manage/envVars/index.svelte rename to packages/builder/src/pages/builder/portal/environment/index.svelte From 2bf724b9b3bdc9bb5fc76e55059e7d9bb7d946b3 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 10 Jan 2023 09:50:32 +0000 Subject: [PATCH 061/387] Updated cleanExportRows import --- packages/server/src/api/controllers/row/external.ts | 2 +- packages/server/src/api/controllers/row/internal.ts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts index 77168b61c9..02c218c7e3 100644 --- a/packages/server/src/api/controllers/row/external.ts +++ b/packages/server/src/api/controllers/row/external.ts @@ -20,7 +20,7 @@ import { Datasource, } from "@budibase/types" -const { cleanExportRows } = require("../row/utils") +const { cleanExportRows } = require("./utils") export async function handleRequest( operation: Operation, diff --git a/packages/server/src/api/controllers/row/internal.ts b/packages/server/src/api/controllers/row/internal.ts index 824520d8f8..e422d63ec5 100644 --- a/packages/server/src/api/controllers/row/internal.ts +++ b/packages/server/src/api/controllers/row/internal.ts @@ -38,6 +38,8 @@ import { Table, } from "@budibase/types" +const { cleanExportRows } = require("./utils") + const CALCULATION_TYPES = { SUM: "sum", COUNT: "count", @@ -417,7 +419,7 @@ export async function exportRows(ctx: Ctx) { let rows: Row[] = [] let schema = table.schema - // // Filter data to only specified columns if required + // Filter data to only specified columns if required if (columns && columns.length) { for (let i = 0; i < result.length; i++) { rows[i] = {} @@ -429,8 +431,7 @@ export async function exportRows(ctx: Ctx) { rows = result } - // @ts-ignore - let exportRows = cleanExportRows(rows, schema, format, columns) //this isnt correct + let exportRows = cleanExportRows(rows, schema, format, columns) let headers = Object.keys(schema) // @ts-ignore From a38d1ec583ee031203c8f3885fdad357c6d99fdc Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 11 Jan 2023 08:10:56 +0000 Subject: [PATCH 062/387] Update app list to use a more compact style --- packages/bbui/src/Layout/Page.svelte | 1 + .../src/components/common/AppLockModal.svelte | 3 +- .../src/components/start/AppRow.svelte | 84 ++++++++----------- .../src/pages/builder/portal/_layout.svelte | 33 ++++---- .../pages/builder/portal/apps/index.svelte | 13 +-- 5 files changed, 58 insertions(+), 76 deletions(-) diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte index 02f089b340..6a417d33d6 100644 --- a/packages/bbui/src/Layout/Page.svelte +++ b/packages/bbui/src/Layout/Page.svelte @@ -42,6 +42,7 @@ justify-content: flex-start; align-items: stretch; flex: 1 1 auto; + overflow-x: hidden; } .main { overflow: auto; diff --git a/packages/builder/src/components/common/AppLockModal.svelte b/packages/builder/src/components/common/AppLockModal.svelte index 74e1b12615..5e52ab269c 100644 --- a/packages/builder/src/components/common/AppLockModal.svelte +++ b/packages/builder/src/components/common/AppLockModal.svelte @@ -63,7 +63,8 @@ name="LockClosed" hoverable size={buttonSize} - on:click={() => { + on:click={e => { + e.stopPropagation() appLockModal.show() }} /> diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index a1a9cf69f7..6400891e15 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -8,41 +8,39 @@ export let appOverview -
-
-
-
- -
-
editApp(app)}> - - {app.name} - -
+
editApp(app)}> +
+
+
+
+ + {app.name} + +
+
-
- {#if app.updatedAt} - {processStringSync("Updated {{ duration time 'millisecond' }} ago", { - time: new Date().getTime() - new Date(app.updatedAt).getTime(), - })} - {:else} - Never updated - {/if} -
+
+ {#if app.updatedAt} + {processStringSync("Updated {{ duration time 'millisecond' }} ago", { + time: new Date().getTime() - new Date(app.updatedAt).getTime(), + })} + {:else} + Never updated + {/if}
- {`${window.origin}/app${app.url}`} + {app.deployed ? "Published" : "Unpublished"}
+ + - -
@@ -64,24 +58,26 @@ background: var(--background); padding: 24px 32px; border-radius: 8px; - display: flex; - flex-direction: column; - justify-content: flex-start; - align-items: stretch; - gap: var(--spacing-m); - } - - .header { - display: flex; - flex-direction: row; - justify-content: space-between; + display: grid; + grid-template-columns: 35% 25% 15% auto; align-items: center; + gap: var(--spacing-m); + transition: border 130ms ease-out; + border: 1px solid transparent; + } + .app-row:hover { + cursor: pointer; + border-color: var(--spectrum-global-color-gray-300); } .updated { color: var(--spectrum-global-color-gray-700); } + .title, + .name { + flex: 1 1 auto; + } .title, .app-status { display: flex; @@ -106,9 +102,8 @@ gap: var(--spacing-m); display: flex; flex-direction: row; - justify-content: flex-start; + justify-content: flex-end; align-items: center; - margin-top: var(--spacing-m); } .name { @@ -120,11 +115,6 @@ white-space: nowrap; text-overflow: ellipsis; } - .title :global(h1:hover) { - color: var(--spectrum-global-color-blue-600); - cursor: pointer; - transition: color 130ms ease; - } @media (max-width: 640px) { .desktop { diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index ad8330f52f..56028117c9 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -134,12 +134,6 @@
- {#if $adminStore.cloud && $auth?.user?.accountPortalAccess}
-
+
{#each filteredApps as app (app.appId)} {/each} @@ -369,19 +367,14 @@ gap: var(--spacing-xl); } - .appTable { + .app-table { display: flex; flex-direction: column; justify-content: flex-start; align-items: stretch; - gap: 24px; + gap: var(--spacing-xl); } - @media (max-width: 640px) { - .appTable { - grid-template-columns: 1fr auto !important; - } - } .empty-wrapper { flex: 1 1 auto; height: 100%; From 68711728223f3ede9cefbfbbfac806e82f705516 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 11 Jan 2023 08:29:57 +0000 Subject: [PATCH 063/387] Make core page layout responsive and update apps list to be responsive --- packages/bbui/src/Layout/Page.svelte | 13 +++++++++-- .../src/components/start/AppRow.svelte | 23 +++++++++++++++++-- .../src/pages/builder/portal/_layout.svelte | 13 ++++------- .../pages/builder/portal/apps/index.svelte | 1 + 4 files changed, 38 insertions(+), 12 deletions(-) diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte index 6a417d33d6..6e3cc55c12 100644 --- a/packages/bbui/src/Layout/Page.svelte +++ b/packages/bbui/src/Layout/Page.svelte @@ -58,10 +58,10 @@ padding: 50px; z-index: 1; } - .wide { + .content.wide { max-width: none; } - .narrow { + .content.narrow { max-width: 840px; } #side-panel { @@ -82,4 +82,13 @@ #side-panel.visible { transform: translateX(0); } + + @media (max-width: 640px) { + .content { + padding: 24px; + max-width: calc(100vw - 48px) !important; + width: calc(100vw - 48px) !important; + overflow: auto; + } + } diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index 6400891e15..2868b7453b 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -78,6 +78,9 @@ .name { flex: 1 1 auto; } + .name { + width: 0; + } .title, .app-status { display: flex; @@ -116,9 +119,25 @@ text-overflow: ellipsis; } + @media (max-width: 1000px) { + .app-row { + grid-template-columns: 45% 30% auto; + } + .updated { + display: none; + } + } + @media (max-width: 800px) { + .app-row { + grid-template-columns: 1fr auto; + } + .app-status { + display: none; + } + } @media (max-width: 640px) { - .desktop { - display: none !important; + .app-row { + padding: 24px 20px; } } diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 56028117c9..958ffc180a 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -228,7 +228,7 @@ justify-content: flex-start; align-items: stretch; border-bottom: var(--border-light); - padding: 0 20px; + padding: 0 24px; gap: 24px; position: relative; } @@ -265,8 +265,7 @@ align-items: center; gap: 24px; } - .mobile-toggle, - .mobile-logo { + .mobile-toggle { display: none; } .user-dropdown { @@ -278,7 +277,6 @@ width: 30px; height: 30px; } - .main { flex: 1 1 auto; display: flex; @@ -289,14 +287,15 @@ } @media (max-width: 640px) { + .nav { + flex: 0 0 64px; + } .toolbar { display: flex; flex-direction: row; justify-content: space-between; align-items: center; - padding: var(--spacing-m) calc(var(--spacing-xl) * 1.5); } - .branding { position: absolute; left: 50%; @@ -309,11 +308,9 @@ .toolbar :global(.spectrum-Button) { display: none; } - .mobile-toggle { display: block; } - .mobile-toggle, .user-dropdown { flex: 0 1 0; diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 953552be9b..3442d68aab 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -373,6 +373,7 @@ justify-content: flex-start; align-items: stretch; gap: var(--spacing-xl); + overflow: hidden; } .empty-wrapper { From db4714d69cb544afe15494cd1c20bebf9ebba048 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 11 Jan 2023 08:37:38 +0000 Subject: [PATCH 064/387] Update mobile design of apps page --- .../src/components/start/AppRow.svelte | 2 +- .../src/pages/builder/portal/_layout.svelte | 2 +- .../pages/builder/portal/apps/index.svelte | 24 +++++++++++++++---- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte index 2868b7453b..47cf2d20a4 100644 --- a/packages/builder/src/components/start/AppRow.svelte +++ b/packages/builder/src/components/start/AppRow.svelte @@ -137,7 +137,7 @@ } @media (max-width: 640px) { .app-row { - padding: 24px 20px; + padding: 20px; } } diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 958ffc180a..a43f294d0c 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -288,7 +288,7 @@ @media (max-width: 640px) { .nav { - flex: 0 0 64px; + flex: 0 0 52px; } .toolbar { display: flex; diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 3442d68aab..bcb95ab248 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -354,11 +354,6 @@ gap: var(--spacing-xl); flex-wrap: wrap; } - @media (max-width: 1000px) { - .img-logo { - display: none; - } - } .app-actions { display: flex; flex-direction: row; @@ -388,4 +383,23 @@ width: 160px; height: 160px; } + + @media (max-width: 1000px) { + .img-logo { + display: none; + } + } + @media (max-width: 640px) { + .app-actions { + margin-top: var(--spacing-xl); + margin-bottom: calc(-1 * var(--spacing-m)); + } + /* Hide download apps icon */ + .app-actions :global(> .spectrum-Icon) { + display: none; + } + .app-actions > :global(*) { + flex: 0 0 50%; + } + } From 34adcdcddf69f66eed70ff6ca4f48d882e96efbf Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 11 Jan 2023 09:11:35 +0000 Subject: [PATCH 065/387] Update more pages to be responsive and add mobile specific components --- packages/bbui/src/Layout/Page.svelte | 1 + .../src/components/portal/page/Content.svelte | 12 +++- .../src/components/portal/page/Header.svelte | 17 ++++- .../src/components/portal/page/SideNav.svelte | 8 +++ .../portal/overview/[appId]/_layout.svelte | 70 +++++++++++++------ 5 files changed, 86 insertions(+), 22 deletions(-) diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte index 6e3cc55c12..15aabd2c61 100644 --- a/packages/bbui/src/Layout/Page.svelte +++ b/packages/bbui/src/Layout/Page.svelte @@ -72,6 +72,7 @@ background: var(--background); border-left: var(--border-light); width: 320px; + max-width: calc(100vw - 48px - 48px); overflow: auto; overflow-x: hidden; transform: translateX(100%); diff --git a/packages/builder/src/components/portal/page/Content.svelte b/packages/builder/src/components/portal/page/Content.svelte index e6ef93a179..083467b49b 100644 --- a/packages/builder/src/components/portal/page/Content.svelte +++ b/packages/builder/src/components/portal/page/Content.svelte @@ -1,9 +1,10 @@
-
+
@@ -28,4 +29,13 @@ .main.narrow { max-width: 600px; } + + @media (max-width: 640px) { + .content { + flex-direction: column; + } + .side-nav:not(.show-mobile) { + display: none; + } + } diff --git a/packages/builder/src/components/portal/page/Header.svelte b/packages/builder/src/components/portal/page/Header.svelte index be75c5271b..19a2cd59a8 100644 --- a/packages/builder/src/components/portal/page/Header.svelte +++ b/packages/builder/src/components/portal/page/Header.svelte @@ -2,9 +2,10 @@ import { Heading } from "@budibase/bbui" export let title + export let wrap = true -
+
{title}
@@ -20,10 +21,19 @@ align-items: center; gap: var(--spacing-xl); } + .header.wrap { + flex-wrap: wrap; + } .header :global(.spectrum-Heading) { flex: 1 1 auto; margin-top: -2px; } + .header:not(.wrap) :global(.spectrum-Heading) { + overflow: hidden; + width: 0; + white-space: nowrap; + text-overflow: ellipsis; + } .buttons { display: flex; flex-direction: row; @@ -34,4 +44,9 @@ .buttons :global(> div) { display: contents; } + @media (max-width: 640px) { + .wrap .buttons { + margin-bottom: var(--spacing-m); + } + } diff --git a/packages/builder/src/components/portal/page/SideNav.svelte b/packages/builder/src/components/portal/page/SideNav.svelte index fdd54b2182..e3e485fa30 100644 --- a/packages/builder/src/components/portal/page/SideNav.svelte +++ b/packages/builder/src/components/portal/page/SideNav.svelte @@ -23,4 +23,12 @@ color: var(--spectrum-global-color-gray-700); margin-bottom: var(--spacing-m); } + + @media (max-width: 640px) { + .side-nav { + border-bottom: var(--border-light); + margin: 0 -24px; + padding: 0 24px 32px 24px; + } + } diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte index ef571a1edf..c1165d8550 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte @@ -120,7 +120,7 @@ -
+
- - + + + + + + + + + View + + + + + Edit + + exportApp({ published: false })} icon="DownloadFromCloud" @@ -177,7 +195,7 @@
- + {/key} + + From e9d20a885b6c96e3f2313ba9b3e5451080750bf2 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 11 Jan 2023 10:13:19 +0000 Subject: [PATCH 066/387] Refactor main portal page into multiple components --- .../src/components/portal/page/Content.svelte | 5 + .../src/components/portal/page/SideNav.svelte | 8 - .../builder/portal/_components/Logo.svelte | 13 ++ .../portal/_components/MobileMenu.svelte | 79 +++++++ .../portal/_components/UpgradeButton.svelte | 20 ++ .../portal/_components/UserDropdown.svelte | 78 +++++++ .../src/pages/builder/portal/_layout.svelte | 202 ++++-------------- 7 files changed, 236 insertions(+), 169 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/_components/Logo.svelte create mode 100644 packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte create mode 100644 packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte create mode 100644 packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte diff --git a/packages/builder/src/components/portal/page/Content.svelte b/packages/builder/src/components/portal/page/Content.svelte index 083467b49b..d542dfcf56 100644 --- a/packages/builder/src/components/portal/page/Content.svelte +++ b/packages/builder/src/components/portal/page/Content.svelte @@ -37,5 +37,10 @@ .side-nav:not(.show-mobile) { display: none; } + .side-nav.show-mobile :global(.side-nav) { + border-bottom: var(--border-light); + margin: 0 -24px; + padding: 0 24px 32px 24px; + } } diff --git a/packages/builder/src/components/portal/page/SideNav.svelte b/packages/builder/src/components/portal/page/SideNav.svelte index e3e485fa30..fdd54b2182 100644 --- a/packages/builder/src/components/portal/page/SideNav.svelte +++ b/packages/builder/src/components/portal/page/SideNav.svelte @@ -23,12 +23,4 @@ color: var(--spectrum-global-color-gray-700); margin-bottom: var(--spacing-m); } - - @media (max-width: 640px) { - .side-nav { - border-bottom: var(--border-light); - margin: 0 -24px; - padding: 0 24px 32px 24px; - } - } diff --git a/packages/builder/src/pages/builder/portal/_components/Logo.svelte b/packages/builder/src/pages/builder/portal/_components/Logo.svelte new file mode 100644 index 0000000000..8276510201 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/_components/Logo.svelte @@ -0,0 +1,13 @@ + + +Budibase Logo $goto("./apps")} /> + + diff --git a/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte b/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte new file mode 100644 index 0000000000..bfb08f9b36 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte @@ -0,0 +1,79 @@ + + +{#if visible} +
+{/if} +
+ +
+ +
+ + {#each menu as { title, href }} + + {/each} + +
+ +
+ +
+ + diff --git a/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte b/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte new file mode 100644 index 0000000000..29066b8117 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte @@ -0,0 +1,20 @@ + + +{#if $admin.cloud && $auth?.user?.accountPortalAccess} + +{:else if !$admin.cloud && $auth.isAdmin} + +{/if} diff --git a/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte b/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte new file mode 100644 index 0000000000..552e9247fc --- /dev/null +++ b/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte @@ -0,0 +1,78 @@ + + + +
+ + +
+ themeModal.show()} dataCy="theme"> + Theme + + profileModal.show()} + dataCy="user-info" + > + My profile + + updatePasswordModal.show()}> + Update password + + apiKeyModal.show()} dataCy="api-key"> + View API key + + $goto("../apps")}> + Close developer mode + + + Log out + + + + + + + + + + + + + + + + + diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index a43f294d0c..9048502550 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -1,30 +1,15 @@ -
editApp(app)}> +
@@ -35,21 +56,12 @@ {app.deployed ? "Published" : "Unpublished"}
-
-
- - - -
+
+ + +
@@ -139,5 +151,8 @@ .app-row { padding: 20px; } + .app-row-actions { + display: none; + } } diff --git a/packages/builder/src/pages/builder/portal/apps/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/_layout.svelte index 159daae608..fe10d4b08a 100644 --- a/packages/builder/src/pages/builder/portal/apps/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/apps/_layout.svelte @@ -4,7 +4,8 @@ import { onMount } from "svelte" import { goto } from "@roxi/routify" - let loaded = false + // Don't block loading if we've already hydrated state + let loaded = $apps.length > 0 onMount(async () => { try { diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index bcb95ab248..519fde7f23 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -178,20 +178,6 @@ creatingApp = false } - const appOverview = app => { - $goto(`../overview/${app.devId}`) - } - - const editApp = app => { - if (app.lockedOther) { - notifications.error( - `App locked by ${app.lockedBy.email}. Please allow lock to expire or have them unlock this app.` - ) - return - } - $goto(`../../app/${app.devId}`) - } - function createAppFromTemplateUrl(templateKey) { // validate the template key just to make sure const templateParts = templateKey.split("/") @@ -309,7 +295,7 @@
{#each filteredApps as app (app.appId)} - + {/each}
diff --git a/packages/builder/src/pages/builder/portal/plugins/index.svelte b/packages/builder/src/pages/builder/portal/plugins/index.svelte index 6c87661986..6e25944742 100644 --- a/packages/builder/src/pages/builder/portal/plugins/index.svelte +++ b/packages/builder/src/pages/builder/portal/plugins/index.svelte @@ -20,6 +20,7 @@ const schema = { name: { width: "2fr", + minWidth: "200px", }, version: { width: "1fr", @@ -28,6 +29,7 @@ width: "1fr", displayName: "Type", capitalise: true, + minWidth: "120px", }, edit: { width: "auto", @@ -119,8 +121,19 @@ display: flex; gap: var(--spacing-xl); justify-content: space-between; + flex-wrap: wrap; } .controls :global(.spectrum-Search) { width: 200px; } + + @media (max-width: 640px) { + .filters { + display: grid; + grid-template-columns: 1fr 1fr; + } + .controls :global(.spectrum-Search) { + width: auto; + } + } diff --git a/packages/builder/src/pages/builder/portal/users/groups/index.svelte b/packages/builder/src/pages/builder/portal/users/groups/index.svelte index 04b6030b16..25c8702f6b 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/index.svelte @@ -40,7 +40,7 @@ ] $: schema = { - name: { displayName: "Group", width: "2fr" }, + name: { displayName: "Group", width: "2fr", minWidth: "200px" }, users: { sortable: false, width: "1fr" }, roles: { sortable: false, displayName: "Apps", width: "1fr" }, } diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte index 384475e89e..ba49bb2946 100644 --- a/packages/builder/src/pages/builder/portal/users/users/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte @@ -57,6 +57,7 @@ email: { sortable: false, width: "2fr", + minWidth: "200px", }, role: { sortable: false, @@ -296,6 +297,8 @@ flex-direction: row; justify-content: space-between; align-items: center; + flex-wrap: wrap; + gap: var(--spacing-xl); } .controls-right { From 3d76b07a9afcd600cad1a637674997b975e79b14 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 11 Jan 2023 12:09:58 +0000 Subject: [PATCH 068/387] Make automation history page responsive --- .../[appId]/automation-history/index.svelte | 100 +++++++++--------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte index 30f77696f4..78ab2abe52 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/automation-history/index.svelte @@ -155,47 +155,47 @@ -
-
- -
-
- +
+
+ { + if (licensePlan?.type === Constants.PlanType.FREE) { + return ["1-w", "30-d", "90-d"].indexOf(x.value) < 0 + } else if (licensePlan?.type === Constants.PlanType.TEAM) { + return ["90-d"].indexOf(x.value) < 0 + } else if (licensePlan?.type === Constants.PlanType.PRO) { + return ["30-d", "90-d"].indexOf(x.value) < 0 + } + return true + }} + /> +
{#if (licensePlan?.type !== Constants.PlanType.ENTERPRISE && $auth.user.accountPortalAccess) || !$admin.cloud} -
- -
+ {/if}
@@ -236,14 +236,24 @@ {/if} From 4ddb63d79c307608ebf243ccb3d67653a73c6b16 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 11 Jan 2023 16:39:32 +0000 Subject: [PATCH 069/387] Update backups page to be responsive --- .../overview/[appId]/backups/index.svelte | 67 ++++++++++--------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte index 860d8dacad..42e3cd19a9 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/backups/index.svelte @@ -14,7 +14,6 @@ Tags, Tag, Table, - Page, } from "@budibase/bbui" import { backups, licensing, auth, admin, overview } from "stores/portal" import { createPaginationStore } from "helpers/pagination" @@ -223,29 +222,30 @@
{:else if loaded} -
-
- filter.value} + getOptionLabel={filter => filter.label} + bind:value={filterOpt} + /> +
+ { + if (e.detail[0].length > 1) { + startDate = e.detail[0][0].toISOString() + endDate = e.detail[0][1].toISOString() + } + }} />
- { - if (e.detail[0].length > 1) { - startDate = e.detail[0][0].toISOString() - endDate = e.detail[0][1].toISOString() - } - }} - /> - -
+
Create new backup @@ -291,15 +291,29 @@ gap: var(--spacing-xl); } + .controls { + display: flex; + flex-direction: row; + justify-content: flex-start; + align-items: flex-end; + gap: var(--spacing-xl); + flex-wrap: wrap; + } + .search { + flex: 1 1 auto; display: flex; gap: var(--spacing-xl); - width: 100%; align-items: flex-end; } + .search :global(.spectrum-InputGroup) { + min-width: 100px; + } .select { flex-basis: 160px; + width: 0; + min-width: 100px; } .pagination { @@ -309,13 +323,6 @@ margin-top: var(--spacing-xl); } - .split-buttons { - display: flex; - align-items: center; - justify-content: flex-end; - flex: 1; - } - .title { display: flex; flex-direction: row; From 03df57d077254c9e99c858c63bb20216a2b4ec17 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 11 Jan 2023 17:57:51 +0000 Subject: [PATCH 070/387] Adding in basic implementation of variable usage, getting from pro and enriching through new datasource SDK. --- .../backend-core/src/security/encryption.ts | 8 +- packages/builder/src/stores/portal/envVars.js | 20 +- packages/builder/yarn.lock | 1018 +---------------- packages/frontend-core/src/api/envVars.js | 18 +- packages/server/__mocks__/node-fetch.ts | 2 + .../server/src/api/controllers/datasource.ts | 13 +- .../server/src/api/controllers/query/index.ts | 23 +- .../api/controllers/row/ExternalRequest.ts | 4 +- .../src/api/controllers/row/external.ts | 7 +- .../server/src/api/controllers/row/utils.ts | 4 +- .../src/api/controllers/static/index.ts | 37 +- .../src/api/controllers/table/external.ts | 14 +- .../server/src/integrations/base/query.ts | 4 +- .../src/sdk/app/datasources/datasources.ts | 24 + .../server/src/sdk/app/datasources/index.ts | 5 + packages/server/src/sdk/app/tables/index.ts | 9 +- packages/server/src/sdk/index.ts | 2 + packages/server/src/threads/query.ts | 5 +- .../types/src/documents/app/datasource.ts | 2 +- 19 files changed, 136 insertions(+), 1083 deletions(-) create mode 100644 packages/server/src/sdk/app/datasources/datasources.ts create mode 100644 packages/server/src/sdk/app/datasources/index.ts diff --git a/packages/backend-core/src/security/encryption.ts b/packages/backend-core/src/security/encryption.ts index a9006f302d..c673263202 100644 --- a/packages/backend-core/src/security/encryption.ts +++ b/packages/backend-core/src/security/encryption.ts @@ -12,9 +12,9 @@ function stretchString(string: string, salt: Buffer) { return crypto.pbkdf2Sync(string, salt, ITERATIONS, STRETCH_LENGTH, "sha512") } -export function encrypt(input: string) { +export function encrypt(input: string, secret: string | undefined = SECRET) { const salt = crypto.randomBytes(RANDOM_BYTES) - const stretched = stretchString(SECRET!, salt) + const stretched = stretchString(secret!, salt) const cipher = crypto.createCipheriv(ALGO, stretched, salt) const base = cipher.update(input) const final = cipher.final() @@ -22,10 +22,10 @@ export function encrypt(input: string) { return `${salt.toString("hex")}${SEPARATOR}${encrypted}` } -export function decrypt(input: string) { +export function decrypt(input: string, secret: string | undefined = SECRET) { const [salt, encrypted] = input.split(SEPARATOR) const saltBuffer = Buffer.from(salt, "hex") - const stretched = stretchString(SECRET!, saltBuffer) + const stretched = stretchString(secret!, saltBuffer) const decipher = crypto.createDecipheriv(ALGO, stretched, saltBuffer) const base = decipher.update(Buffer.from(encrypted, "hex")) const final = decipher.final() diff --git a/packages/builder/src/stores/portal/envVars.js b/packages/builder/src/stores/portal/envVars.js index 9c9880511a..00cae9e59a 100644 --- a/packages/builder/src/stores/portal/envVars.js +++ b/packages/builder/src/stores/portal/envVars.js @@ -2,19 +2,19 @@ import { writable } from "svelte/store" import { API } from "api" export function createEnvVarsStore() { - const { subscribe, set, update } = writable([]) + const { subscribe, set, update } = writable([]) - async function load() { - const envVars = await API.fetchEnvVars() + async function load() { + const envVars = await API.fetchEnvVars() - let testVars = ['blah', 'blah123'] - set(testVars) - } + let testVars = ["blah", "blah123"] + set(testVars) + } - return { - subscribe, - load, - } + return { + subscribe, + load, + } } export const envVars = createEnvVarsStore() diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index 90d60e4cf7..bf3f7defb7 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -2,11 +2,6 @@ # yarn lockfile v1 -"@adobe/spectrum-css-workflow-icons@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4" - integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w== - "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" @@ -920,136 +915,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/bbui@2.2.10-alpha.13": - version "2.2.10-alpha.13" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.2.10-alpha.13.tgz#42bf24c5df4cea74a69fba571423fcf4527f16fa" - integrity sha512-l6TYaqizIxjIonqgyYewsEvWK+H+xwKTrJrQTHSsw5MWxKY+MZoh+i+pUM5tQKwpG0Z6kg3iZSYvm0GUk3HGFw== - dependencies: - "@adobe/spectrum-css-workflow-icons" "1.2.1" - "@budibase/string-templates" "2.2.10-alpha.13" - "@spectrum-css/actionbutton" "1.0.1" - "@spectrum-css/actiongroup" "1.0.1" - "@spectrum-css/avatar" "3.0.2" - "@spectrum-css/button" "3.0.1" - "@spectrum-css/buttongroup" "3.0.2" - "@spectrum-css/checkbox" "3.0.2" - "@spectrum-css/dialog" "3.0.1" - "@spectrum-css/divider" "1.0.3" - "@spectrum-css/dropzone" "3.0.2" - "@spectrum-css/fieldgroup" "3.0.2" - "@spectrum-css/fieldlabel" "3.0.1" - "@spectrum-css/icon" "3.0.1" - "@spectrum-css/illustratedmessage" "3.0.2" - "@spectrum-css/inlinealert" "2.0.1" - "@spectrum-css/inputgroup" "3.0.2" - "@spectrum-css/label" "2.0.10" - "@spectrum-css/link" "3.1.1" - "@spectrum-css/menu" "3.0.1" - "@spectrum-css/modal" "3.0.1" - "@spectrum-css/pagination" "3.0.3" - "@spectrum-css/picker" "1.0.1" - "@spectrum-css/popover" "3.0.1" - "@spectrum-css/progressbar" "1.0.2" - "@spectrum-css/progresscircle" "1.0.2" - "@spectrum-css/radio" "3.0.2" - "@spectrum-css/search" "3.0.2" - "@spectrum-css/sidenav" "3.0.2" - "@spectrum-css/slider" "3.0.1" - "@spectrum-css/statuslight" "3.0.2" - "@spectrum-css/stepper" "3.0.3" - "@spectrum-css/switch" "1.0.2" - "@spectrum-css/table" "3.0.1" - "@spectrum-css/tabs" "3.2.12" - "@spectrum-css/tags" "3.0.2" - "@spectrum-css/textfield" "3.0.1" - "@spectrum-css/toast" "3.0.1" - "@spectrum-css/tooltip" "3.0.3" - "@spectrum-css/treeview" "3.0.2" - "@spectrum-css/typography" "3.0.1" - "@spectrum-css/underlay" "2.0.9" - "@spectrum-css/vars" "3.0.1" - dayjs "^1.10.4" - easymde "^2.16.1" - svelte-flatpickr "^3.2.3" - svelte-portal "^1.0.0" - -"@budibase/client@2.2.10-alpha.13": - version "2.2.10-alpha.13" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.2.10-alpha.13.tgz#85983fa69b4079e56002e05428bcc832796ddd79" - integrity sha512-TsvIuy0RpjQ+SH7JYpqpdlPjinsv0fownpTlAIXxV/ig9GpS9wGtPIo9+ai45axtUcnAuvwFzNYLBF8j0NirvA== - dependencies: - "@budibase/bbui" "2.2.10-alpha.13" - "@budibase/frontend-core" "2.2.10-alpha.13" - "@budibase/string-templates" "2.2.10-alpha.13" - "@spectrum-css/button" "^3.0.3" - "@spectrum-css/card" "^3.0.3" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/link" "^3.1.3" - "@spectrum-css/page" "^3.0.1" - "@spectrum-css/tag" "^3.1.4" - "@spectrum-css/typography" "^3.0.2" - "@spectrum-css/vars" "^3.0.1" - apexcharts "^3.22.1" - dayjs "^1.10.5" - downloadjs "1.4.7" - html5-qrcode "^2.2.1" - leaflet "^1.7.1" - regexparam "^1.3.0" - sanitize-html "^2.7.0" - screenfull "^6.0.1" - shortid "^2.2.15" - socket.io-client "^4.5.1" - svelte "^3.49.0" - svelte-apexcharts "^1.0.2" - svelte-flatpickr "^3.1.0" - svelte-spa-router "^3.0.5" - -"@budibase/frontend-core@2.2.10-alpha.13": - version "2.2.10-alpha.13" - resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.2.10-alpha.13.tgz#b6f49e65532eee31a19a6991740c9f55220271a9" - integrity sha512-iXDtSec2VHbDFwLkXOm7L8oah1CDBd3rrNbEnkL/8FyAIeguLp5iSwojtTWZ+wn+ZRa7yLwQDdqXIGVkj1XahA== - dependencies: - "@budibase/bbui" "2.2.10-alpha.13" - lodash "^4.17.21" - svelte "^3.46.2" - -"@budibase/handlebars-helpers@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" - integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ== - dependencies: - array-sort "^1.0.0" - define-property "^2.0.2" - extend-shallow "^3.0.2" - for-in "^1.0.2" - get-object "^0.2.0" - get-value "^3.0.1" - handlebars "^4.7.7" - handlebars-utils "^1.0.6" - has-value "^2.0.2" - helper-md "^0.2.2" - html-tag "^2.0.0" - is-even "^1.0.0" - is-glob "^4.0.1" - kind-of "^6.0.3" - micromatch "^3.1.5" - relative "^3.0.2" - striptags "^3.1.1" - to-gfm-code-block "^0.1.1" - year "^0.2.1" - -"@budibase/string-templates@2.2.10-alpha.13": - version "2.2.10-alpha.13" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.2.10-alpha.13.tgz#5b8c21542c0f9e7ec23ae266dbf7de30b45e82e2" - integrity sha512-RbFz9ARAqx/LrR74QTy/DuDRFkOsUkQh5sHpiecpmTSvGAXcS7NGDGSKQUaDrDP0pCtYrBD5mfEeFdD00YdYrQ== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1491,130 +1356,6 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@socket.io/component-emitter@~3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" - integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== - -"@spectrum-css/actionbutton@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577" - integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw== - -"@spectrum-css/actiongroup@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c" - integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA== - -"@spectrum-css/avatar@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95" - integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ== - -"@spectrum-css/button@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.1.tgz#6db8c3e851baecd0f1c2d88fef37d49d01c6e643" - integrity sha512-YXrBtjIYisk4Vaxnp0RiE4gdElQX04P2mc4Pi2GlQ27dJKlHmufYcF+kAqGdtiyK5yjdN/vKRcC8y13aA4rusA== - -"@spectrum-css/button@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84" - integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg== - -"@spectrum-css/buttongroup@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.2.tgz#fd3387973ca3131609e32112de42a1c0400a48d8" - integrity sha512-Wu7B4GJ/SAeVHz9SUGAkeIH8pLaZh4t+w2ykSKOPQIRuK2jCBoudkEClVxviNVwqekccf5XLFXg9GpYF1a3Uaw== - -"@spectrum-css/card@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b" - integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg== - -"@spectrum-css/checkbox@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.0.2.tgz#53ca2fba0d9faa1fead10e7206eb1f6cdcfd6ddd" - integrity sha512-hPbGcnm7kJvJS4jp/P/bdaZvbyR1eIE9mteuZqcBgdmyp9m/k6+mW5jmsbtqb3Y4mMPWvOJFfz/sIvWJP0F0Zg== - -"@spectrum-css/dialog@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.1.tgz#33aae036282159f6aa998848b8c0828640a9620a" - integrity sha512-hUFbRR6RGT63MNuP7wP+k9KU+uRuICsduMihskh700e+jiQ+Gsv53fBFDlB843FoZYlIXzFQXgtjMUC5a4Qibw== - -"@spectrum-css/divider@1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385" - integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA== - dependencies: - "@spectrum-css/vars" "^3.0.2" - -"@spectrum-css/divider@^1.0.3": - version "1.0.27" - resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.27.tgz#435bf738a65b4eb15c899edf5c536bea22f2d679" - integrity sha512-hWKPHOEo9lkOGN5zecpVVwVxE3x0SJHQJKDNx1g0xs/P/AthAboK+L1c9Rq29czNfcQ2kUjumi4igzQzcqABMQ== - dependencies: - "@spectrum-css/vars" "^8.0.0" - -"@spectrum-css/dropzone@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.2.tgz#34f137851054442b219fed7f32006b93fc5e0bcf" - integrity sha512-BuBBzm5re6lM0AWgd6V+mI5eEGnnmFEtcFiJBEn9jYNEQYgflFhvnERUt89jMX5WmspiecwI2JBWJFrtFsOzug== - -"@spectrum-css/fieldgroup@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.0.2.tgz#1c1afd3c444d8650fefac275dc66a7a913933846" - integrity sha512-Vyw0kQJdLW18J6w4H+YAsoLntvkw5rXmW3CH5H3SDTXkBztxtHSSe3e106Nw5MoZxTfHlom6CxbYXYCTjQfqGw== - -"@spectrum-css/fieldlabel@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.1.tgz#39f7c0f25cc2ff402afeff005341b0832f7c588c" - integrity sha512-LMfwrwIq8wEEvxFLobdLvXRwKrp8o9Fty4iJ9aYl2Rj1uXkfRd8qLz9HGZjLEE1OuJgoTBgamYABl7EvoA5PLw== - -"@spectrum-css/icon@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.1.tgz#e300a6fc353c85c6b5d6e7a364408a940c31b177" - integrity sha512-cGFtIrcQ/7tthdkHK1npuEFiCdYVHLqwmLxghUYQw8Tb8KgJaw3OBO1tpjgsUizexNgu26BjVRIbGxNWuBXIHQ== - -"@spectrum-css/illustratedmessage@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.2.tgz#6a480be98b027e050b086e7899e40d87adb0a8c0" - integrity sha512-dqnE8X27bGcO0HN8+dYx8O4o0dNNIAqeivOzDHhe2El+V4dTzMrNIerF6G0NLm3GjVf6XliwmitsZK+K6FmbtA== - -"@spectrum-css/inlinealert@2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.1.tgz#7521f88f6c845806403cc7d925773c7414e204a2" - integrity sha512-Xy5RCOwgurqUXuGQCsEDUduDd5408bmEpmFg+feynG7VFUgLFZWBeylSENB/OqjlFtO76PHXNVdHkhDscPIHTA== - -"@spectrum-css/inputgroup@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.2.tgz#f1b13603832cbd22394f3d898af13203961f8691" - integrity sha512-O0G3Lw9gxsh8gTLQWIAKkN1O8cWhjpEUl+oR1PguIKFni72uNr2ikU9piOwy/r0gJG2Q/TVs6hAshoAAkmsSzw== - -"@spectrum-css/label@2.0.10": - version "2.0.10" - resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001" - integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ== - -"@spectrum-css/link@3.1.1": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb" - integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA== - -"@spectrum-css/link@^3.1.3": - version "3.1.23" - resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.23.tgz#9d9ff64c41366edbfdb19d04a5deec88bf2ea8fd" - integrity sha512-CAJQGnGTrTtR4tF1L94ou9Y+c4vnx9d5rWhb3AMzKb2Focqz02xSkTyaCCH7OM/3CwD8TCLOMANon8LcRpGAjA== - -"@spectrum-css/menu@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe" - integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg== - -"@spectrum-css/modal@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.1.tgz#613a6b83d0330a4d38db41a98090800751c56d8d" - integrity sha512-F7D99F3cjDGT9DM9sogx/p49jrNYT7a1J6TUoqV73wUf+0gP+dTsskBOo9jB8VbUE+POQPjiDLB+SWLp6iBB+w== - "@spectrum-css/page@^3.0.1": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.8.tgz#001efa9e4c10095df9b2b37cf7d7d6eb60140190" @@ -1622,127 +1363,7 @@ dependencies: "@spectrum-css/vars" "^4.3.0" -"@spectrum-css/pagination@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.3.tgz#b204c3ada384c4af751a354bc428346d82eeea65" - integrity sha512-OJ/v9GeNXJOZ9Yr9LDBYPrR2NCiLOWP9wANT/a5sqFuugRnQbn/HYMnRp9TBxwpDY6ihaPo0T/wi7kLiAJFdDw== - -"@spectrum-css/picker@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.1.tgz#98991198576d26bd14160824e7b6f3c278ff930b" - integrity sha512-Rv4/UBOdNW1gs7WVBCJnPD5VFly8MqP++psDX6kcugUIcfJy0GC3acvElotmKRlCDk8Qxks2W2A0jKeSgphTmA== - -"@spectrum-css/popover@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.1.tgz#5863c1efc53f98f9aba2de9186666780041303fc" - integrity sha512-LmOSj/yCwQQ9iGmCYnHiJsJR/HfPiGqI1Jl7pkKxBOCxYBMS/5+ans9vfCN2Qnd0eK7WSbfPg72S6mjye7db2Q== - -"@spectrum-css/progressbar@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.2.tgz#b5a59432517f9ae6dad49d9504691bc5ac42b424" - integrity sha512-+jExeBLtVCqo3BqtFq5WCtZ028Dzk+oUnX6y4z6ZamKPqOyOELOtFnhYnyhyRndQOqYwKUTXx9zsaWA/lpJOHw== - -"@spectrum-css/progresscircle@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.2.tgz#258ea9170fb70f795edda03e38a61d93bef4487c" - integrity sha512-JLULpyzjIY95lzlWR1yE1gv4l1K6p+scQ+edmuZZUHBzwM3pUtkvHJmUlA9TYdResUYW6Uka60VRdY6lZ8gnFQ== - -"@spectrum-css/radio@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.2.tgz#9c1386894920bbed604e4e174fbbd45d9d762152" - integrity sha512-0TDdzC9omNXnpKHEXNuuGeXdNh4x8jvTKVUqMRLb7vY4hY94hAdt6X01NBqka+jzK35HxGzpDdPADAz62yZLPQ== - -"@spectrum-css/search@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.0.2.tgz#70e93e321032d40b399498b2324e3b70e050551e" - integrity sha512-3UbT8yZmNOwrZxq+CUmumE+26ZySZ8OoKNM6U20SLMPLgdx6MrRugVE88r3Bl0sJ0RZX/5bU8nausdiHeX+Jlw== - -"@spectrum-css/sidenav@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.2.tgz#9d70f408d588ee79c69857751010333671f32713" - integrity sha512-YpIdH/F0jEICYmoduGrnkTmxwJq1kfKxEp0wOs+ZkQOsvKMv1an7nyhsfOKCQqcGNfYzJ9mJAk7/u5+vsxHa8g== - -"@spectrum-css/slider@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49" - integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q== - -"@spectrum-css/statuslight@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5" - integrity sha512-xodB8g8vGJH20XmUj9ZsPlM1jHrGeRbvmVXkz0q7YvQrYAhim8pP3W+XKKZAletPFAuu8cmUOc6SWn6i4X4z6w== - -"@spectrum-css/stepper@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.3.tgz#ae89846886431e3edeee060207b8f81540f73a34" - integrity sha512-prAD61ImlOTs9b6PfB3cB08x4lAfxtvnW+RZiTYky0E8GgZdrc/MfCkL5/oqQaIQUtyQv/3Lb7ELAf/0K8QTXw== - -"@spectrum-css/switch@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.2.tgz#f0b4c69271964573e02b08e90998096e49e1de44" - integrity sha512-zqmHpgWPNg1gEwdUNFYV3CBX5JaeALfIqcJIxE0FLZqr9d1C4+oLE0ItIFzt1bwr4bFAOmkEpvtiY+amluzGxQ== - -"@spectrum-css/table@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.1.tgz#753e0e2498082c0c36b9600828516aff3ac338cd" - integrity sha512-XQ+srMTv9hK1H0nctWUtqyzitmvyb5TNR+7mjAmKRdkBRSTQQSipDhenxZp72ekzMtMoSYZVZ77kgo0Iw3Fpug== - -"@spectrum-css/tabs@3.2.12": - version "3.2.12" - resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff" - integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA== - -"@spectrum-css/tag@^3.1.4": - version "3.3.15" - resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278" - integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q== - -"@spectrum-css/tags@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.2.tgz#5bf35fb79c97cd9344de485bd4626ad5b9f07757" - integrity sha512-HbvMk+QHvCDD1/ScvSErpKROcpAbXuMD4Hl/Gz/1A1lQ0fJ/CJeCq/MMsL7zjK1nlItU/ySu8r8KIuRF+6F8SQ== - -"@spectrum-css/textfield@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.0.1.tgz#e875b8e37817378ad08fc4af7d53026df38911e5" - integrity sha512-MUV5q87CVxbkNdSNoxGrFbgyKc51ft/WWf3aVEoPdPw5yBnXqFe1w1YmAit5zYDOOhhs58sCLAlUcCMlOpkgrA== - -"@spectrum-css/toast@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796" - integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg== - -"@spectrum-css/tooltip@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281" - integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A== - -"@spectrum-css/treeview@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.2.tgz#d54d8f17290babb1c885f5d9355e225421beb0d2" - integrity sha512-foO7UBJv1JMFaKgDPVt8jBghZSVbqhXR8TaGaxHSnMubv7ygmKkc1AITrWC2STILCn84ju2vchOohMZfW6sYwg== - -"@spectrum-css/typography@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.1.tgz#957dafd9b18c314fa37a88b549042ba2175f5b3f" - integrity sha512-XyR68K2rIZX3u4j7HhMLOqLVHDJZcapp3XUqgYMzMWccBFleA0qPxKpfRWqVIA5DzTMSIw0wEcZPYKWFZ2e6dA== - -"@spectrum-css/typography@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38" - integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA== - -"@spectrum-css/underlay@2.0.9": - version "2.0.9" - resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.9.tgz#fc10f971d1325cc844b727e6260f7217844060e8" - integrity sha512-X86xd0PG4QobmUyXA90BFGnyygaI8kW64dA4ysf4z0cOvUWjNbAAl3a/DB/WRyrnp63Zqv83T/cgNbetagTbWg== - -"@spectrum-css/vars@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.1.tgz#561fd69098f896a647242dd8d6108af603bfa31e" - integrity sha512-l4oRcCOqInChYXZN6OQhpe3isk6l4OE6Ys8cgdlsiKp53suNoQxyyd9p/eGRbCjZgH3xQ8nK0t4DHa7QYC0S6w== - -"@spectrum-css/vars@^3.0.1", "@spectrum-css/vars@^3.0.2": +"@spectrum-css/vars@^3.0.1": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999" integrity sha512-vzS9KqYXot4J3AEER/u618MXWAS+IoMvYMNrOoscKiLLKYQWenaueakUWulFonToPd/9vIpqtdbwxznqrK5qDw== @@ -1752,11 +1373,6 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-4.3.0.tgz#03ddf67d3aa8a9a4cb0edbbd259465c9ced7e70d" integrity sha512-ZQ2XAhgu4G9yBeXQNDAz07Z8oZNnMt5o9vzf/mpBA7Teb/JI+8qXp2wt8D245SzmtNlFkG/bzRYvQc0scgZeCQ== -"@spectrum-css/vars@^8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-8.0.0.tgz#b88a3b1165b63de50ab01f20ccafb42115d67443" - integrity sha512-cClQgNyH1VdNu6zdiZ5M7kbQDZS4/wPAclk5IPO5+nMhSzqTesUL/zfiaPB95MTCKFyVJrFpOeJ37HmUifWJ3A== - "@sveltejs/vite-plugin-svelte@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.1.tgz#7f468f03c933fcdfc60d4773671c73f33b9ef4d6" @@ -1868,18 +1484,6 @@ dependencies: "@babel/types" "^7.3.0" -"@types/codemirror@^5.60.4": - version "5.60.6" - resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.6.tgz#0511ed51d087ad2a2eedb6111fc74e739c4549f6" - integrity sha512-JIDPSvkYRlcv/2F0erqD+de2ni/Mz6FJMEGb0vwF6ByQOcHIKfiEfwrO4d6dSRwYeHyNUMpGjev0PyjX2M0XWw== - dependencies: - "@types/tern" "*" - -"@types/estree@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== - "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" @@ -1934,11 +1538,6 @@ jest-diff "^27.0.0" pretty-format "^27.0.0" -"@types/marked@^4.0.7": - version "4.0.8" - resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.8.tgz#b316887ab3499d0a8f4c70b7bd8508f92d477955" - integrity sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw== - "@types/minimatch@*": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -1984,13 +1583,6 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== -"@types/tern@*": - version "0.23.4" - resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb" - integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg== - dependencies: - "@types/estree" "*" - "@types/testing-library__jest-dom@^5.9.1": version "5.14.1" resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz#014162a5cee6571819d48e999980694e2f657c3c" @@ -2042,7 +1634,7 @@ acorn-walk@^7.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn-walk@^8.1.1, acorn-walk@^8.2.0: +acorn-walk@^8.1.1: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== @@ -2062,11 +1654,6 @@ acorn@^8.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== -acorn@^8.7.0: - version "8.8.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" - integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== - agent-base@6: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -2134,18 +1721,6 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" -apexcharts@^3.19.2, apexcharts@^3.22.1: - version "3.36.3" - resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.36.3.tgz#debd58ded07163d51e00aeb15827d594e0cc8129" - integrity sha512-8/FXEs0ohXMff07Gv28XjhPwEJphIUdq2/wii/pcvi54Tw6z1mjrV8ydN8rlWi/ve8BAPBefJkLmRWv7UOBsLw== - dependencies: - svg.draggable.js "^2.2.2" - svg.easing.js "^2.0.0" - svg.filter.js "^2.0.2" - svg.pathmorphing.js "^0.1.3" - svg.resize.js "^1.4.3" - svg.select.js "^3.0.1" - arch@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" @@ -2156,7 +1731,7 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.10, argparse@^1.0.7: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -2186,15 +1761,6 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-sort@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" - integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== - dependencies: - default-compare "^1.0.0" - get-value "^2.0.6" - kind-of "^5.0.2" - array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -2247,13 +1813,6 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autolinker@~0.28.0: - version "0.28.1" - resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" - integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ== - dependencies: - gulp-header "^1.7.1" - aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -2659,23 +2218,11 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= -codemirror-spell-checker@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e" - integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ== - dependencies: - typo-js "*" - codemirror@^5.59.0: version "5.63.3" resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.63.3.tgz#97042a242027fe0c87c09b36bc01931d37b76527" integrity sha512-1C+LELr+5grgJYqwZKqxrcbPsHFHapVaVAloBsFBASbpLnQqLw1U8yXJ3gT5D+rhxIiSpo+kTqN+hQ+9ialIXw== -codemirror@^5.63.1: - version "5.65.11" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.11.tgz#c818edc3274788c008f636520c5490a1f7009b4f" - integrity sha512-Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A== - collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -2760,13 +2307,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concat-with-sourcemaps@*: - version "1.1.0" - resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" - integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== - dependencies: - source-map "^0.6.1" - configent@^2.1.4: version "2.2.0" resolved "https://registry.yarnpkg.com/configent/-/configent-2.2.0.tgz#2de230fc43f22c47cfd99016aa6962d6f9546994" @@ -2804,11 +2344,6 @@ core-util-is@1.0.2: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - create-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" @@ -2955,11 +2490,6 @@ dayjs@^1.10.4: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== -dayjs@^1.10.5: - version "1.11.7" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" - integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== - dayjs@^1.11.2: version "1.11.2" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.2.tgz#fa0f5223ef0d6724b3d8327134890cfe3d72fbe5" @@ -2986,7 +2516,7 @@ debug@^3.1.0: dependencies: ms "^2.1.1" -debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: +debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -3018,13 +2548,6 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -default-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" - integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== - dependencies: - kind-of "^5.0.2" - define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -3096,20 +2619,6 @@ dom-accessibility-api@^0.5.6: resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz#caa6d08f60388d0bb4539dd75fe458a9a1d0014c" integrity sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g== -dom-serializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" - integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.2" - entities "^4.2.0" - -domelementtype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== - domexception@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" @@ -3117,22 +2626,6 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -domhandler@^5.0.1, domhandler@^5.0.2: - version "5.0.3" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" - integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== - dependencies: - domelementtype "^2.3.0" - -domutils@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" - integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== - dependencies: - dom-serializer "^2.0.0" - domelementtype "^2.3.0" - domhandler "^5.0.1" - dotenv@^8.2.0: version "8.6.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" @@ -3148,17 +2641,6 @@ duplexer@~0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -easymde@^2.16.1: - version "2.18.0" - resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b" - integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA== - dependencies: - "@types/codemirror" "^5.60.4" - "@types/marked" "^4.0.7" - codemirror "^5.63.1" - codemirror-spell-checker "1.1.2" - marked "^4.1.0" - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -3189,22 +2671,6 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -engine.io-client@~6.2.3: - version "6.2.3" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz#a8cbdab003162529db85e9de31575097f6d29458" - integrity sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - engine.io-parser "~5.0.3" - ws "~8.2.3" - xmlhttprequest-ssl "~2.0.0" - -engine.io-parser@~5.0.3: - version "5.0.4" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0" - integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg== - enquirer@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" @@ -3212,16 +2678,6 @@ enquirer@^2.3.6: dependencies: ansi-colors "^4.1.1" -ent@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== - -entities@^4.2.0, entities@^4.3.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" - integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== - error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -3376,11 +2832,6 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" @@ -3665,11 +3116,6 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -flatpickr@^4.5.2: - version "4.6.13" - resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94" - integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw== - fn-name@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-3.0.0.tgz#0596707f635929634d791f452309ab41558e3c5c" @@ -3720,11 +3166,6 @@ from@~0: resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= -fs-exists-sync@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" - integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg== - fs-extra@^10.0.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" @@ -3801,14 +3242,6 @@ get-intrinsic@^1.0.2: has "^1.0.3" has-symbols "^1.0.1" -get-object@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" - integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ== - dependencies: - is-number "^2.0.2" - isobject "^0.2.0" - get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -3838,13 +3271,6 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= -get-value@^3.0.0, get-value@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" - integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== - dependencies: - isobject "^3.0.1" - getos@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5" @@ -3931,35 +3357,6 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= -gulp-header@^1.7.1: - version "1.8.12" - resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" - integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== - dependencies: - concat-with-sourcemaps "*" - lodash.template "^4.4.0" - through2 "^2.0.0" - -handlebars-utils@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" - integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== - dependencies: - kind-of "^6.0.0" - typeof-article "^0.1.1" - -handlebars@^4.7.6, handlebars@^4.7.7: - version "4.7.7" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" - integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== - dependencies: - minimist "^1.2.5" - neo-async "^2.6.0" - source-map "^0.6.1" - wordwrap "^1.0.0" - optionalDependencies: - uglify-js "^3.1.4" - harmony-reflect@^1.4.6: version "1.6.2" resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710" @@ -3998,14 +3395,6 @@ has-value@^1.0.0: has-values "^1.0.0" isobject "^3.0.0" -has-value@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658" - integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA== - dependencies: - get-value "^3.0.0" - has-values "^2.0.1" - has-values@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" @@ -4019,13 +3408,6 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has-values@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d" - integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w== - dependencies: - kind-of "^6.0.2" - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -4033,16 +3415,6 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -helper-md@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" - integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q== - dependencies: - ent "^2.2.0" - extend-shallow "^2.0.1" - fs-exists-sync "^0.1.0" - remarkable "^1.6.2" - hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -4060,29 +3432,6 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-tag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" - integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== - dependencies: - is-self-closing "^1.0.1" - kind-of "^6.0.0" - -html5-qrcode@^2.2.1: - version "2.3.4" - resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.4.tgz#7e2b4575a23b10ff5e26d2bf147c8027c1ece389" - integrity sha512-VPZrOTG8XR9HmIAhSSiGtJVPErZxKy/DuGc9cPQLburCWZEbvxQGJP9y4K4P+8vdalLtYB/vM5YP1BdWQKZ8jQ== - -htmlparser2@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" - integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.2" - domutils "^3.0.1" - entities "^4.3.0" - http-proxy-agent@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" @@ -4169,7 +3518,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.4, inherits@~2.0.3: +inherits@2, inherits@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -4268,13 +3617,6 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== -is-even@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" - integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg== - dependencies: - is-odd "^0.1.2" - is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -4317,13 +3659,6 @@ is-installed-globally@~0.4.0: global-dirs "^3.0.0" is-path-inside "^3.0.2" -is-number@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg== - dependencies: - kind-of "^3.0.2" - is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -4336,13 +3671,6 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-odd@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" - integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw== - dependencies: - is-number "^3.0.0" - is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -4360,23 +3688,11 @@ is-plain-object@^3.0.0: resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b" integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g== -is-plain-object@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" - integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== - is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-self-closing@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" - integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== - dependencies: - self-closing-tags "^1.0.1" - is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -4409,7 +3725,7 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@1.0.0, isarray@~1.0.0: +isarray@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -4419,11 +3735,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= -isobject@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" - integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ== - isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -4999,7 +4310,7 @@ jsprim@^2.0.2: json-schema "0.4.0" verror "1.10.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== @@ -5013,12 +4324,12 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0, kind-of@^5.0.2: +kind-of@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: +kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -5038,11 +4349,6 @@ lazy-ass@1.6.0, lazy-ass@^1.6.0: resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM= -leaflet@^1.7.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414" - integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ== - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -5087,11 +4393,6 @@ lodash-es@^4.17.11: resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -5122,22 +4423,7 @@ lodash.once@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= -lodash.template@^4.4.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" - integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.templatesettings "^4.0.0" - -lodash.templatesettings@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" - integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== - dependencies: - lodash._reinterpolate "^3.0.0" - -lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: +lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5236,11 +4522,6 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -marked@^4.1.0: - version "4.2.5" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.5.tgz#979813dfc1252cc123a79b71b095759a32f42a5d" - integrity sha512-jPueVhumq7idETHkb203WDD4fMA3yV9emQ5vLwop58lu8bTclMghBWcYAavlDqIEMaisADinV1TooIFCfqOsYQ== - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -5256,7 +4537,7 @@ methods@^1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@^3.1.4, micromatch@^3.1.5: +micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -5420,11 +4701,6 @@ ncp@^2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= -neo-async@^2.6.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -5635,11 +4911,6 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-srcset@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1" - integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q== - parse5@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" @@ -5731,15 +5002,6 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -postcss@^8.3.11: - version "8.4.20" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56" - integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g== - dependencies: - nanoid "^3.3.4" - picocolors "^1.0.0" - source-map-js "^1.0.2" - postcss@^8.4.16: version "8.4.16" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" @@ -5788,11 +5050,6 @@ pretty-format@^27.0.0, pretty-format@^27.3.1: ansi-styles "^5.0.0" react-is "^17.0.1" -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - prompts@^2.0.1: version "2.4.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" @@ -5884,19 +5141,6 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -5937,16 +5181,6 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexparam@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa" - integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw== - -regexparam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" - integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== - regexpu-core@^4.7.1: version "4.8.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" @@ -5971,21 +5205,6 @@ regjsparser@^0.7.0: dependencies: jsesc "~0.5.0" -relative@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" - integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA== - dependencies: - isobject "^2.0.0" - -remarkable@^1.6.2: - version "1.7.4" - resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" - integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== - dependencies: - argparse "^1.0.10" - autolinker "~0.28.0" - remixicon@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/remixicon/-/remixicon-2.5.0.tgz#b5e245894a1550aa23793f95daceadbf96ad1a41" @@ -6155,7 +5374,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.2: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== @@ -6187,18 +5406,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sanitize-html@^2.7.0: - version "2.8.1" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.8.1.tgz#319c4fdba67e1edf35b1fd6d9362210044826d47" - integrity sha512-qK5neD0SaMxGwVv5txOYv05huC3o6ZAA4h5+7nJJgWMNFUNRjcjLO6FpwAtKzfKCZ0jrG6xTk6eVFskbvOGblg== - dependencies: - deepmerge "^4.2.2" - escape-string-regexp "^4.0.0" - htmlparser2 "^8.0.0" - is-plain-object "^5.0.0" - parse-srcset "^1.0.2" - postcss "^8.3.11" - saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" @@ -6206,16 +5413,6 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -screenfull@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238" - integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw== - -self-closing-tags@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" - integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== - "semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -6289,13 +5486,6 @@ shortid@2.2.15: dependencies: nanoid "^2.1.0" -shortid@^2.2.15: - version "2.2.16" - resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" - integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== - dependencies: - nanoid "^2.1.0" - signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.5" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" @@ -6359,24 +5549,6 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -socket.io-client@^4.5.1: - version "4.5.4" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.4.tgz#d3cde8a06a6250041ba7390f08d2468ccebc5ac9" - integrity sha512-ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.2" - engine.io-client "~6.2.3" - socket.io-parser "~4.2.1" - -socket.io-parser@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" - integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" @@ -6546,13 +5718,6 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -6587,11 +5752,6 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" -striptags@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" - integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== - supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -6626,25 +5786,11 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -svelte-apexcharts@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/svelte-apexcharts/-/svelte-apexcharts-1.0.2.tgz#4e000f8b8f7c901c05658c845457dfc8314d54c1" - integrity sha512-6qlx4rE+XsonZ0FZudfwqOQ34Pq+3wpxgAD75zgEmGoYhYBJcwmikTuTf3o8ZBsZue9U/pAwhNy3ed1Bkq1gmA== - dependencies: - apexcharts "^3.19.2" - svelte-dnd-action@^0.9.8: version "0.9.12" resolved "https://registry.yarnpkg.com/svelte-dnd-action/-/svelte-dnd-action-0.9.12.tgz#78cf33097986488c6d069eca517af473cd998730" integrity sha512-GlXIB3/56IMR5A0+qUx+FX7Q7n8uCAIeuYdgSBmn9iOlxWc+mgM8P1kNwAKCMSTdQ4IQETVQILNgWVY1KIFzsg== -svelte-flatpickr@^3.1.0, svelte-flatpickr@^3.2.3: - version "3.2.6" - resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.2.6.tgz#595a97b2f25a669e61fe743f90a10dce783bbd49" - integrity sha512-0ePUyE9OjInYFqQwRKOxnFSu4dQX9+/rzFMynq2fKYXx406ZUThzSx72gebtjr0DoAQbsH2///BBZa5qk4qZXg== - dependencies: - flatpickr "^4.5.2" - svelte-hmr@^0.14.12: version "0.14.12" resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.14.12.tgz#a127aec02f1896500b10148b2d4d21ddde39973f" @@ -6665,83 +5811,11 @@ svelte-portal@1.0.0: resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== -svelte-portal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" - integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== - -svelte-spa-router@^3.0.5: - version "3.3.0" - resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c" - integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ== - dependencies: - regexparam "2.0.1" - -svelte@^3.46.2, svelte@^3.49.0: - version "3.55.0" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.55.0.tgz#29cb958750a23e751309a6535ccd811fcabc9038" - integrity sha512-uGu2FVMlOuey4JoKHKrpZFkoYyj0VLjJdz47zX5+gVK5odxHM40RVhar9/iK2YFRVxvfg9FkhfVlR0sjeIrOiA== - svelte@^3.48.0: version "3.49.0" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029" integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA== -svg.draggable.js@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba" - integrity sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw== - dependencies: - svg.js "^2.0.1" - -svg.easing.js@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/svg.easing.js/-/svg.easing.js-2.0.0.tgz#8aa9946b0a8e27857a5c40a10eba4091e5691f12" - integrity sha512-//ctPdJMGy22YoYGV+3HEfHbm6/69LJUTAqI2/5qBvaNHZ9uUFVC82B0Pl299HzgH13rKrBgi4+XyXXyVWWthA== - dependencies: - svg.js ">=2.3.x" - -svg.filter.js@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/svg.filter.js/-/svg.filter.js-2.0.2.tgz#91008e151389dd9230779fcbe6e2c9a362d1c203" - integrity sha512-xkGBwU+dKBzqg5PtilaTb0EYPqPfJ9Q6saVldX+5vCRy31P6TlRCP3U9NxH3HEufkKkpNgdTLBJnmhDHeTqAkw== - dependencies: - svg.js "^2.2.5" - -svg.js@>=2.3.x, svg.js@^2.0.1, svg.js@^2.2.5, svg.js@^2.4.0, svg.js@^2.6.5: - version "2.7.1" - resolved "https://registry.yarnpkg.com/svg.js/-/svg.js-2.7.1.tgz#eb977ed4737001eab859949b4a398ee1bb79948d" - integrity sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA== - -svg.pathmorphing.js@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz#c25718a1cc7c36e852ecabc380e758ac09bb2b65" - integrity sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww== - dependencies: - svg.js "^2.4.0" - -svg.resize.js@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/svg.resize.js/-/svg.resize.js-1.4.3.tgz#885abd248e0cd205b36b973c4b578b9a36f23332" - integrity sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw== - dependencies: - svg.js "^2.6.5" - svg.select.js "^2.1.2" - -svg.select.js@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-2.1.2.tgz#e41ce13b1acff43a7441f9f8be87a2319c87be73" - integrity sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ== - dependencies: - svg.js "^2.2.5" - -svg.select.js@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-3.0.1.tgz#a4198e359f3825739226415f82176a90ea5cc917" - integrity sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw== - dependencies: - svg.js "^2.6.5" - symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -6791,14 +5865,6 @@ throttleit@^1.0.0: resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= -through2@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - through@2, through@^2.3.8, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -6821,11 +5887,6 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= -to-gfm-code-block@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" - integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg== - to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" @@ -6981,28 +6042,11 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typeof-article@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" - integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw== - dependencies: - kind-of "^3.1.0" - typescript@4.7.3: version "4.7.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== -typo-js@*: - version "1.2.2" - resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b" - integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== - -uglify-js@^3.1.4: - version "3.17.4" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" - integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== - unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" @@ -7076,11 +6120,6 @@ utf-8-validate@^5.0.2: dependencies: node-gyp-build "^4.3.0" -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - uuid@8.3.1: version "8.3.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" @@ -7139,14 +6178,6 @@ vite@^3.0.8: optionalDependencies: fsevents "~2.3.2" -vm2@^3.9.4: - version "3.9.13" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.13.tgz#774a1a3d73b9b90b1aa45bcc5f25e349f2eef649" - integrity sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q== - dependencies: - acorn "^8.7.0" - acorn-walk "^8.2.0" - w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -7247,11 +6278,6 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== - wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -7290,11 +6316,6 @@ ws@^7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== -ws@~8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" - integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== - xml-name-validator@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" @@ -7305,16 +6326,6 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xmlhttprequest-ssl@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" - integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== - -xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - y18n@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" @@ -7381,11 +6392,6 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -year@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" - integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w== - yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" diff --git a/packages/frontend-core/src/api/envVars.js b/packages/frontend-core/src/api/envVars.js index 5f02a2b889..7a728e9d18 100644 --- a/packages/frontend-core/src/api/envVars.js +++ b/packages/frontend-core/src/api/envVars.js @@ -1,11 +1,11 @@ export const buildEnvironmentVariableEndpoints = API => ({ - /** - * Fetches a list of environment variables - */ - fetchEnvVars: async () => { - return await API.get({ - url: `/api/env/variables`, - json: false, - }) - } + /** + * Fetches a list of environment variables + */ + fetchEnvVars: async () => { + return await API.get({ + url: `/api/env/variables`, + json: false, + }) + }, }) diff --git a/packages/server/__mocks__/node-fetch.ts b/packages/server/__mocks__/node-fetch.ts index 44d1e54a32..78071dc8af 100644 --- a/packages/server/__mocks__/node-fetch.ts +++ b/packages/server/__mocks__/node-fetch.ts @@ -1,5 +1,7 @@ +// @ts-ignore import fs from "fs" module FetchMock { + // @ts-ignore const fetch = jest.requireActual("node-fetch") let failCount = 0 diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index d47629ed3e..323dd1457e 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -13,6 +13,8 @@ import { getDatasourceAndQuery } from "./row/utils" import { invalidateDynamicVariables } from "../../threads/utils" import { db as dbCore, context, events } from "@budibase/backend-core" import { BBContext, Datasource, Row } from "@budibase/types" +import sdk from "../../sdk" +import { cloneDeep } from "lodash/fp" export async function fetch(ctx: BBContext) { // Get internal tables @@ -61,7 +63,7 @@ export async function fetch(ctx: BBContext) { export async function buildSchemaFromDb(ctx: BBContext) { const db = context.getAppDB() - const datasource = await db.get(ctx.params.datasourceId) + const datasource = await sdk.datasources.get(ctx.params.datasourceId) const tablesFilter = ctx.request.body.tablesFilter let { tables, error } = await buildSchemaHelper(datasource) @@ -149,8 +151,8 @@ async function invalidateVariables( export async function update(ctx: BBContext) { const db = context.getAppDB() const datasourceId = ctx.params.datasourceId - let datasource = await db.get(datasourceId) - const auth = datasource.config.auth + let datasource = await sdk.datasources.get(datasourceId) + const auth = datasource.config?.auth await invalidateVariables(datasource, ctx.request.body) const isBudibaseSource = datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE @@ -162,7 +164,7 @@ export async function update(ctx: BBContext) { datasource = { ...datasource, ...dataSourceBody } if (auth && !ctx.request.body.auth) { // don't strip auth config from DB - datasource.config.auth = auth + datasource.config!.auth = auth } const response = await db.put(datasource) @@ -255,7 +257,7 @@ export async function destroy(ctx: BBContext) { const db = context.getAppDB() const datasourceId = ctx.params.datasourceId - const datasource = await db.get(datasourceId) + const datasource = await sdk.datasources.get(datasourceId) // Delete all queries for the datasource if (datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE) { @@ -313,6 +315,7 @@ function updateError(error: any, newError: any, tables: string[]) { async function buildSchemaHelper(datasource: Datasource) { const Connector = await getIntegration(datasource.source) + datasource = await sdk.datasources.enrichDatasourceWithValues(datasource) // Connect to the DB and build the schema const connector = new Connector(datasource.config) diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts index eade7ddab6..e7e2b8e1a5 100644 --- a/packages/server/src/api/controllers/query/index.ts +++ b/packages/server/src/api/controllers/query/index.ts @@ -7,6 +7,7 @@ import { invalidateDynamicVariables } from "../../../threads/utils" import { QUERY_THREAD_TIMEOUT } from "../../../environment" import { quotas } from "@budibase/pro" import { events, context, utils, constants } from "@budibase/backend-core" +import sdk from "../../../sdk" const Runner = new Thread(ThreadType.QUERY, { timeoutMs: QUERY_THREAD_TIMEOUT || 10000, @@ -81,7 +82,7 @@ export async function save(ctx: any) { const db = context.getAppDB() const query = ctx.request.body - const datasource = await db.get(query.datasourceId) + const datasource = await sdk.datasources.get(query.datasourceId) let eventFn if (!query._id) { @@ -126,9 +127,9 @@ function getAuthConfig(ctx: any) { } export async function preview(ctx: any) { - const db = context.getAppDB() - - const datasource = await db.get(ctx.request.body.datasourceId) + const datasource = await sdk.datasources.get(ctx.request.body.datasourceId, { + withEnvVars: true, + }) const query = ctx.request.body // preview may not have a queryId as it hasn't been saved, but if it does // this stops dynamic variables from calling the same query @@ -201,7 +202,9 @@ async function execute( const db = context.getAppDB() const query = await db.get(ctx.params.queryId) - const datasource = await db.get(query.datasourceId) + const datasource = await sdk.datasources.get(query.datasourceId, { + withEnvVars: true, + }) let authConfigCtx: any = {} if (!opts.isAutomation) { @@ -266,18 +269,18 @@ export async function executeV2( const removeDynamicVariables = async (queryId: any) => { const db = context.getAppDB() const query = await db.get(queryId) - const datasource = await db.get(query.datasourceId) - const dynamicVariables = datasource.config.dynamicVariables + const datasource = await sdk.datasources.get(query.datasourceId) + const dynamicVariables = datasource.config?.dynamicVariables as any[] if (dynamicVariables) { // delete dynamic variables from the datasource - datasource.config.dynamicVariables = dynamicVariables.filter( + datasource.config!.dynamicVariables = dynamicVariables!.filter( (dv: any) => dv.queryId !== queryId ) await db.put(datasource) // invalidate the deleted variables - const variablesToDelete = dynamicVariables.filter( + const variablesToDelete = dynamicVariables!.filter( (dv: any) => dv.queryId === queryId ) await invalidateDynamicVariables(variablesToDelete) @@ -289,7 +292,7 @@ export async function destroy(ctx: any) { const queryId = ctx.params.queryId await removeDynamicVariables(queryId) const query = await db.get(queryId) - const datasource = await db.get(query.datasourceId) + const datasource = await sdk.datasources.get(query.datasourceId) await db.remove(ctx.params.queryId, ctx.params.revId) ctx.message = `Query deleted.` ctx.status = 200 diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts index 80ba4fd808..f5ac028ead 100644 --- a/packages/server/src/api/controllers/row/ExternalRequest.ts +++ b/packages/server/src/api/controllers/row/ExternalRequest.ts @@ -25,6 +25,7 @@ import { cloneDeep } from "lodash/fp" import { processFormulas, processDates } from "../../../utilities/rowProcessor" import { context } from "@budibase/backend-core" import { removeKeyNumbering } from "./utils" +import sdk from "../../../sdk" export interface ManyRelationship { tableId?: string @@ -664,8 +665,7 @@ export class ExternalRequest { throw "Unable to run without a table name" } if (!this.datasource) { - const db = context.getAppDB() - this.datasource = await db.get(datasourceId) + this.datasource = await sdk.datasources.get(datasourceId!) if (!this.datasource || !this.datasource.entities) { throw "No tables found, fetch tables before query." } diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts index 83564564b8..ed14eb6929 100644 --- a/packages/server/src/api/controllers/row/external.ts +++ b/packages/server/src/api/controllers/row/external.ts @@ -19,6 +19,7 @@ import { Table, Datasource, } from "@budibase/types" +import sdk from "../../../sdk" export async function handleRequest( operation: Operation, @@ -179,10 +180,9 @@ export async function validate(ctx: BBContext) { export async function exportRows(ctx: BBContext) { const { datasourceId } = breakExternalTableId(ctx.params.tableId) - const db = context.getAppDB() const format = ctx.query.format const { columns } = ctx.request.body - const datasource = await db.get(datasourceId) + const datasource = await sdk.datasources.get(datasourceId!) if (!datasource || !datasource.entities) { ctx.throw(400, "Datasource has not been configured for plus API.") } @@ -225,8 +225,7 @@ export async function fetchEnrichedRow(ctx: BBContext) { const id = ctx.params.rowId const tableId = ctx.params.tableId const { datasourceId, tableName } = breakExternalTableId(tableId) - const db = context.getAppDB() - const datasource: Datasource = await db.get(datasourceId) + const datasource: Datasource = await sdk.datasources.get(datasourceId!) if (!tableName) { ctx.throw(400, "Unable to find table.") } diff --git a/packages/server/src/api/controllers/row/utils.ts b/packages/server/src/api/controllers/row/utils.ts index 60aa8a6b7a..aa58ca6055 100644 --- a/packages/server/src/api/controllers/row/utils.ts +++ b/packages/server/src/api/controllers/row/utils.ts @@ -8,6 +8,7 @@ export { removeKeyNumbering } from "../../../integrations/base/utils" const validateJs = require("validate.js") const { cloneDeep } = require("lodash/fp") import { Ctx } from "@budibase/types" +import sdk from "../../../sdk" validateJs.extend(validateJs.validators.datetime, { parse: function (value: string) { @@ -21,8 +22,7 @@ validateJs.extend(validateJs.validators.datetime, { export async function getDatasourceAndQuery(json: any) { const datasourceId = json.endpoint.datasourceId - const db = context.getAppDB() - const datasource = await db.get(datasourceId) + const datasource = await sdk.datasources.get(datasourceId) return makeExternalQuery(datasource, json) } diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts index 1113a2a1be..9a61741d46 100644 --- a/packages/server/src/api/controllers/static/index.ts +++ b/packages/server/src/api/controllers/static/index.ts @@ -1,20 +1,21 @@ require("svelte/register") -const send = require("koa-send") -const { resolve, join } = require("../../../utilities/centralPath") +import { resolve, join } from "../../../utilities/centralPath" const uuid = require("uuid") import { ObjectStoreBuckets } from "../../../constants" -const { processString } = require("@budibase/string-templates") -const { +import { processString } from "@budibase/string-templates" +import { loadHandlebarsFile, NODE_MODULES_PATH, TOP_LEVEL_PATH, -} = require("../../../utilities/fileSystem") -const env = require("../../../environment") -const { DocumentType } = require("../../../db/utils") -const { context, objectStore, utils } = require("@budibase/backend-core") -const AWS = require("aws-sdk") -const fs = require("fs") +} from "../../../utilities/fileSystem" +import env from "../../../environment" +import { DocumentType } from "../../../db/utils" +import { context, objectStore, utils } from "@budibase/backend-core" +import AWS from "aws-sdk" +import fs from "fs" +import sdk from "../../../sdk" +const send = require("koa-send") async function prepareUpload({ s3Key, bucket, metadata, file }: any) { const response = await objectStore.upload({ @@ -110,7 +111,7 @@ export const serveApp = async function (ctx: any) { title: appInfo.name, production: env.isProd(), appId, - clientLibPath: objectStore.clientLibraryUrl(appId, appInfo.version), + clientLibPath: objectStore.clientLibraryUrl(appId!, appInfo.version), usedPlugins: plugins, }) @@ -135,7 +136,7 @@ export const serveBuilderPreview = async function (ctx: any) { let appId = context.getAppId() const previewHbs = loadHandlebarsFile(`${__dirname}/templates/preview.hbs`) ctx.body = await processString(previewHbs, { - clientLibPath: objectStore.clientLibraryUrl(appId, appInfo.version), + clientLibPath: objectStore.clientLibraryUrl(appId!, appInfo.version), }) } else { // just return the app info for jest to assert on @@ -150,13 +151,11 @@ export const serveClientLibrary = async function (ctx: any) { } export const getSignedUploadURL = async function (ctx: any) { - const database = context.getAppDB() - // Ensure datasource is valid let datasource try { const { datasourceId } = ctx.params - datasource = await database.get(datasourceId) + datasource = await sdk.datasources.get(datasourceId, { withEnvVars: true }) if (!datasource) { ctx.throw(400, "The specified datasource could not be found") } @@ -172,8 +171,8 @@ export const getSignedUploadURL = async function (ctx: any) { // Determine type of datasource and generate signed URL let signedUrl let publicUrl - const awsRegion = datasource?.config?.region || "eu-west-1" - if (datasource.source === "S3") { + const awsRegion = (datasource?.config?.region || "eu-west-1") as string + if (datasource?.source === "S3") { const { bucket, key } = ctx.request.body || {} if (!bucket || !key) { ctx.throw(400, "bucket and key values are required") @@ -182,8 +181,8 @@ export const getSignedUploadURL = async function (ctx: any) { try { const s3 = new AWS.S3({ region: awsRegion, - accessKeyId: datasource?.config?.accessKeyId, - secretAccessKey: datasource?.config?.secretAccessKey, + accessKeyId: datasource?.config?.accessKeyId as string, + secretAccessKey: datasource?.config?.secretAccessKey as string, apiVersion: "2006-03-01", signatureVersion: "v4", }) diff --git a/packages/server/src/api/controllers/table/external.ts b/packages/server/src/api/controllers/table/external.ts index 8bb8886479..9d56a83206 100644 --- a/packages/server/src/api/controllers/table/external.ts +++ b/packages/server/src/api/controllers/table/external.ts @@ -219,7 +219,7 @@ export async function save(ctx: BBContext) { } const db = context.getAppDB() - const datasource = await db.get(datasourceId) + const datasource = await sdk.datasources.get(datasourceId) if (!datasource.entities) { datasource.entities = {} } @@ -322,15 +322,17 @@ export async function destroy(ctx: BBContext) { const datasourceId = getDatasourceId(tableToDelete) const db = context.getAppDB() - const datasource = await db.get(datasourceId) + const datasource = await sdk.datasources.get(datasourceId!) const tables = datasource.entities const operation = Operation.DELETE_TABLE - await makeTableRequest(datasource, operation, tableToDelete, tables) + if (tables) { + await makeTableRequest(datasource, operation, tableToDelete, tables) + cleanupRelationships(tableToDelete, tables) + delete tables[tableToDelete.name] + datasource.entities = tables + } - cleanupRelationships(tableToDelete, tables) - - delete datasource.entities[tableToDelete.name] await db.put(datasource) return tableToDelete diff --git a/packages/server/src/integrations/base/query.ts b/packages/server/src/integrations/base/query.ts index 7435b28141..9dcba7b10d 100644 --- a/packages/server/src/integrations/base/query.ts +++ b/packages/server/src/integrations/base/query.ts @@ -1,10 +1,12 @@ import { QueryJson, Datasource } from "@budibase/types" -const { getIntegration } = require("../index") +import { getIntegration } from "../index" +import sdk from "../../sdk" export async function makeExternalQuery( datasource: Datasource, json: QueryJson ) { + datasource = await sdk.datasources.enrichDatasourceWithValues(datasource) const Integration = await getIntegration(datasource.source) // query is the opinionated function if (Integration.prototype.query) { diff --git a/packages/server/src/sdk/app/datasources/datasources.ts b/packages/server/src/sdk/app/datasources/datasources.ts new file mode 100644 index 0000000000..ffd379c30d --- /dev/null +++ b/packages/server/src/sdk/app/datasources/datasources.ts @@ -0,0 +1,24 @@ +import { environmentVariables } from "@budibase/pro" +import { context } from "@budibase/backend-core" +import { processObject } from "@budibase/string-templates" +import { Datasource } from "@budibase/types" +import { cloneDeep } from "lodash/fp" + +export async function enrichDatasourceWithValues(datasource: Datasource) { + const cloned = cloneDeep(datasource) + const envVars = await environmentVariables.fetchValues() + return (await processObject(cloned, envVars)) as Datasource +} + +export async function get( + datasourceId: string, + opts?: { withEnvVars: boolean } +): Promise { + const appDb = context.getAppDB() + const datasource = await appDb.get(datasourceId) + if (opts?.withEnvVars) { + return await enrichDatasourceWithValues(datasource) + } else { + return datasource + } +} diff --git a/packages/server/src/sdk/app/datasources/index.ts b/packages/server/src/sdk/app/datasources/index.ts new file mode 100644 index 0000000000..1ce6b0e689 --- /dev/null +++ b/packages/server/src/sdk/app/datasources/index.ts @@ -0,0 +1,5 @@ +import * as datasources from "./datasources" + +export default { + ...datasources, +} diff --git a/packages/server/src/sdk/app/tables/index.ts b/packages/server/src/sdk/app/tables/index.ts index 98c7fc6a8b..58e70ef39d 100644 --- a/packages/server/src/sdk/app/tables/index.ts +++ b/packages/server/src/sdk/app/tables/index.ts @@ -6,6 +6,7 @@ import { isSQL, } from "../../../integrations/utils" import { Table, Database } from "@budibase/types" +import datasources from "../datasources" async function getAllInternalTables(db?: Database): Promise { if (!db) { @@ -23,9 +24,11 @@ async function getAllInternalTables(db?: Database): Promise { })) } -async function getAllExternalTables(datasourceId: any): Promise { +async function getAllExternalTables( + datasourceId: any +): Promise> { const db = context.getAppDB() - const datasource = await db.get(datasourceId) + const datasource = await datasources.get(datasourceId, { withEnvVars: true }) if (!datasource || !datasource.entities) { throw "Datasource is not configured fully." } @@ -44,7 +47,7 @@ async function getTable(tableId: any): Promise
{ const db = context.getAppDB() if (isExternalTable(tableId)) { let { datasourceId, tableName } = breakExternalTableId(tableId) - const datasource = await db.get(datasourceId) + const datasource = await datasources.get(datasourceId!) const table = await getExternalTable(datasourceId, tableName) return { ...table, sql: isSQL(datasource) } } else { diff --git a/packages/server/src/sdk/index.ts b/packages/server/src/sdk/index.ts index 2ee40992c8..9da905910f 100644 --- a/packages/server/src/sdk/index.ts +++ b/packages/server/src/sdk/index.ts @@ -2,6 +2,7 @@ import { default as backups } from "./app/backups" import { default as tables } from "./app/tables" import { default as automations } from "./app/automations" import { default as applications } from "./app/applications" +import { default as datasources } from "./app/datasources" import { default as rows } from "./app/rows" import { default as users } from "./users" @@ -12,6 +13,7 @@ const sdk = { applications, rows, users, + datasources, } // default export for TS diff --git a/packages/server/src/threads/query.ts b/packages/server/src/threads/query.ts index 3d6428dd56..dbbaa5d2ff 100644 --- a/packages/server/src/threads/query.ts +++ b/packages/server/src/threads/query.ts @@ -6,6 +6,7 @@ import { getIntegration } from "../integrations" import { processStringSync } from "@budibase/string-templates" import { context, cache, auth } from "@budibase/backend-core" import { getGlobalIDFromUserMetadataID } from "../db/utils" +import sdk from "../sdk" import { cloneDeep } from "lodash/fp" const { isSQL } = require("../integrations/utils") @@ -166,7 +167,9 @@ class QueryRunner { async runAnotherQuery(queryId: string, parameters: any) { const db = context.getAppDB() const query = await db.get(queryId) - const datasource = await db.get(query.datasourceId) + const datasource = await sdk.datasources.get(query.datasourceId, { + withEnvVars: true, + }) return new QueryRunner( { datasource, diff --git a/packages/types/src/documents/app/datasource.ts b/packages/types/src/documents/app/datasource.ts index efdc2ca1bd..a37e3d3ddc 100644 --- a/packages/types/src/documents/app/datasource.ts +++ b/packages/types/src/documents/app/datasource.ts @@ -8,7 +8,7 @@ export interface Datasource extends Document { source: SourceName // the config is defined by the schema config?: { - [key: string]: string | number | boolean + [key: string]: string | number | boolean | any[] } plus?: boolean entities?: { From d27674de5cee1f25629870b11a37dd42a719291b Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 11 Jan 2023 19:07:01 +0000 Subject: [PATCH 071/387] Replacing some require statements with imports. --- packages/server/src/api/routes/row.ts | 2 +- packages/server/src/index.ts | 2 +- .../server/src/integrations/base/sqlTable.ts | 2 +- packages/server/src/integrations/dynamodb.ts | 6 +++--- packages/server/src/integrations/mysql.ts | 2 +- packages/server/src/integrations/rest.ts | 16 ++++++++-------- packages/server/src/threads/query.ts | 6 +++--- .../src/utilities/fileSystem/filesystem.ts | 10 ++++++---- .../server/src/utilities/fileSystem/plugin.ts | 7 +++---- .../server/src/utilities/fileSystem/template.ts | 4 ++-- 10 files changed, 29 insertions(+), 28 deletions(-) diff --git a/packages/server/src/api/routes/row.ts b/packages/server/src/api/routes/row.ts index f4462b3595..6d1cd206c6 100644 --- a/packages/server/src/api/routes/row.ts +++ b/packages/server/src/api/routes/row.ts @@ -3,7 +3,7 @@ import * as rowController from "../controllers/row" import authorized from "../../middleware/authorized" import { paramResource, paramSubResource } from "../../middleware/resourceId" import { permissions } from "@budibase/backend-core" -const { internalSearchValidator } = require("./utils/validators") +import { internalSearchValidator } from "./utils/validators" const { PermissionType, PermissionLevel } = permissions const router: Router = new Router() diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index fac8403c49..b3fbb22bde 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -1,6 +1,6 @@ import { bootstrap } from "global-agent" const fixPath = require("fix-path") -const { checkDevelopmentEnvironment } = require("./utilities/fileSystem") +import { checkDevelopmentEnvironment } from "./utilities/fileSystem" function runServer() { // this will shutdown the system if development environment not ready diff --git a/packages/server/src/integrations/base/sqlTable.ts b/packages/server/src/integrations/base/sqlTable.ts index 2ab610fecd..58b2b7a3d1 100644 --- a/packages/server/src/integrations/base/sqlTable.ts +++ b/packages/server/src/integrations/base/sqlTable.ts @@ -3,7 +3,7 @@ import { Operation, QueryJson, RenameColumn, Table } from "@budibase/types" import { breakExternalTableId } from "../utils" import SchemaBuilder = Knex.SchemaBuilder import CreateTableBuilder = Knex.CreateTableBuilder -const { FieldTypes, RelationshipTypes } = require("../../constants") +import { FieldTypes, RelationshipTypes } from "../../constants" function generateSchema( schema: CreateTableBuilder, diff --git a/packages/server/src/integrations/dynamodb.ts b/packages/server/src/integrations/dynamodb.ts index bf9a0c3b52..28c1c7b52b 100644 --- a/packages/server/src/integrations/dynamodb.ts +++ b/packages/server/src/integrations/dynamodb.ts @@ -5,8 +5,8 @@ import { IntegrationBase, } from "@budibase/types" -const AWS = require("aws-sdk") -const { AWS_REGION } = require("../db/dynamoClient") +import AWS from "aws-sdk" +import { AWS_REGION } from "../db/dynamoClient" interface DynamoDBConfig { region: string @@ -182,7 +182,7 @@ class DynamoDBIntegration implements IntegrationBase { return response } - async describe(query: { table: string }) { + async describe(query: { table: string }): Promise { const params = { TableName: query.table, } diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts index 1cd9a356b3..b3881c63a9 100644 --- a/packages/server/src/integrations/mysql.ts +++ b/packages/server/src/integrations/mysql.ts @@ -16,7 +16,7 @@ import { finaliseExternalTables, } from "./utils" import dayjs from "dayjs" -const { NUMBER_REGEX } = require("../utilities") +import { NUMBER_REGEX } from "../utilities" import Sql from "./base/sql" import { MySQLColumn } from "./base/types" diff --git a/packages/server/src/integrations/rest.ts b/packages/server/src/integrations/rest.ts index 08d2337593..f13c14e504 100644 --- a/packages/server/src/integrations/rest.ts +++ b/packages/server/src/integrations/rest.ts @@ -16,11 +16,11 @@ import { import { get } from "lodash" import * as https from "https" import qs from "querystring" -const fetch = require("node-fetch") -const { formatBytes } = require("../utilities") -const { performance } = require("perf_hooks") -const FormData = require("form-data") -const { URLSearchParams } = require("url") +import fetch from "node-fetch" +import { formatBytes } from "../utilities" +import { performance } from "perf_hooks" +import FormData from "form-data" +import { URLSearchParams } from "url" const BodyTypes = { NONE: "none", @@ -204,12 +204,12 @@ class RestIntegration implements IntegrationBase { // Append page number or cursor param if configured if (pageParam && paginationValues.page != null) { - params.append(pageParam, paginationValues.page) + params.append(pageParam, paginationValues.page as string) } // Append page size param if configured if (sizeParam && paginationValues.limit != null) { - params.append(sizeParam, paginationValues.limit) + params.append(sizeParam, String(paginationValues.limit)) } // Prepend query string with pagination params @@ -280,7 +280,7 @@ class RestIntegration implements IntegrationBase { case BodyTypes.ENCODED: const params = new URLSearchParams() for (let [key, value] of Object.entries(object)) { - params.append(key, value) + params.append(key, value as string) } addPaginationToBody((key: string, value: any) => { params.append(key, value) diff --git a/packages/server/src/threads/query.ts b/packages/server/src/threads/query.ts index dbbaa5d2ff..5eb027883f 100644 --- a/packages/server/src/threads/query.ts +++ b/packages/server/src/threads/query.ts @@ -9,11 +9,11 @@ import { getGlobalIDFromUserMetadataID } from "../db/utils" import sdk from "../sdk" import { cloneDeep } from "lodash/fp" -const { isSQL } = require("../integrations/utils") -const { +import { isSQL } from "../integrations/utils" +import { enrichQueryFields, interpolateSQL, -} = require("../integrations/queries/sql") +} from "../integrations/queries/sql" class QueryRunner { datasource: any diff --git a/packages/server/src/utilities/fileSystem/filesystem.ts b/packages/server/src/utilities/fileSystem/filesystem.ts index 48810ffc47..086eaa835a 100644 --- a/packages/server/src/utilities/fileSystem/filesystem.ts +++ b/packages/server/src/utilities/fileSystem/filesystem.ts @@ -1,10 +1,10 @@ import { PathLike } from "fs" -const { budibaseTempDir } = require("../budibaseDir") -const fs = require("fs") -const { join } = require("path") -const uuid = require("uuid/v4") +import fs from "fs" +import { budibaseTempDir } from "../budibaseDir" +import { join } from "path" import env from "../../environment" import tar from "tar" +const uuid = require("uuid/v4") export const TOP_LEVEL_PATH = join(__dirname, "..", "..", "..") @@ -112,6 +112,7 @@ export const sendTempFile = (fileContents: any) => { * allows a centralised location to check logic is all good. */ export const readFileSync = (filepath: PathLike, options = "utf8") => { + // @ts-ignore return fs.readFileSync(filepath, options) } @@ -147,6 +148,7 @@ export const findFileRec = (startPath: PathLike, filter: string): any => { const files = fs.readdirSync(startPath) for (let i = 0, len = files.length; i < len; i++) { + // @ts-ignore const filename = join(startPath, files[i]) const stat = fs.lstatSync(filename) diff --git a/packages/server/src/utilities/fileSystem/plugin.ts b/packages/server/src/utilities/fileSystem/plugin.ts index ea1742faba..0bc2b7de44 100644 --- a/packages/server/src/utilities/fileSystem/plugin.ts +++ b/packages/server/src/utilities/fileSystem/plugin.ts @@ -1,8 +1,7 @@ import { Plugin } from "@budibase/types" - -const { budibaseTempDir } = require("../budibaseDir") -const fs = require("fs") -const { join } = require("path") +import { budibaseTempDir } from "../budibaseDir" +import fs from "fs" +import { join } from "path" import { objectStore } from "@budibase/backend-core" const DATASOURCE_PATH = join(budibaseTempDir(), "datasource") diff --git a/packages/server/src/utilities/fileSystem/template.ts b/packages/server/src/utilities/fileSystem/template.ts index 17a959007e..87e0b44e5c 100644 --- a/packages/server/src/utilities/fileSystem/template.ts +++ b/packages/server/src/utilities/fileSystem/template.ts @@ -1,5 +1,5 @@ -const fs = require("fs") -const { join } = require("path") +import fs from "fs" +import { join } from "path" import { ObjectStoreBuckets } from "../../constants" import { objectStore } from "@budibase/backend-core" From 3778ab3bd58b65cd5ce3e07de4c4d40d85782b73 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 12 Jan 2023 09:18:17 +0000 Subject: [PATCH 072/387] Update pickers to use absolutely positioned root popover so that overflow does not matter --- packages/bbui/src/Actions/click_outside.js | 2 +- .../bbui/src/Actions/position_dropdown.js | 24 +- packages/bbui/src/Form/Core/Picker.svelte | 256 +++++++++--------- packages/bbui/src/Popover/Popover.svelte | 22 +- 4 files changed, 169 insertions(+), 135 deletions(-) diff --git a/packages/bbui/src/Actions/click_outside.js b/packages/bbui/src/Actions/click_outside.js index 3a08484635..9ea247f997 100644 --- a/packages/bbui/src/Actions/click_outside.js +++ b/packages/bbui/src/Actions/click_outside.js @@ -1,4 +1,4 @@ -const ignoredClasses = [".flatpickr-calendar", ".modal-container"] +const ignoredClasses = [".flatpickr-calendar"] let clickHandlers = [] /** diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js index 7570a39c8c..88f8783633 100644 --- a/packages/bbui/src/Actions/position_dropdown.js +++ b/packages/bbui/src/Actions/position_dropdown.js @@ -1,6 +1,10 @@ -export default function positionDropdown(element, { anchor, align, maxWidth }) { +export default function positionDropdown( + element, + { anchor, align, maxWidth, useAnchorWidth } +) { let positionSide = "top" let maxHeight = 0 + let minWidth = 0 let dimensions = getDimensions(anchor) function getDimensions() { @@ -14,8 +18,7 @@ export default function positionDropdown(element, { anchor, align, maxWidth }) { const containerRect = element.getBoundingClientRect() let y - - if (spaceAbove > spaceBelow) { + if (window.innerHeight - bottom < 100) { positionSide = "bottom" maxHeight = spaceAbove - 20 y = window.innerHeight - spaceAbove + 5 @@ -25,6 +28,13 @@ export default function positionDropdown(element, { anchor, align, maxWidth }) { maxHeight = spaceBelow - 20 } + if (!maxWidth && useAnchorWidth) { + maxWidth = width + } + if (useAnchorWidth) { + minWidth = width + } + return { [positionSide]: y, left, @@ -36,9 +46,9 @@ export default function positionDropdown(element, { anchor, align, maxWidth }) { function calcLeftPosition() { let left - if (align == "right") { + if (align === "right") { left = dimensions.left + dimensions.width - dimensions.containerWidth - } else if (align == "right-side") { + } else if (align === "right-side") { left = dimensions.left + dimensions.width } else { left = dimensions.left @@ -52,7 +62,9 @@ export default function positionDropdown(element, { anchor, align, maxWidth }) { if (maxWidth) { element.style.maxWidth = `${maxWidth}px` } - element.style.minWidth = `${dimensions.width}px` + if (minWidth) { + element.style.minWidth = `${minWidth}px` + } element.style.maxHeight = `${maxHeight.toFixed(0)}px` element.style.transformOrigin = `center ${positionSide}` element.style[positionSide] = `${dimensions[positionSide]}px` diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index 63f07b7cd6..81348452c7 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -2,12 +2,12 @@ import "@spectrum-css/picker/dist/index-vars.css" import "@spectrum-css/popover/dist/index-vars.css" import "@spectrum-css/menu/dist/index-vars.css" - import { fly } from "svelte/transition" import { createEventDispatcher } from "svelte" import clickOutside from "../../Actions/click_outside" import Search from "./Search.svelte" import Icon from "../../Icon/Icon.svelte" import StatusLight from "../../StatusLight/StatusLight.svelte" + import Popover from "../../Popover/Popover.svelte" export let id = null export let disabled = false @@ -33,7 +33,10 @@ export let sort = false const dispatch = createEventDispatcher() + let searchTerm = null + let button + let popover $: sortedOptions = getSortedOptions(options, getOptionLabel, sort) $: filteredOptions = getFilteredOptions( @@ -76,77 +79,117 @@ } -
(open = false)}> - - {#if open} -
- {#if autocomplete} - (searchTerm = event.detail)} - {disabled} - placeholder="Search" - /> + {/if} + + + + (open = false)} + useAnchorWidth={!autoWidth} + maxWidth={autoWidth ? 400 : null} +> +
+ {#if autocomplete} + (searchTerm = event.detail)} + {disabled} + placeholder="Search" + /> + {/if} +
    + {#if placeholderOption} +
  • onSelectOption(null)} + > + {placeholderOption} + +
    • {/if} -
      - {#if placeholderOption} + {#if filteredOptions.length} + {#each filteredOptions as option, idx}
    • onSelectOption(null)} + on:click={() => onSelectOption(getOptionValue(option, idx))} + class:is-disabled={!isOptionEnabled(option)} > - {placeholderOption} + {#if getOptionIcon(option, idx)} + + + + {/if} + {#if getOptionColour(option, idx)} + + + + {/if} + + {getOptionLabel(option, idx)} +
      • - {/if} - {#if filteredOptions.length} - {#each filteredOptions as option, idx} -
    • onSelectOption(getOptionValue(option, idx))} - class:is-disabled={!isOptionEnabled(option)} - > - {#if getOptionIcon(option, idx)} - - - - {/if} - {#if getOptionColour(option, idx)} - - - - {/if} - - {getOptionLabel(option, idx)} - - -
      • - {/each} - {/if} -
    -
- {/if} -
+ {/each} + {/if} + +
+ diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte index b81e76dc1f..191898578a 100644 --- a/packages/bbui/src/Popover/Popover.svelte +++ b/packages/bbui/src/Popover/Popover.svelte @@ -4,6 +4,7 @@ import { createEventDispatcher } from "svelte" import positionDropdown from "../Actions/position_dropdown" import clickOutside from "../Actions/click_outside" + import { fly } from "svelte/transition" const dispatch = createEventDispatcher() @@ -12,9 +13,10 @@ export let portalTarget export let dataCy export let maxWidth - export let direction = "bottom" export let showTip = false + export let open = false + export let useAnchorWidth = false let tipSvg = ' ' @@ -35,13 +37,22 @@ const handleOutsideClick = e => { if (open) { - e.stopPropagation() + // Stop propagation if the source is the anchor + let node = e.target + let fromAnchor = false + while (!fromAnchor && node && node.parentNode) { + fromAnchor = node === anchor + node = node.parentNode + } + if (fromAnchor) { + e.stopPropagation() + } + + // Hide the popover hide() } } - let open = null - function handleEscape(e) { if (open && e.key === "Escape") { hide() @@ -53,12 +64,13 @@
+ +
+ +
- + + + + + + +
+ Production + +
+
+ Development + + { + developmentValue = productionValue + }} + bind:value={useProductionValue} + text="Use production value" + /> +
+ + diff --git a/packages/builder/src/stores/portal/envVars.js b/packages/builder/src/stores/portal/envVars.js index 9c9880511a..81d3143f15 100644 --- a/packages/builder/src/stores/portal/envVars.js +++ b/packages/builder/src/stores/portal/envVars.js @@ -5,10 +5,15 @@ export function createEnvVarsStore() { const { subscribe, set, update } = writable([]) async function load() { - const envVars = await API.fetchEnvVars() + // const envVars = await API.fetchEnvVars() let testVars = ['blah', 'blah123'] - set(testVars) + + // turn the testVars array in to a map with "name" being the value of each + // item in the array + const vars = testVars.map((name) => ({ name })) + console.log(vars) + set(vars) } return { diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js index 81d26b900e..370c448bb3 100644 --- a/packages/builder/src/stores/portal/index.js +++ b/packages/builder/src/stores/portal/index.js @@ -11,3 +11,4 @@ export { groups } from "./groups" export { plugins } from "./plugins" export { backups } from "./backups" export { overview } from "./overview" +export { envVars } from "./envVars" \ No newline at end of file From 020cddc76efdc489144eefe9ef7114350c419e05 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 12 Jan 2023 14:42:05 +0000 Subject: [PATCH 077/387] Improve dropdown logic --- .../bbui/src/Actions/position_dropdown.js | 96 ++++++++----------- 1 file changed, 39 insertions(+), 57 deletions(-) diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js index 88f8783633..e89f28a69e 100644 --- a/packages/bbui/src/Actions/position_dropdown.js +++ b/packages/bbui/src/Actions/position_dropdown.js @@ -2,86 +2,68 @@ export default function positionDropdown( element, { anchor, align, maxWidth, useAnchorWidth } ) { - let positionSide = "top" - let maxHeight = 0 - let minWidth = 0 - let dimensions = getDimensions(anchor) - - function getDimensions() { - const { - bottom, - top: spaceAbove, - left, - width, - } = anchor.getBoundingClientRect() - const spaceBelow = window.innerHeight - bottom - const containerRect = element.getBoundingClientRect() - - let y - if (window.innerHeight - bottom < 100) { - positionSide = "bottom" - maxHeight = spaceAbove - 20 - y = window.innerHeight - spaceAbove + 5 - } else { - positionSide = "top" - y = bottom + 5 - maxHeight = spaceBelow - 20 + const update = () => { + console.log("update") + const anchorBounds = anchor.getBoundingClientRect() + const elementBounds = element.getBoundingClientRect() + let styles = { + maxHeight: null, + minWidth: null, + maxWidth, + left: null, + top: null, } + // Determine vertical styles + if (window.innerHeight - anchorBounds.bottom < 100) { + styles.top = anchorBounds.top - elementBounds.height - 5 + } else { + styles.top = anchorBounds.bottom + 5 + styles.maxHeight = window.innerHeight - anchorBounds.bottom - 20 + } + + // Determine horizontal styles if (!maxWidth && useAnchorWidth) { - maxWidth = width + styles.maxWidth = anchorBounds.width } if (useAnchorWidth) { - minWidth = width + styles.minWidth = anchorBounds.width } - - return { - [positionSide]: y, - left, - width, - containerWidth: containerRect.width, - } - } - - function calcLeftPosition() { - let left - if (align === "right") { - left = dimensions.left + dimensions.width - dimensions.containerWidth + styles.left = anchorBounds.left + anchorBounds.width - elementBounds.width } else if (align === "right-side") { - left = dimensions.left + dimensions.width + styles.left = anchorBounds.left + anchorBounds.width } else { - left = dimensions.left + styles.left = anchorBounds.left } - return left + // Apply styles + Object.entries(styles).forEach(([style, value]) => { + if (value) { + element.style[style] = `${value.toFixed(0)}px` + } else { + element.style[style] = null + } + }) } + // Apply initial styles which don't need to change element.style.position = "absolute" element.style.zIndex = "9999" - if (maxWidth) { - element.style.maxWidth = `${maxWidth}px` - } - if (minWidth) { - element.style.minWidth = `${minWidth}px` - } - element.style.maxHeight = `${maxHeight.toFixed(0)}px` - element.style.transformOrigin = `center ${positionSide}` - element.style[positionSide] = `${dimensions[positionSide]}px` - element.style.left = `${calcLeftPosition(dimensions).toFixed(0)}px` + // Observe both anchor and element and resize the popover as appropriate const resizeObserver = new ResizeObserver(entries => { - entries.forEach(() => { - dimensions = getDimensions() - element.style[positionSide] = `${dimensions[positionSide]}px` - element.style.left = `${calcLeftPosition(dimensions).toFixed(0)}px` - }) + entries.forEach(update) }) resizeObserver.observe(anchor) resizeObserver.observe(element) + + document.addEventListener("scroll", update, true) + return { destroy() { resizeObserver.disconnect() + document.removeEventListener("scroll", update, true) }, } } From b21f0b392579457f1557a768961af44b49d651b3 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 12 Jan 2023 14:48:05 +0000 Subject: [PATCH 078/387] Lint --- .../components/backend/DataTable/Table.svelte | 1 - .../src/components/common/AppLockModal.svelte | 4 --- .../src/components/settings/ThemeModal.svelte | 2 +- .../new/_components/NewComponentPanel.svelte | 1 + .../screens/_components/RoleIndicator.svelte | 1 + .../pages/builder/portal/account/usage.svelte | 5 ++-- .../pages/builder/portal/apps/create.svelte | 28 ------------------- .../portal/overview/[appId]/_layout.svelte | 6 ++-- .../[appId]/automation-history/index.svelte | 1 - .../portal/overview/[appId]/overview.svelte | 3 -- .../portal/settings/email/[template].svelte | 4 +-- .../portal/users/groups/[groupId].svelte | 6 ---- .../portal/users/users/[userId].svelte | 2 -- .../static/templates/BudibaseApp.svelte | 1 - 14 files changed, 9 insertions(+), 56 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte index c82a9656e1..769dc9c88b 100644 --- a/packages/builder/src/components/backend/DataTable/Table.svelte +++ b/packages/builder/src/components/backend/DataTable/Table.svelte @@ -25,7 +25,6 @@ export let loading = false export let hideAutocolumns export let rowCount - export let type export let disableSorting = false export let customPlaceholder = false diff --git a/packages/builder/src/components/common/AppLockModal.svelte b/packages/builder/src/components/common/AppLockModal.svelte index 5e52ab269c..6f8936fcf4 100644 --- a/packages/builder/src/components/common/AppLockModal.svelte +++ b/packages/builder/src/components/common/AppLockModal.svelte @@ -141,8 +141,4 @@ gap: var(--spacing-s); max-width: 175px; } - .lock-status-text { - font-weight: 400; - color: var(--spectrum-global-color-gray-800); - } diff --git a/packages/builder/src/components/settings/ThemeModal.svelte b/packages/builder/src/components/settings/ThemeModal.svelte index fd7460327a..43fe7b7768 100644 --- a/packages/builder/src/components/settings/ThemeModal.svelte +++ b/packages/builder/src/components/settings/ThemeModal.svelte @@ -1,6 +1,6 @@ diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte index 0610be6d0a..98e04a262a 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/new/_components/NewComponentPanel.svelte @@ -263,6 +263,7 @@ orderMap[component.component]} on:click={() => addComponent(component.component)} on:mouseover={() => (selectedIndex = null)} + on:focus > {component.name} diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/RoleIndicator.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/RoleIndicator.svelte index eb25d86645..2c95c6fb82 100644 --- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/RoleIndicator.svelte +++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/screens/_components/RoleIndicator.svelte @@ -20,6 +20,7 @@ class="container" on:mouseover={() => (showTooltip = true)} on:mouseleave={() => (showTooltip = false)} + on:focus style="--color: {color};" > diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte index 9ffdee1e42..f75b6801fc 100644 --- a/packages/builder/src/pages/builder/portal/account/usage.svelte +++ b/packages/builder/src/pages/builder/portal/account/usage.svelte @@ -8,12 +8,11 @@ Detail, Link, TooltipWrapper, - Page, } from "@budibase/bbui" import { onMount } from "svelte" - import { admin, auth, licensing } from "../../../../stores/portal" + import { admin, auth, licensing } from "stores/portal" import { Constants } from "@budibase/frontend-core" - import { DashCard, Usage } from "../../../../components/usage" + import { DashCard, Usage } from "components/usage" let staticUsage = [] let monthlyUsage = [] diff --git a/packages/builder/src/pages/builder/portal/apps/create.svelte b/packages/builder/src/pages/builder/portal/apps/create.svelte index 400d142b12..72ed203880 100644 --- a/packages/builder/src/pages/builder/portal/apps/create.svelte +++ b/packages/builder/src/pages/builder/portal/apps/create.svelte @@ -77,31 +77,3 @@ - - diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte index c1165d8550..b7b4878791 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/_layout.svelte @@ -1,5 +1,5 @@ @@ -15,11 +16,13 @@ url={$url("./users")} active={$isActive("./users")} /> - + {#if isEnabled(TENANT_FEATURE_FLAGS.USER_GROUPS)} + + {/if} From a0dacc9717fd4ea04fd831f352d36bed76165cd4 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 12 Jan 2023 16:09:05 +0000 Subject: [PATCH 083/387] add create store method and tidy up --- .../src/pages/builder/portal/_layout.svelte | 5 -- .../builder/portal/settings/_layout.svelte | 5 ++ .../_components/editVariableModal.svelte | 0 .../{ => settings}/environment/index.svelte | 47 +++++++++---------- packages/builder/src/stores/portal/envVars.js | 11 +++-- packages/builder/src/stores/portal/index.js | 2 +- packages/frontend-core/src/api/envVars.js | 9 +++- 7 files changed, 43 insertions(+), 36 deletions(-) rename packages/builder/src/pages/builder/portal/{ => settings}/environment/_components/editVariableModal.svelte (100%) rename packages/builder/src/pages/builder/portal/{ => settings}/environment/index.svelte (70%) diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index dc8e60edd6..9048502550 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -55,11 +55,6 @@ title: "Plugins", href: "/builder/portal/plugins", }, - { - title: "Environment", - href: "/builder/portal/environment", - }, - { title: "Settings", href: "/builder/portal/settings", diff --git a/packages/builder/src/pages/builder/portal/settings/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/_layout.svelte index 57410bcaeb..6d9f306991 100644 --- a/packages/builder/src/pages/builder/portal/settings/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/settings/_layout.svelte @@ -26,6 +26,11 @@ url={$url("./organisation")} active={$isActive("./organisation")} /> + {#if !$admin.cloud} - - - - Envrironment Variables - Add and manage environment variable for development and production - - - -
- -
- -
+ + + Envrironment Variables + Add and manage environment variable for development and production - + + +
+ +
+ +
+ diff --git a/packages/builder/src/stores/portal/envVars.js b/packages/builder/src/stores/portal/envVars.js index ec3af53d8f..0d257d6bf7 100644 --- a/packages/builder/src/stores/portal/envVars.js +++ b/packages/builder/src/stores/portal/envVars.js @@ -6,16 +6,21 @@ export function createEnvVarsStore() { async function load() { // const envVars = await API.fetchEnvVars() - - let testVars = ['blah', 'blah123'] - const vars = testVars.map((name) => ({ name })) + let testVars = ["blah", "blah123"] + const vars = testVars.map(name => ({ name })) console.log(vars) set(vars) } + async function create() { + const envVar = await API.createEnvVar() + update(envVars => [envVar, ...envVars]) + } + return { subscribe, load, + create, } } diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js index 370c448bb3..a1ed6615a1 100644 --- a/packages/builder/src/stores/portal/index.js +++ b/packages/builder/src/stores/portal/index.js @@ -11,4 +11,4 @@ export { groups } from "./groups" export { plugins } from "./plugins" export { backups } from "./backups" export { overview } from "./overview" -export { envVars } from "./envVars" \ No newline at end of file +export { envVars } from "./envVars" diff --git a/packages/frontend-core/src/api/envVars.js b/packages/frontend-core/src/api/envVars.js index 7a728e9d18..44f81cd6c9 100644 --- a/packages/frontend-core/src/api/envVars.js +++ b/packages/frontend-core/src/api/envVars.js @@ -2,7 +2,14 @@ export const buildEnvironmentVariableEndpoints = API => ({ /** * Fetches a list of environment variables */ - fetchEnvVars: async () => { + fetchVariables: async () => { + return await API.get({ + url: `/api/env/variables`, + json: false, + }) + }, + + createVariable: async () => { return await API.get({ url: `/api/env/variables`, json: false, From 5d24fe0a13c1543359eafb0976d73f3cc78be084 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 12 Jan 2023 16:50:43 +0000 Subject: [PATCH 084/387] Centralise menu logic and show full menu on mobile --- .../portal/_components/MobileMenu.svelte | 38 ++++-- .../src/pages/builder/portal/_layout.svelte | 61 +-------- .../builder/portal/account/_layout.svelte | 35 +---- .../builder/portal/settings/_layout.svelte | 30 +---- .../pages/builder/portal/users/_layout.svelte | 20 +-- .../pages/builder/portal/users/index.svelte | 4 + packages/builder/src/stores/portal/index.js | 1 + packages/builder/src/stores/portal/menu.js | 120 ++++++++++++++++++ 8 files changed, 179 insertions(+), 130 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/users/index.svelte create mode 100644 packages/builder/src/stores/portal/menu.js diff --git a/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte b/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte index 8baf7609d0..0077c0acc9 100644 --- a/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte +++ b/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte @@ -6,9 +6,9 @@ import UpgradeButton from "./UpgradeButton.svelte" import { fade } from "svelte/transition" import Logo from "./Logo.svelte" + import { menu } from "stores/portal" export let visible = false - export let menu const dispatch = createEventDispatcher() @@ -28,13 +28,28 @@ - {#each menu as { title, href }} - + {#each $menu as { title, href, subPages }} + {#if !subPages?.length} + + {/if} + {/each} + {#each $menu as { title, href, subPages }} + {#if subPages?.length} +
{title}
+ {#each subPages as { title, href }} + + {/each} + {/if} {/each}
@@ -47,6 +62,13 @@ .mobile-nav { display: none; } + .category { + color: var(--spectrum-global-color-gray-600); + font-size: var(--font-size-s); + margin-left: var(--spacing-m); + margin-top: 24px; + margin-bottom: 4px; + } @media (max-width: 640px) { .mobile-nav-underlay { diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 9048502550..8cc5f5c79e 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -1,9 +1,8 @@
- - - - {#if $admin.cloud && $auth?.user?.accountPortalAccess} - - {:else if !$admin.cloud && admin} - - {/if} - - {#if $auth?.user?.accountPortalAccess && $auth.user.account.stripeCustomerId} - - {/if} + {#each pages as { title, href }} + + {/each}
diff --git a/packages/builder/src/pages/builder/portal/settings/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/_layout.svelte index 57410bcaeb..ec26ca5754 100644 --- a/packages/builder/src/pages/builder/portal/settings/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/settings/_layout.svelte @@ -1,38 +1,20 @@
- - - - {#if !$admin.cloud} - - {/if} + {#each pages as { title, href }} + + {/each}
diff --git a/packages/builder/src/pages/builder/portal/users/_layout.svelte b/packages/builder/src/pages/builder/portal/users/_layout.svelte index 79d749f21c..97de1eeabf 100644 --- a/packages/builder/src/pages/builder/portal/users/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/users/_layout.svelte @@ -1,28 +1,20 @@
- - {#if isEnabled(TENANT_FEATURE_FLAGS.USER_GROUPS)} - - {/if} + {#each pages as { title, href }} + + {/each}
diff --git a/packages/builder/src/pages/builder/portal/users/index.svelte b/packages/builder/src/pages/builder/portal/users/index.svelte new file mode 100644 index 0000000000..4dbb81f7c6 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/users/index.svelte @@ -0,0 +1,4 @@ + diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js index 81d26b900e..9a27604034 100644 --- a/packages/builder/src/stores/portal/index.js +++ b/packages/builder/src/stores/portal/index.js @@ -11,3 +11,4 @@ export { groups } from "./groups" export { plugins } from "./plugins" export { backups } from "./backups" export { overview } from "./overview" +export { menu } from "./menu" diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js new file mode 100644 index 0000000000..54ed4bdba8 --- /dev/null +++ b/packages/builder/src/stores/portal/menu.js @@ -0,0 +1,120 @@ +import { derived } from "svelte/store" +import { isEnabled, TENANT_FEATURE_FLAGS } from "helpers/featureFlags" +import { admin } from "./admin" +import { auth } from "./auth" + +export const menu = derived([admin, auth], ([$admin, $auth]) => { + // Standard user and developer pages + let menu = [ + { + title: "Apps", + href: "/builder/portal/apps", + }, + { + title: "Plugins", + href: "/builder/portal/plugins", + }, + ] + + // Admin only pages + if ($auth.isAdmin) { + // Determine user sub pages + let userSubPages = [ + { + title: "Users", + href: "/builder/portal/users/users", + }, + ] + if (isEnabled(TENANT_FEATURE_FLAGS.USER_GROUPS)) { + userSubPages.push({ + title: "Groups", + href: "/builder/portal/users/groups", + }) + } + + // Determine settings sub pages + let settingsSubPages = [ + { + title: "Auth", + href: "/builder/portal/settings/auth", + }, + { + title: "Email", + href: "/builder/portal/settings/email", + }, + { + title: "Organisation", + href: "/builder/portal/settings/organisation", + }, + ] + if (!$admin.cloud) { + settingsSubPages.push({ + title: "Version", + href: "/builder/portal/settings/version", + }) + } + + menu = [ + { + title: "Apps", + href: "/builder/portal/apps", + }, + { + title: "Users", + href: "/builder/portal/users", + subPages: userSubPages, + }, + { + title: "Plugins", + href: "/builder/portal/plugins", + }, + { + title: "Settings", + href: "/builder/portal/settings", + subPages: settingsSubPages, + }, + ] + } + + // Check if allowed access to account section + if ( + isEnabled(TENANT_FEATURE_FLAGS.LICENSING) && + ($auth?.user?.accountPortalAccess || (!$admin.cloud && $auth.isAdmin)) + ) { + // Determine account sub pages + let accountSubPages = [ + { + title: "Usage", + href: "/builder/portal/account/usage", + }, + ] + if ($admin.cloud && $auth?.user?.accountPortalAccess) { + accountSubPages.push({ + title: "Upgrade", + href: $admin.accountPortalUrl + "/portal/upgrade", + }) + } else if (!$admin.cloud && admin) { + accountSubPages.push({ + title: "Upgrade", + href: "/builder/portal/account/upgrade", + }) + } + if ( + $auth?.user?.accountPortalAccess && + $auth.user.account.stripeCustomerId + ) { + accountSubPages.push({ + title: "Billing", + href: $admin.accountPortalUrl + "/portal/billing", + }) + } + + menu.push({ + title: "Account", + href: "/builder/portal/account", + subPages: accountSubPages, + }) + } + + return menu +}) From 4e4b074635b477a16c399d4a68fc0156755036a9 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 12 Jan 2023 17:04:05 +0000 Subject: [PATCH 085/387] Update app access assignment and fix backups table --- .../src/pages/builder/apps/index.svelte | 2 +- .../apps/_components/AcessFilter.svelte | 49 ------------------- .../access/_components/AssignmentModal.svelte | 23 +++++---- .../overview/[appId]/access/index.svelte | 30 +++++++++--- .../overview/[appId]/backups/index.svelte | 2 +- 5 files changed, 40 insertions(+), 66 deletions(-) delete mode 100644 packages/builder/src/pages/builder/portal/apps/_components/AcessFilter.svelte diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte index ad1b5ec7f8..001bf43b50 100644 --- a/packages/builder/src/pages/builder/apps/index.svelte +++ b/packages/builder/src/pages/builder/apps/index.svelte @@ -104,7 +104,7 @@
userInfoModal.show()}> - Update user information + My profile - import { PickerDropdown } from "@budibase/bbui" - import { groups } from "stores/portal" - import { createEventDispatcher } from "svelte" - - const dispatch = createEventDispatcher() - - let filter = null - $: filteredGroups = !filter - ? $groups - : $groups.filter(group => - group.name?.toLowerCase().includes(filter.toLowerCase()) - ) - - $: optionSections = { - groups: { - data: filteredGroups, - getLabel: group => group.name, - getValue: group => group._id, - getIcon: group => group.icon, - getColour: group => group.color, - }, - } - - $: onChange = selected => { - const { detail } = selected - if (!detail || Object.keys(detail).length == 0) { - dispatch("change", null) - return - } - - const groupSelected = $groups.find(x => x._id === detail) - const appRoleIds = groupSelected?.roles - ? Object.keys(groupSelected?.roles) - : [] - dispatch("change", appRoleIds) - } - - - { - filter = null - }} -/> diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte index 0cb8085bb0..37143e25c1 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/access/_components/AssignmentModal.svelte @@ -14,6 +14,8 @@ export let app export let appUsers = [] + export let showUsers = false + export let showGroups = false const dispatch = createEventDispatcher() const usersFetch = fetchData({ @@ -41,7 +43,8 @@ $: availableGroups = getAvailableGroups($groups, app.appId, search, data) $: valid = data?.length && !data?.some(x => !x.id?.length || !x.role?.length) $: optionSections = { - ...($licensing.groupsEnabled && + ...(showGroups && + $licensing.groupsEnabled && availableGroups.length && { ["User groups"]: { data: availableGroups, @@ -51,13 +54,15 @@ getColour: group => group.color, }, }), - users: { - data: availableUsers, - getLabel: user => user.email, - getValue: user => user._id, - getIcon: user => user.icon, - getColour: user => user.color, - }, + ...(showUsers && { + users: { + data: availableUsers, + getLabel: user => user.email, + getValue: user => user._id, + getIcon: user => user.icon, + getColour: user => user.color, + }, + }), } const addData = async appData => { @@ -185,7 +190,7 @@ {/if}
- Add email + Add more
diff --git a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte b/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte index c17efdb075..43eea4aaa6 100644 --- a/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte +++ b/packages/builder/src/pages/builder/portal/overview/[appId]/access/index.svelte @@ -36,7 +36,7 @@ }, role: { displayName: "Access", - width: "160px", + width: "150px", borderLeft: true, }, } @@ -50,6 +50,8 @@ let assignmentModal let appGroups let appUsers + let showAddUsers = false + let showAddGroups = false $: app = $overview.selectedApp $: devAppId = app.devId @@ -153,6 +155,18 @@ await usersFetch.refresh() } + const showUsersModal = () => { + showAddUsers = true + showAddGroups = false + assignmentModal.show() + } + + const showGroupsModal = () => { + showAddUsers = false + showAddGroups = true + assignmentModal.show() + } + setContext("roles", { updateRole, removeRole, @@ -178,7 +192,7 @@
Users - +
Groups - +
- + From 1d9ab4163ff3e75167ddabb9d4805112e7c9568d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 Jan 2023 08:28:33 +0000 Subject: [PATCH 087/387] Standardise disabled field text colour --- packages/bbui/src/Form/Core/TextField.svelte | 4 ---- packages/bbui/src/bbui.css | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/bbui/src/Form/Core/TextField.svelte b/packages/bbui/src/Form/Core/TextField.svelte index 0a723c140a..6a64876a2c 100644 --- a/packages/bbui/src/Form/Core/TextField.svelte +++ b/packages/bbui/src/Form/Core/TextField.svelte @@ -112,8 +112,4 @@ .spectrum-Textfield { width: 100%; } - input:disabled { - color: var(--spectrum-global-color-gray-600) !important; - -webkit-text-fill-color: var(--spectrum-global-color-gray-600) !important; - } diff --git a/packages/bbui/src/bbui.css b/packages/bbui/src/bbui.css index b3213ef694..ef3483d3df 100644 --- a/packages/bbui/src/bbui.css +++ b/packages/bbui/src/bbui.css @@ -40,7 +40,6 @@ --rounded-medium: 8px; --rounded-large: 16px; - --font-sans: "Source Sans Pro", -apple-system, BlinkMacSystemFont, Segoe UI, "Inter", "Helvetica Neue", Arial, "Noto Sans", sans-serif; --font-accent: "Source Sans Pro", -apple-system, BlinkMacSystemFont, Segoe UI, "Inter", @@ -92,6 +91,8 @@ --border-light-2: 2px var(--grey-3) solid; --border-blue: 2px var(--blue) solid; --border-transparent: 2px transparent solid; + + --spectrum-alias-text-color-disabled: var(--spectrum-global-color-gray-600); } a { From e23f7dde47bc984faabee256141e7d36d9e7f46b Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 Jan 2023 08:28:54 +0000 Subject: [PATCH 088/387] Allow developer users to access users, groups and usage pages --- packages/builder/src/stores/portal/menu.js | 75 +++++++++------------- 1 file changed, 29 insertions(+), 46 deletions(-) diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js index 54ed4bdba8..29fd6144f5 100644 --- a/packages/builder/src/stores/portal/menu.js +++ b/packages/builder/src/stores/portal/menu.js @@ -4,35 +4,39 @@ import { admin } from "./admin" import { auth } from "./auth" export const menu = derived([admin, auth], ([$admin, $auth]) => { - // Standard user and developer pages + // Determine user sub pages + let userSubPages = [ + { + title: "Users", + href: "/builder/portal/users/users", + }, + ] + if (isEnabled(TENANT_FEATURE_FLAGS.USER_GROUPS)) { + userSubPages.push({ + title: "Groups", + href: "/builder/portal/users/groups", + }) + } + + // Pages that all devs and admins can access let menu = [ { title: "Apps", href: "/builder/portal/apps", }, + { + title: "Users", + href: "/builder/portal/users", + subPages: userSubPages, + }, { title: "Plugins", href: "/builder/portal/plugins", }, ] - // Admin only pages + // Add settings page for admins if ($auth.isAdmin) { - // Determine user sub pages - let userSubPages = [ - { - title: "Users", - href: "/builder/portal/users/users", - }, - ] - if (isEnabled(TENANT_FEATURE_FLAGS.USER_GROUPS)) { - userSubPages.push({ - title: "Groups", - href: "/builder/portal/users/groups", - }) - } - - // Determine settings sub pages let settingsSubPages = [ { title: "Auth", @@ -53,35 +57,15 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => { href: "/builder/portal/settings/version", }) } - - menu = [ - { - title: "Apps", - href: "/builder/portal/apps", - }, - { - title: "Users", - href: "/builder/portal/users", - subPages: userSubPages, - }, - { - title: "Plugins", - href: "/builder/portal/plugins", - }, - { - title: "Settings", - href: "/builder/portal/settings", - subPages: settingsSubPages, - }, - ] + menu.push({ + title: "Settings", + href: "/builder/portal/settings", + subPages: settingsSubPages, + }) } - // Check if allowed access to account section - if ( - isEnabled(TENANT_FEATURE_FLAGS.LICENSING) && - ($auth?.user?.accountPortalAccess || (!$admin.cloud && $auth.isAdmin)) - ) { - // Determine account sub pages + // Add account page + if (isEnabled(TENANT_FEATURE_FLAGS.LICENSING)) { let accountSubPages = [ { title: "Usage", @@ -93,7 +77,7 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => { title: "Upgrade", href: $admin.accountPortalUrl + "/portal/upgrade", }) - } else if (!$admin.cloud && admin) { + } else if (!$admin.cloud && $auth.isAdmin) { accountSubPages.push({ title: "Upgrade", href: "/builder/portal/account/upgrade", @@ -108,7 +92,6 @@ export const menu = derived([admin, auth], ([$admin, $auth]) => { href: $admin.accountPortalUrl + "/portal/billing", }) } - menu.push({ title: "Account", href: "/builder/portal/account", From ad4133a77785e21a32ab8d100e2ebebac0d491fe Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 Jan 2023 08:29:18 +0000 Subject: [PATCH 089/387] Allow readonly access to users and groups for developer users --- .../pages/builder/portal/account/usage.svelte | 13 ++++-- .../portal/users/groups/[groupId].svelte | 31 ++++++++------ .../RemoveUserTableRenderer.svelte | 5 ++- .../builder/portal/users/groups/index.svelte | 5 ++- .../portal/users/users/[userId].svelte | 41 +++++++++++++------ .../RemoveGroupTableRenderer.svelte | 5 ++- .../builder/portal/users/users/index.svelte | 14 +++++-- 7 files changed, 78 insertions(+), 36 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte index f75b6801fc..c541e66fb1 100644 --- a/packages/builder/src/pages/builder/portal/account/usage.svelte +++ b/packages/builder/src/pages/builder/portal/account/usage.svelte @@ -184,10 +184,15 @@ - - To upgrade your plan and usage limits visit your - account. - + {#if $auth?.user?.accountPortalAccess} + + To upgrade your plan and usage limits visit your + account. + + {:else} + Contact your account holder to upgrade your plan. + {/if} + x._id === groupId) @@ -164,24 +165,28 @@
{group?.name} - - - - - editModal.show()}> - Edit - - deleteModal.show()}> - Delete - - + {#if !readonly} + + + + + editModal.show()}> + Edit + + deleteModal.show()}> + Delete + + + {/if}
Users
- +
import { ActionButton } from "@budibase/bbui" import { getContext } from "svelte" + import { auth } from "stores/portal" export let value @@ -12,4 +13,6 @@ } -Remove + + Remove + diff --git a/packages/builder/src/pages/builder/portal/users/groups/index.svelte b/packages/builder/src/pages/builder/portal/users/groups/index.svelte index 25c8702f6b..43561d2d30 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/index.svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/index.svelte @@ -39,6 +39,7 @@ { column: "roles", component: GroupAppsTableRenderer }, ] + $: readonly = !$auth.isAdmin $: schema = { name: { displayName: "Group", width: "2fr", minWidth: "200px" }, users: { sortable: false, width: "1fr" }, @@ -108,7 +109,9 @@ {#if $licensing.groupsEnabled} - + {:else}
$goto(`./${detail._id}`)} - {schema} - bind:selectedRows - data={enrichedUsers} - allowEditColumns={false} - allowEditRows={false} - allowSelectRows={!readonly} - {customRenderers} - /> - + + + Users + Add users and control who gets access to your published apps -{/if} + +
+ + + + +
+ + {#if selectedRows.length > 0} + + {/if} +
+
+
$goto(`./${detail._id}`)} + {schema} + bind:selectedRows + data={enrichedUsers} + allowEditColumns={false} + allowEditRows={false} + allowSelectRows={!readonly} + {customRenderers} + loading={!$fetch.loaded || !groupsLoaded} + /> + + From f5936f2583543e58f7b6a2fc5e3616a85512fa2a Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 Jan 2023 08:47:15 +0000 Subject: [PATCH 092/387] Improve responsiveness on apps list page and fix discussions link styles --- packages/builder/src/components/common/HelpIcon.svelte | 1 + .../builder/src/pages/builder/portal/apps/index.svelte | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/packages/builder/src/components/common/HelpIcon.svelte b/packages/builder/src/components/common/HelpIcon.svelte index bb3256792e..50434b7b16 100644 --- a/packages/builder/src/components/common/HelpIcon.svelte +++ b/packages/builder/src/components/common/HelpIcon.svelte @@ -31,6 +31,7 @@ bottom: var(--spacing-m); right: var(--spacing-m); border-radius: 55%; + z-index: 99999; } .hidden { display: none; diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte index 8efa4b7271..f073693a49 100644 --- a/packages/builder/src/pages/builder/portal/apps/index.svelte +++ b/packages/builder/src/pages/builder/portal/apps/index.svelte @@ -346,6 +346,10 @@ justify-content: flex-start; align-items: center; gap: var(--spacing-xl); + flex-wrap: wrap; + } + .app-actions :global(.spectrum-Textfield) { + max-width: 180px; } .app-table { @@ -380,6 +384,9 @@ margin-top: var(--spacing-xl); margin-bottom: calc(-1 * var(--spacing-m)); } + .app-actions :global(.spectrum-Textfield) { + max-width: none; + } /* Hide download apps icon */ .app-actions :global(> .spectrum-Icon) { display: none; From 7b3733d659dc28f689c1144f05051fd4d2d1921a Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 13 Jan 2023 09:20:55 +0000 Subject: [PATCH 093/387] Merge commit --- .../backend-core/src/events/publishers/user.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/packages/backend-core/src/events/publishers/user.ts b/packages/backend-core/src/events/publishers/user.ts index 2c83b267d6..92bce35896 100644 --- a/packages/backend-core/src/events/publishers/user.ts +++ b/packages/backend-core/src/events/publishers/user.ts @@ -13,6 +13,7 @@ import { UserPermissionAssignedEvent, UserPermissionRemovedEvent, UserUpdatedEvent, + UserOnboardingEvent, } from "@budibase/types" export async function created(user: User, timestamp?: number) { @@ -36,6 +37,21 @@ export async function deleted(user: User) { await publishEvent(Event.USER_DELETED, properties) } +export async function onboardingComplete(user: User) { + const properties: UserOnboardingEvent = { + userId: user._id as string, + } + await publishEvent(Event.USER_ONBOARDING_COMPLETE, properties) +} + +export async function onboardingProgress(user: User, step?: string) { + const properties: UserOnboardingEvent = { + userId: user._id as string, + step, + } + await publishEvent(Event.USER_ONBOARDING_STEP, properties) +} + // PERMISSIONS export async function permissionAdminAssigned(user: User, timestamp?: number) { From 31431ac98cf322907f8578faa65d096d148be448 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 Jan 2023 09:25:12 +0000 Subject: [PATCH 094/387] Update spacing on user and group detail page and fix usage page showing wrong copy --- .../builder/src/pages/builder/portal/account/usage.svelte | 4 +++- .../src/pages/builder/portal/users/groups/[groupId].svelte | 2 +- .../src/pages/builder/portal/users/users/[userId].svelte | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte index c541e66fb1..c502d35f79 100644 --- a/packages/builder/src/pages/builder/portal/account/usage.svelte +++ b/packages/builder/src/pages/builder/portal/account/usage.svelte @@ -32,6 +32,8 @@ $: license = $auth.user?.license $: accountPortalAccess = $auth?.user?.accountPortalAccess $: quotaReset = quotaUsage?.quotaReset + $: canManagePlan = + ($admin.cloud && accountPortalAccess) || (!$admin.cloud && $auth.isAdmin) const setMonthlyUsage = () => { monthlyUsage = [] @@ -184,7 +186,7 @@ - {#if $auth?.user?.accountPortalAccess} + {#if canManagePlan} To upgrade your plan and usage limits visit your account. diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte index 859e266ef0..ee584dd71b 100644 --- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte +++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte @@ -250,7 +250,7 @@ flex-direction: row; justify-content: flex-start; align-items: center; - gap: var(--spacing-m); + gap: var(--spacing-l); } .header :global(.spectrum-Heading) { flex: 1 1 auto; diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte index 9498472f66..26a1d25f44 100644 --- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte +++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte @@ -389,6 +389,7 @@ display: flex; align-items: center; justify-content: flex-start; + gap: var(--spacing-l); } .tableTitle { display: flex; @@ -396,7 +397,6 @@ align-items: flex-end; } .subtitle { - padding: 0 0 0 var(--spacing-m); display: flex; flex-direction: column; justify-content: center; From 66c6b6dec3ffca124f8231305315c8d37d4b9338 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 Jan 2023 09:26:35 +0000 Subject: [PATCH 095/387] Fix logo override not working --- .../src/pages/builder/portal/_components/Logo.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/_components/Logo.svelte b/packages/builder/src/pages/builder/portal/_components/Logo.svelte index 8276510201..811e4a162a 100644 --- a/packages/builder/src/pages/builder/portal/_components/Logo.svelte +++ b/packages/builder/src/pages/builder/portal/_components/Logo.svelte @@ -1,9 +1,14 @@ -Budibase Logo $goto("./apps")} /> +Budibase Logo $goto("./apps")} +/> From 355fb6fda2e5dcb04525c870eabd2011092ee756 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 13 Jan 2023 12:11:14 +0000 Subject: [PATCH 105/387] Make usage stats responsive and fix layout issues --- .../builder/src/components/usage/Usage.svelte | 29 ++++++++++++------- .../pages/builder/portal/account/usage.svelte | 1 + 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/packages/builder/src/components/usage/Usage.svelte b/packages/builder/src/components/usage/Usage.svelte index 49c4205a4c..6e81abfe63 100644 --- a/packages/builder/src/components/usage/Usage.svelte +++ b/packages/builder/src/components/usage/Usage.svelte @@ -39,15 +39,21 @@ {#if showWarning} {/if} -
- {usage.name} -
+ + + {usage.name} + + - {#if unlimited} - {usage.used} / Unlimited - {:else} - {usage.used} / {usage.total} - {/if} + + + {#if unlimited} + {usage.used} / Unlimited + {:else} + {usage.used} / {usage.total} + {/if} + +
{#if unlimited} @@ -89,13 +95,14 @@ display: flex; flex-direction: row; justify-content: space-between; + align-items: flex-end; margin-bottom: 12px; + gap: var(--spacing-m); } .header-container { display: flex; } - .heading { - margin-top: 3px; - margin-left: 5px; + .nowrap { + white-space: nowrap; } diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte index c502d35f79..39970a4814 100644 --- a/packages/builder/src/pages/builder/portal/account/usage.svelte +++ b/packages/builder/src/pages/builder/portal/account/usage.svelte @@ -249,6 +249,7 @@ justify-content: flex-start; align-items: flex-start; gap: 40px; + flex-wrap: wrap; } .column { flex: 1 1 0; From d7ae20ce2193498827d5039bbb1273ca50b3f4dd Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 13 Jan 2023 12:41:41 +0000 Subject: [PATCH 106/387] Use foreign key instead of parimary[0] --- .../backend/Datasources/CreateEditRelationship.svelte | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte index d83f3bf9a7..74bba33baa 100644 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte @@ -127,10 +127,7 @@ let fromPrimary $: { if (!fromPrimary && fromTable) { - const relationshipKey = fromRelationship?.fieldName - fromPrimary = - fromTable.primary.filter(val => val === relationshipKey)[0] || - fromTable.primary[0] + fromPrimary = fromRelationship?.foreignKey } } $: isManyToMany = From dfd6575aeab8cb2febfc80e96d331f704a4ac9b6 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 13 Jan 2023 15:01:21 +0000 Subject: [PATCH 107/387] Validation improvements --- .../Datasources/CreateEditRelationship.svelte | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte index 74bba33baa..b18809e980 100644 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte @@ -84,10 +84,10 @@ errObj.foreign = "Please pick the foreign key" } const colNotSet = "Please specify a column name" - if ($touched.fromCol && !fromRelate.name) { + if ($touched.fromCol && !toRelate.name) { errObj.fromCol = colNotSet } - if ($touched.toCol && !toRelate.name) { + if ($touched.toCol && !fromRelate.name) { errObj.toCol = colNotSet } if ($touched.primary && !fromPrimary) { @@ -143,7 +143,10 @@ $: through = plusTables.find(table => table._id === fromRelationship?.through) $: checkForErrors(fromRelationship, toRelationship) $: valid = - Object.keys(errors).length === 0 && Object.keys($touched).length !== 0 + Object.keys(errors).length === 0 && + Object.keys($touched).length !== 0 && + fromTable && + toTable $: linkTable = through || toTable $: relationshipTypes = [ { @@ -293,7 +296,10 @@ label="Select from table" options={tableOptions} disabled={!!selectedFromTable} - on:change={() => ($touched.from = true)} + on:change={() => { + $touched.from = true + $touched.primary = true + }} bind:error={errors.from} bind:value={toRelationship.tableId} /> @@ -309,7 +315,10 @@ ($touched.through = true)} + on:change={() => { + $touched.through = true + $touched.fromForeign = true + $touched.toForeign = true + }} bind:error={errors.through} bind:value={fromRelationship.through} /> @@ -355,15 +368,17 @@ ($touched.fromCol = true)} + on:change={() => ($touched.fromCol = true)} bind:error={errors.fromCol} label="From table column" - bind:value={fromRelationship.name} + bind:value={toRelationship.name} /> ($touched.toCol = true)} + on:change={() => ($touched.toCol = true)} bind:error={errors.toCol} label="To table column" - bind:value={toRelationship.name} + bind:value={fromRelationship.name} />
{#if originalFromName != null} From 889376003d7750a4464fc4bf3adc3755f9bc36f9 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Fri, 13 Jan 2023 16:18:46 +0000 Subject: [PATCH 108/387] Use original relationship names on delete --- .../backend/Datasources/CreateEditRelationship.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte index b18809e980..426f1ad289 100644 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte @@ -254,8 +254,8 @@ } async function deleteRelationship() { - delete datasource.entities[fromTable.name].schema[fromRelationship.name] - delete datasource.entities[toTable.name].schema[toRelationship.name] + delete datasource.entities[fromTable.name].schema[originalFromName] + delete datasource.entities[toTable.name].schema[originalToName] await save() await tables.fetch() close() From f00034544fc41f22a70db2b68be95a333d36516b Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 13 Jan 2023 16:39:26 +0000 Subject: [PATCH 109/387] reuse modal for edit and create and add delete function --- .../CreateEditVariableModal.svelte | 89 +++++++++++++++++++ .../_components/EditVariableColumn.svelte | 35 ++++++++ .../_components/editVariableModal.svelte | 69 -------------- .../portal/settings/environment/index.svelte | 48 +++------- packages/builder/src/stores/portal/envVars.js | 27 ------ .../builder/src/stores/portal/environment.js | 38 ++++++++ packages/builder/src/stores/portal/index.js | 2 +- packages/frontend-core/src/api/envVars.js | 18 ---- .../src/api/environmentVariables.js | 30 +++++++ packages/frontend-core/src/api/index.js | 3 +- 10 files changed, 207 insertions(+), 152 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/settings/environment/_components/CreateEditVariableModal.svelte create mode 100644 packages/builder/src/pages/builder/portal/settings/environment/_components/EditVariableColumn.svelte delete mode 100644 packages/builder/src/pages/builder/portal/settings/environment/_components/editVariableModal.svelte delete mode 100644 packages/builder/src/stores/portal/envVars.js create mode 100644 packages/builder/src/stores/portal/environment.js delete mode 100644 packages/frontend-core/src/api/envVars.js create mode 100644 packages/frontend-core/src/api/environmentVariables.js diff --git a/packages/builder/src/pages/builder/portal/settings/environment/_components/CreateEditVariableModal.svelte b/packages/builder/src/pages/builder/portal/settings/environment/_components/CreateEditVariableModal.svelte new file mode 100644 index 0000000000..0ea487c885 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/settings/environment/_components/CreateEditVariableModal.svelte @@ -0,0 +1,89 @@ + + + + save({ + name, + production: productionValue, + development: developmentValue, + })} + title={!row ? "Add new environment variable" : "Edit environment variable"} +> + +
+ Production + { + productionValue = e.detail + if (useProductionValue) { + developmentValue = e.detail + } + }} + value={productionValue} + /> +
+
+ Development + { + developmentValue = e.target.value + }} + disabled={useProductionValue} + label="Value" + value={useProductionValue ? productionValue : developmentValue} + /> + +
+ +
+ {#if row} + + {/if} +
+ + + { + deleteVariable(row.name) + }} + okText="Delete Environment Variable" + title="Confirm Deletion" +> + Are you sure you wish to delete the environment variable + {row.name}? + This action cannot be undone. + diff --git a/packages/builder/src/pages/builder/portal/settings/environment/_components/EditVariableColumn.svelte b/packages/builder/src/pages/builder/portal/settings/environment/_components/EditVariableColumn.svelte new file mode 100644 index 0000000000..83f37d3fdb --- /dev/null +++ b/packages/builder/src/pages/builder/portal/settings/environment/_components/EditVariableColumn.svelte @@ -0,0 +1,35 @@ + + +Edit + + + + + + { + environment.deleteVariable(row.name) + }} + okText="Delete Environment Variable" + title="Confirm Deletion" +> + Are you sure you wish to delete the environment variable + {row.name}? + This action cannot be undone. + diff --git a/packages/builder/src/pages/builder/portal/settings/environment/_components/editVariableModal.svelte b/packages/builder/src/pages/builder/portal/settings/environment/_components/editVariableModal.svelte deleted file mode 100644 index a6e9cd50bb..0000000000 --- a/packages/builder/src/pages/builder/portal/settings/environment/_components/editVariableModal.svelte +++ /dev/null @@ -1,69 +0,0 @@ - - -Edit - - - - - -
- Production - (productionTouched = true)} - label="Value" - bind:value={productionValue} - /> -
-
- Development - (developmentTouched = true)} - label="Value" - bind:value={developmentValue} - /> - -
- -
- -
- - - - { - console.log("delete") - }} - okText="Delete Environment Variable" - title="Confirm Deletion" -> - Are you sure you wish to delete the environment variable - {row.name}? - This action cannot be undone. - diff --git a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte index ab52ceb1bf..06cfc02085 100644 --- a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte @@ -6,21 +6,15 @@ Button, Divider, Modal, - ModalContent, Table, - Input, - Checkbox, } from "@budibase/bbui" - import { envVars } from "stores/portal" + import { environment } from "stores/portal" import { onMount } from "svelte" - import EditVariableModal from "./_components/editVariableModal.svelte" + import CreateEditVariableModal from "./_components/CreateEditVariableModal.svelte" + import EditVariableColumn from "./_components/EditVariableColumn.svelte" let modal - let useProductionValue = true - - let developmentValue - let productionValue const schema = { name: { width: "2fr", @@ -32,11 +26,16 @@ }, } - const customRenderers = [{ column: "edit", component: EditVariableModal }] + const customRenderers = [{ column: "edit", component: EditVariableColumn }] onMount(async () => { - await envVars.load() + await environment.loadVariables() }) + + const save = data => { + environment.createVariable(data) + modal.hide() + } @@ -50,7 +49,7 @@
- - - -
- Production - -
-
- Development - - { - developmentValue = productionValue - }} - bind:value={useProductionValue} - text="Use production value" - /> -
- + diff --git a/packages/frontend-core/src/components/TestimonialPage.svelte b/packages/frontend-core/src/components/TestimonialPage.svelte new file mode 100644 index 0000000000..d0b772d5db --- /dev/null +++ b/packages/frontend-core/src/components/TestimonialPage.svelte @@ -0,0 +1,62 @@ + + + + +
+
+ +
+ "Here is an example of how Budibase changed my life for the better and + now all I do is eat, sleep, build apps, repeat." +
+
+ +
+
No-code Enthusiast
+
Bedroom TLD
+
+
+ +
+
+ + + diff --git a/packages/frontend-core/src/components/index.js b/packages/frontend-core/src/components/index.js new file mode 100644 index 0000000000..7ca21c4ff9 --- /dev/null +++ b/packages/frontend-core/src/components/index.js @@ -0,0 +1,2 @@ +export { default as SplitPage } from "./SplitPage.svelte" +export { default as TestimonialPage } from "./TestimonialPage.svelte" diff --git a/packages/frontend-core/src/index.js b/packages/frontend-core/src/index.js index aecca81cda..01bf05c69e 100644 --- a/packages/frontend-core/src/index.js +++ b/packages/frontend-core/src/index.js @@ -3,3 +3,4 @@ export { fetchData } from "./fetch/fetchData" export * as Constants from "./constants" export * from "./stores" export * from "./utils" +export * from "./components" From 95e8371b1d0cb9e5bee3c5d5b55db7419dd97287 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 16 Jan 2023 18:51:48 +0000 Subject: [PATCH 118/387] Adding encryption key to manage of server. --- packages/server/scripts/dev/manage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js index 80f21cd043..b8566bbf4c 100644 --- a/packages/server/scripts/dev/manage.js +++ b/packages/server/scripts/dev/manage.js @@ -29,6 +29,7 @@ async function init() { ACCOUNT_PORTAL_URL: "http://localhost:10001", ACCOUNT_PORTAL_API_KEY: "budibase", JWT_SECRET: "testsecret", + ENCRYPTION_KEY: "testsecret", REDIS_PASSWORD: "budibase", MINIO_ACCESS_KEY: "budibase", MINIO_SECRET_KEY: "budibase", From b312ac68c8412fdcc7dec863c8872f15b396b8df Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 17 Jan 2023 09:58:29 +0000 Subject: [PATCH 119/387] Add initial work on fancy form components for onboarding --- .../bbui/src/FancyForm/FancyButton.svelte | 29 ++++ packages/bbui/src/FancyForm/FancyField.svelte | 72 ++++++++++ packages/bbui/src/FancyForm/FancyForm.svelte | 40 ++++++ packages/bbui/src/FancyForm/FancyInput.svelte | 99 ++++++++++++++ packages/bbui/src/FancyForm/index.js | 3 + packages/bbui/src/index.js | 3 + .../auth/_components/GoogleButton.svelte | 46 +++---- .../src/pages/builder/auth/login.svelte | 125 +++++++++++------- 8 files changed, 338 insertions(+), 79 deletions(-) create mode 100644 packages/bbui/src/FancyForm/FancyButton.svelte create mode 100644 packages/bbui/src/FancyForm/FancyField.svelte create mode 100644 packages/bbui/src/FancyForm/FancyForm.svelte create mode 100644 packages/bbui/src/FancyForm/FancyInput.svelte create mode 100644 packages/bbui/src/FancyForm/index.js diff --git a/packages/bbui/src/FancyForm/FancyButton.svelte b/packages/bbui/src/FancyForm/FancyButton.svelte new file mode 100644 index 0000000000..09615df8fa --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyButton.svelte @@ -0,0 +1,29 @@ + + + + {#if icon} + {#if icon.includes("/")} + button + {:else} + + {/if} + {/if} +
+ +
+ + + diff --git a/packages/bbui/src/FancyForm/FancyField.svelte b/packages/bbui/src/FancyForm/FancyField.svelte new file mode 100644 index 0000000000..85f07f2a31 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyField.svelte @@ -0,0 +1,72 @@ + + +
+
+ +
+ {#if error} +
+ {error} +
+ {/if} +
+ + diff --git a/packages/bbui/src/FancyForm/FancyForm.svelte b/packages/bbui/src/FancyForm/FancyForm.svelte new file mode 100644 index 0000000000..f197d81118 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyForm.svelte @@ -0,0 +1,40 @@ + + +
+ +
+ + diff --git a/packages/bbui/src/FancyForm/FancyInput.svelte b/packages/bbui/src/FancyForm/FancyInput.svelte new file mode 100644 index 0000000000..1e46f96b1b --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyInput.svelte @@ -0,0 +1,99 @@ + + + + {#if label} +
+ {label} +
+ {/if} + (focused = true)} + on:blur={() => (focused = false)} + class:placeholder + /> + + + diff --git a/packages/bbui/src/FancyForm/index.js b/packages/bbui/src/FancyForm/index.js new file mode 100644 index 0000000000..4b8e099b80 --- /dev/null +++ b/packages/bbui/src/FancyForm/index.js @@ -0,0 +1,3 @@ +export { default as FancyInput } from "./FancyInput.svelte" +export { default as FancyButton } from "./FancyButton.svelte" +export { default as FancyForm } from "./FancyForm.svelte" diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 601c4dcbca..3de0bc2f46 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -101,3 +101,6 @@ export { banner, BANNER_TYPES } from "./Stores/banner" // Helpers export * as Helpers from "./helpers" + +// Fancy form components +export * from "./FancyForm" diff --git a/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte index 0acaa127cc..3c20192ce2 100644 --- a/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte +++ b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte @@ -1,40 +1,30 @@ {#if show} - - window.open(`/api/global/auth/${tenantId}/google`, "_blank")} + { + window.open(`/api/global/auth/${tenantId}/google`, "_blank") + }} + icon={GoogleLogo} > -
- google icon -

Sign in with Google

-
- + Log in with Google + + { + window.open(`/api/global/auth/${tenantId}/google`, "_blank") + }} + icon={GoogleLogo} + > + Log in with Google + {/if} - - diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte index d8633a4fbc..5a54cafcd5 100644 --- a/packages/builder/src/pages/builder/auth/login.svelte +++ b/packages/builder/src/pages/builder/auth/login.svelte @@ -5,11 +5,12 @@ Button, Divider, Heading, - Input, Layout, notifications, Link, } from "@budibase/bbui" + import { FancyInput, FancyForm } from "@budibase/bbui" + import { TestimonialPage } from "@budibase/frontend-core" import { goto } from "@roxi/routify" import { auth, organisation, oidc, admin } from "stores/portal" import GoogleButton from "./_components/GoogleButton.svelte" @@ -20,12 +21,16 @@ let username = "" let password = "" let loaded = false + let form $: company = $organisation.company || "Budibase" $: multiTenancyEnabled = $admin.multiTenancy $: cloud = $admin.cloud async function login() { + if (!form.validate()) { + return + } try { await auth.login({ username: username.trim(), @@ -57,60 +62,78 @@ - + {#if cloud} + + By using Budibase Cloud +
+ you are agreeing to our + + License Agreement + + + {/if} + + diff --git a/packages/builder/src/stores/portal/environment.js b/packages/builder/src/stores/portal/environment.js index ba33f22e6f..fa06242cf5 100644 --- a/packages/builder/src/stores/portal/environment.js +++ b/packages/builder/src/stores/portal/environment.js @@ -26,6 +26,7 @@ export function createEnvironmentStore() { async function updateVariable(data) { await API.updateEnvironmentVariable(data) } + return { subscribe, loadVariables, diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js index 59a1622c9f..f6e96b1dcd 100644 --- a/packages/builder/src/stores/portal/licensing.js +++ b/packages/builder/src/stores/portal/licensing.js @@ -60,7 +60,9 @@ export const createLicensingStore = () => { const backupsEnabled = license.features.includes( Constants.Features.BACKUPS ) - + let environmentVariablesEnabled = license.features.includes( + Constants.Features.ENVIRONMENT_VARIABLES + ) store.update(state => { return { ...state, @@ -68,6 +70,7 @@ export const createLicensingStore = () => { isFreePlan, groupsEnabled, backupsEnabled, + environmentVariablesEnabled, } }) }, From e29a828abc2d17aaa08cf8c35cd8dfa00da62737 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 17 Jan 2023 10:51:26 +0000 Subject: [PATCH 121/387] add export modal warning --- .../builder/src/components/start/ExportAppModal.svelte | 5 ++++- .../pages/builder/portal/settings/environment/index.svelte | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/start/ExportAppModal.svelte b/packages/builder/src/components/start/ExportAppModal.svelte index 25c0606c14..948416b192 100644 --- a/packages/builder/src/components/start/ExportAppModal.svelte +++ b/packages/builder/src/components/start/ExportAppModal.svelte @@ -1,5 +1,5 @@ + Apps can be exported with or without data that is within internal tables - select this below.Add Variable {:else} -
+ +
Add Variable {:else} -
+
+
{:else}
From b659060beb4246ad943b4660fb06f7a823d12a3d Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 18 Jan 2023 19:16:19 +0000 Subject: [PATCH 129/387] Updating datasource API to remove secrets when returning datasources. --- .../portal/settings/environment/index.svelte | 2 +- .../builder/src/stores/backend/datasources.js | 4 +- .../server/src/api/controllers/datasource.ts | 52 +++++++++++-------- .../src/sdk/app/datasources/datasources.ts | 37 ++++++++++++- packages/types/src/sdk/datasources.ts | 13 ++++- 5 files changed, 81 insertions(+), 27 deletions(-) diff --git a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte index 28258ccf4b..9af22ba942 100644 --- a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte @@ -53,7 +53,7 @@
- Envrironment Variables + Environment Variables {#if !$licensing.environmentVariablesEnabled} Pro plan diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/backend/datasources.js index bbbf86a41d..ed84bb8ee9 100644 --- a/packages/builder/src/stores/backend/datasources.js +++ b/packages/builder/src/stores/backend/datasources.js @@ -28,7 +28,7 @@ export function createDatasourcesStore() { })) } - const updateDatasource = async response => { + const updateDatasource = response => { const { datasource, error } = response store.update(state => { const currentIdx = state.list.findIndex(ds => ds._id === datasource._id) @@ -52,7 +52,7 @@ export function createDatasourcesStore() { datasourceId: datasource?._id, tablesFilter, }) - return await updateDatasource(response) + return updateDatasource(response) } const save = async (body, fetchSchema = false) => { diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts index 47fde0764b..9568b40243 100644 --- a/packages/server/src/api/controllers/datasource.ts +++ b/packages/server/src/api/controllers/datasource.ts @@ -8,18 +8,24 @@ import { } from "../../db/utils" import { destroy as tableDestroy } from "./table/internal" import { BuildSchemaErrors, InvalidColumns } from "../../constants" -import { getIntegration } from "../../integrations" +import { getIntegration, getDefinitions } from "../../integrations" import { getDatasourceAndQuery } from "./row/utils" import { invalidateDynamicVariables } from "../../threads/utils" import { db as dbCore, context, events } from "@budibase/backend-core" -import { BBContext, Datasource, Row } from "@budibase/types" +import { + UserCtx, + Datasource, + Row, + DatasourceFieldType, + PASSWORD_REPLACEMENT, +} from "@budibase/types" import sdk from "../../sdk" -import { cloneDeep } from "lodash/fp" -import { enrich } from "../../sdk/app/datasources/datasources" +import { removeSecrets } from "../../sdk/app/datasources/datasources" -export async function fetch(ctx: BBContext) { +export async function fetch(ctx: UserCtx) { // Get internal tables const db = context.getAppDB() + const definitions = await getDefinitions() const internalTables = await db.allDocs( getTableParams(null, { include_docs: true, @@ -46,23 +52,19 @@ export async function fetch(ctx: BBContext) { ) ).rows.map(row => row.doc) - const allDatasources = [bbInternalDb, ...datasources] + const allDatasources: Datasource[] = [bbInternalDb, ...datasources] for (let datasource of allDatasources) { - if (datasource.config && datasource.config.auth) { - // strip secrets from response so they don't show in the network request - delete datasource.config.auth - } - + datasource = sdk.datasources.removeSecrets(definitions, datasource) if (datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE) { - datasource.entities = internal[datasource._id] + datasource.entities = internal[datasource._id!] } } ctx.body = [bbInternalDb, ...datasources] } -export async function buildSchemaFromDb(ctx: BBContext) { +export async function buildSchemaFromDb(ctx: UserCtx) { const db = context.getAppDB() const datasource = await sdk.datasources.get(ctx.params.datasourceId) const tablesFilter = ctx.request.body.tablesFilter @@ -149,11 +151,12 @@ async function invalidateVariables( await invalidateDynamicVariables(toInvalidate) } -export async function update(ctx: BBContext) { +export async function update(ctx: UserCtx) { const db = context.getAppDB() const datasourceId = ctx.params.datasourceId let datasource = await sdk.datasources.get(datasourceId) const auth = datasource.config?.auth + const definitions = await getDefinitions() await invalidateVariables(datasource, ctx.request.body) const isBudibaseSource = datasource.type === dbCore.BUDIBASE_DATASOURCE_TYPE @@ -182,13 +185,16 @@ export async function update(ctx: BBContext) { ctx.status = 200 ctx.message = "Datasource saved successfully." - ctx.body = { datasource } + ctx.body = { + datasource: sdk.datasources.removeSecrets(definitions, datasource), + } } -export async function save(ctx: BBContext) { +export async function save(ctx: UserCtx) { const db = context.getAppDB() const plus = ctx.request.body.datasource.plus const fetchSchema = ctx.request.body.fetchSchema + const definitions = await getDefinitions() const datasource = { _id: generateDatasourceID({ plus }), @@ -216,7 +222,9 @@ export async function save(ctx: BBContext) { } } - const response: any = { datasource } + const response: any = { + datasource: sdk.datasources.removeSecrets(definitions, datasource), + } if (schemaError) { response.error = schemaError } @@ -254,7 +262,7 @@ async function destroyInternalTablesBySourceId(datasourceId: string) { } } -export async function destroy(ctx: BBContext) { +export async function destroy(ctx: UserCtx) { const db = context.getAppDB() const datasourceId = ctx.params.datasourceId @@ -282,13 +290,15 @@ export async function destroy(ctx: BBContext) { ctx.status = 200 } -export async function find(ctx: BBContext) { +export async function find(ctx: UserCtx) { const database = context.getAppDB() - ctx.body = await database.get(ctx.params.datasourceId) + const definitions = await getDefinitions() + const datasource = await database.get(ctx.params.datasourceId) + ctx.body = sdk.datasources.removeSecrets(definitions, datasource) } // dynamic query functionality -export async function query(ctx: BBContext) { +export async function query(ctx: UserCtx) { const queryJson = ctx.request.body try { ctx.body = await getDatasourceAndQuery(queryJson) diff --git a/packages/server/src/sdk/app/datasources/datasources.ts b/packages/server/src/sdk/app/datasources/datasources.ts index 10f9ac889c..52204d7482 100644 --- a/packages/server/src/sdk/app/datasources/datasources.ts +++ b/packages/server/src/sdk/app/datasources/datasources.ts @@ -1,6 +1,11 @@ import { context } from "@budibase/backend-core" -import { processObjectSync } from "@budibase/string-templates" -import { Datasource } from "@budibase/types" +import { processObjectSync, findHBSBlocks } from "@budibase/string-templates" +import { + Datasource, + DatasourceFieldType, + Integration, + PASSWORD_REPLACEMENT, +} from "@budibase/types" import { cloneDeep } from "lodash/fp" import { getEnvironmentVariables } from "../../utils" @@ -37,3 +42,31 @@ export async function getWithEnvVars(datasourceId: string) { const datasource = await appDb.get(datasourceId) return enrichDatasourceWithValues(datasource) } + +export function removeSecrets( + definitions: Record, + datasource: Datasource +) { + const schema = definitions[datasource.source] + if (datasource.config) { + // strip secrets from response, so they don't show in the network request + if (datasource.config.auth) { + delete datasource.config.auth + } + // remove passwords + for (let key of Object.keys(datasource.config)) { + if (typeof datasource.config[key] !== "string") { + continue + } + const blocks = findHBSBlocks(datasource.config[key] as string) + const usesEnvVars = blocks.find(block => block.includes("env.")) != null + if ( + !usesEnvVars && + schema.datasource?.[key]?.type === DatasourceFieldType.PASSWORD + ) { + datasource.config[key] = PASSWORD_REPLACEMENT + } + } + } + return datasource +} diff --git a/packages/types/src/sdk/datasources.ts b/packages/types/src/sdk/datasources.ts index 279a76446f..9d5b001a4b 100644 --- a/packages/types/src/sdk/datasources.ts +++ b/packages/types/src/sdk/datasources.ts @@ -1,5 +1,7 @@ import { Table } from "../documents" +export const PASSWORD_REPLACEMENT = "--secret-value--" + export enum Operation { CREATE = "CREATE", READ = "READ", @@ -104,7 +106,16 @@ export interface Integration { friendlyName: string type?: string iconUrl?: string - datasource: {} + datasource: Record< + string, + { + type: string + display?: string + deprecated?: boolean + default?: any + required?: boolean + } + > query: { [key: string]: QueryDefinition } From b4dcdfa84f709d2a4d3a569ed26270fc58fe7b9e Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 19 Jan 2023 14:14:29 +0000 Subject: [PATCH 130/387] Update through table error message --- .../backend/Datasources/CreateEditRelationship.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte index 1be842280f..d2f707a6e0 100644 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte @@ -83,8 +83,7 @@ errObj.through = tableNotSet } if ($touched.through && invalidThroughTable(fromRelate)) { - errObj.through = - "Ensure all columns in table are nullable or auto generated" + errObj.through = "Ensure non-key columns are nullable or auto-generated" } if ($touched.foreign && !isMany && !fromRelate.fieldName) { errObj.foreign = "Please pick the foreign key" From 50e571c1de3e86a156589223537ee935f599687c Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 19 Jan 2023 14:29:47 +0000 Subject: [PATCH 131/387] Ignore primary touched if isMany --- .../backend/Datasources/CreateEditRelationship.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte index d2f707a6e0..2000d45dde 100644 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte @@ -95,7 +95,7 @@ if ($touched.toCol && !fromRelate.name) { errObj.toCol = colNotSet } - if ($touched.primary && !fromPrimary) { + if ($touched.primary && !isMany && !fromPrimary) { errObj.primary = "Please pick the primary key" } // currently don't support relationships back onto the table itself, needs to relate out @@ -152,6 +152,8 @@ Object.keys($touched).length !== 0 && fromTable && toTable + + $: console.log("Errors ", errors) $: linkTable = through || toTable $: relationshipTypes = [ { From a6e7ef398530e57b6b32596ce926f42349dd6464 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 19 Jan 2023 14:38:26 +0000 Subject: [PATCH 132/387] Remove console log --- .../components/backend/Datasources/CreateEditRelationship.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte index 2000d45dde..7110374569 100644 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte @@ -153,7 +153,6 @@ fromTable && toTable - $: console.log("Errors ", errors) $: linkTable = through || toTable $: relationshipTypes = [ { From eae7b529a71bf2763dc61848b18d0631cfc9da9c Mon Sep 17 00:00:00 2001 From: Mateus Badan de Pieri Date: Thu, 19 Jan 2023 15:07:56 +0000 Subject: [PATCH 133/387] adding validation for envvar bindings adding validation for envvar bindings --- packages/server/src/sdk/app/datasources/datasources.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/server/src/sdk/app/datasources/datasources.ts b/packages/server/src/sdk/app/datasources/datasources.ts index 52204d7482..13ef1113a6 100644 --- a/packages/server/src/sdk/app/datasources/datasources.ts +++ b/packages/server/src/sdk/app/datasources/datasources.ts @@ -7,6 +7,7 @@ import { PASSWORD_REPLACEMENT, } from "@budibase/types" import { cloneDeep } from "lodash/fp" +import { env } from "process" import { getEnvironmentVariables } from "../../utils" async function enrichDatasourceWithValues(datasource: Datasource) { @@ -40,7 +41,13 @@ export async function get( export async function getWithEnvVars(datasourceId: string) { const appDb = context.getAppDB() const datasource = await appDb.get(datasourceId) - return enrichDatasourceWithValues(datasource) + const blocks = findHBSBlocks(JSON.stringify(datasource)) + const usesEnvVars = blocks.find(block => block.includes("env.")) != null + if (usesEnvVars) { + return enrichDatasourceWithValues(datasource) + } else { + throw new Error("Environment variables binding format incorrect") + } } export function removeSecrets( From 2a2466fbda9d8088624b2c12c603fe7764b9a784 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Thu, 19 Jan 2023 16:09:40 +0000 Subject: [PATCH 134/387] More fixes (#9387) * Mark filters as nested settings to support persisting bindings post block ejection * Add support for searching on linked fields in blocks * Fix multi-select pickers closing on every click * Target spectrum root element by default when rendering popovers, and allow customisation via context for client library * Don't send up invalid HBS expressions when filtering on dates in blocks with empty date value * Move profile above theme in user dropdown --- packages/bbui/src/Form/Core/Picker.svelte | 12 ++++--- packages/bbui/src/Popover/Popover.svelte | 5 ++- packages/bbui/src/context.js | 1 + .../portal/_components/UserDropdown.svelte | 6 ++-- packages/client/manifest.json | 12 ++++--- .../src/components/CustomThemeWrapper.svelte | 4 +++ .../components/app/blocks/CardsBlock.svelte | 5 ++- .../components/app/blocks/TableBlock.svelte | 5 ++- packages/client/src/utils/blocks.js | 31 ++++++++++++++++--- 9 files changed, 62 insertions(+), 19 deletions(-) diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index 81348452c7..32cfcf3310 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -45,7 +45,9 @@ getOptionLabel ) - const onClick = () => { + const onClick = e => { + e.preventDefault() + e.stopPropagation() dispatch("click") if (readonly) { return @@ -88,7 +90,6 @@ class:is-open={open} aria-haspopup="listbox" on:click={onClick} - use:clickOutside={() => (open = false)} bind:this={button} > {#if fieldIcon} @@ -130,14 +131,17 @@ (open = false)} useAnchorWidth={!autoWidth} maxWidth={autoWidth ? 400 : null} > -
+
(open = false)} + > {#if autocomplete} { dispatch("open") @@ -61,7 +64,7 @@ {#if open} - +
- themeModal.show()} dataCy="theme"> - Theme - profileModal.show()} @@ -36,6 +33,9 @@ > My profile + themeModal.show()} dataCy="theme"> + Theme + updatePasswordModal.show()}> Update password diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 9d50c13bb6..d1898a82c1 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -4019,7 +4019,8 @@ { "type": "filter", "label": "Filtering", - "key": "filter" + "key": "filter", + "nested": true }, { "type": "field", @@ -4535,7 +4536,8 @@ { "type": "filter", "label": "Filtering", - "key": "filter" + "key": "filter", + "nested": true }, { "type": "searchfield", @@ -4665,7 +4667,8 @@ { "type": "filter", "label": "Filtering", - "key": "filter" + "key": "filter", + "nested": true }, { "type": "field/sortable", @@ -4831,7 +4834,8 @@ { "type": "filter", "label": "Filtering", - "key": "filter" + "key": "filter", + "nested": true }, { "type": "field/sortable", diff --git a/packages/client/src/components/CustomThemeWrapper.svelte b/packages/client/src/components/CustomThemeWrapper.svelte index 20dae01ce0..c9ab9c9dc1 100644 --- a/packages/client/src/components/CustomThemeWrapper.svelte +++ b/packages/client/src/components/CustomThemeWrapper.svelte @@ -1,5 +1,9 @@
diff --git a/packages/client/src/components/app/blocks/CardsBlock.svelte b/packages/client/src/components/app/blocks/CardsBlock.svelte index 5098a3acf4..795e62eb31 100644 --- a/packages/client/src/components/app/blocks/CardsBlock.svelte +++ b/packages/client/src/components/app/blocks/CardsBlock.svelte @@ -36,9 +36,12 @@ let dataProviderId let repeaterId let schema + let enrichedSearchColumns $: fetchSchema(dataSource) - $: enrichedSearchColumns = enrichSearchColumns(searchColumns, schema) + $: enrichSearchColumns(searchColumns, schema).then( + val => (enrichedSearchColumns = val) + ) $: enrichedFilter = enrichFilter(filter, enrichedSearchColumns, formId) $: cardWidth = cardHorizontal ? 420 : 300 $: fullCardURL = buildFullCardUrl( diff --git a/packages/client/src/components/app/blocks/TableBlock.svelte b/packages/client/src/components/app/blocks/TableBlock.svelte index 0984c901a3..91c266b434 100644 --- a/packages/client/src/components/app/blocks/TableBlock.svelte +++ b/packages/client/src/components/app/blocks/TableBlock.svelte @@ -36,9 +36,12 @@ let newRowSidePanelId let schema let primaryDisplay + let enrichedSearchColumns $: fetchSchema(dataSource) - $: enrichedSearchColumns = enrichSearchColumns(searchColumns, schema) + $: enrichSearchColumns(searchColumns, schema).then( + val => (enrichedSearchColumns = val) + ) $: enrichedFilter = enrichFilter(filter, enrichedSearchColumns, formId) $: editTitle = getEditTitle(detailsFormBlockId, primaryDisplay) $: normalFields = getNormalFields(schema) diff --git a/packages/client/src/utils/blocks.js b/packages/client/src/utils/blocks.js index 61cd640bbc..214b48a4d2 100644 --- a/packages/client/src/utils/blocks.js +++ b/packages/client/src/utils/blocks.js @@ -1,4 +1,5 @@ import { makePropSafe as safe } from "@budibase/string-templates" +import { API } from "../api/index.js" // Map of data types to component types for search fields inside blocks const schemaComponentMap = { @@ -15,10 +16,28 @@ const schemaComponentMap = { * @param searchColumns the search columns to use * @param schema the datasource schema */ -export const enrichSearchColumns = (searchColumns, schema) => { +export const enrichSearchColumns = async (searchColumns, schema) => { + if (!searchColumns?.length || !schema) { + return [] + } let enrichedColumns = [] - searchColumns?.forEach(column => { - const schemaType = schema?.[column]?.type + for (let column of searchColumns) { + let schemaType = schema[column]?.type + + // Check if this is a field in another related table. The only way we can + // check this is checking for a "." inside the column, then checking if we + // have a link field named the same as that field prefix. + if (column.includes(".")) { + const split = column.split(".") + const sourceField = split[0] + const linkField = split.slice(1).join(".") + const linkSchema = schema[sourceField] + if (linkSchema?.type === "link") { + const linkedDef = await API.fetchTableDefinition(linkSchema.tableId) + schemaType = linkedDef?.schema?.[linkField]?.type + } + } + const componentType = schemaComponentMap[schemaType] if (componentType) { enrichedColumns.push({ @@ -27,7 +46,7 @@ export const enrichSearchColumns = (searchColumns, schema) => { type: schemaType, }) } - }) + } return enrichedColumns.slice(0, 5) } @@ -57,12 +76,14 @@ export const enrichFilter = (filter, columns, formId) => { value: `{{ ${binding} }}`, }) const format = "YYYY-MM-DDTHH:mm:ss.SSSZ" + let hbs = `{{ date (add (date ${binding} "x") 86399999) "${format}" }}` + hbs = `{{#if ${binding} }}${hbs}{{/if}}` enrichedFilter.push({ field: column.name, type: column.type, operator: "rangeHigh", valueType: "Binding", - value: `{{ date (add (date ${binding} "x") 86399999) "${format}" }}`, + value: hbs, }) } From dfb90571f94d87e8271a4f8fcfb3c05d97446dd3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 19 Jan 2023 16:20:45 +0000 Subject: [PATCH 135/387] v2.2.12-alpha.29 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index a320a884d1..897fd9adab 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.28", + "version": "2.2.12-alpha.29", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 400a188e17..68ecdb9fd6 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.28", + "version": "2.2.12-alpha.29", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.28", + "@budibase/types": "2.2.12-alpha.29", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f85f38af0b..4081b3ece7 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.28", + "version": "2.2.12-alpha.29", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.28", + "@budibase/string-templates": "2.2.12-alpha.29", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/avatar": "3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index c1afae62cd..56e0f1a1c8 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.28", + "version": "2.2.12-alpha.29", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.28", - "@budibase/client": "2.2.12-alpha.28", - "@budibase/frontend-core": "2.2.12-alpha.28", - "@budibase/string-templates": "2.2.12-alpha.28", + "@budibase/bbui": "2.2.12-alpha.29", + "@budibase/client": "2.2.12-alpha.29", + "@budibase/frontend-core": "2.2.12-alpha.29", + "@budibase/string-templates": "2.2.12-alpha.29", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index b314f23e75..e0b78e0e0b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.28", + "version": "2.2.12-alpha.29", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.28", - "@budibase/string-templates": "2.2.12-alpha.28", - "@budibase/types": "2.2.12-alpha.28", + "@budibase/backend-core": "2.2.12-alpha.29", + "@budibase/string-templates": "2.2.12-alpha.29", + "@budibase/types": "2.2.12-alpha.29", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index ecd9f06f48..cbd23aa222 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.28", + "version": "2.2.12-alpha.29", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.28", - "@budibase/frontend-core": "2.2.12-alpha.28", - "@budibase/string-templates": "2.2.12-alpha.28", + "@budibase/bbui": "2.2.12-alpha.29", + "@budibase/frontend-core": "2.2.12-alpha.29", + "@budibase/string-templates": "2.2.12-alpha.29", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index eacb6b45df..b32cbccbb1 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.28", + "version": "2.2.12-alpha.29", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.28", + "@budibase/bbui": "2.2.12-alpha.29", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e626caa2ca..95de5c2037 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.28", + "version": "2.2.12-alpha.29", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 3494ac9d8e..7e583dd334 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.28", + "version": "2.2.12-alpha.29", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.28", - "@budibase/client": "2.2.12-alpha.28", + "@budibase/backend-core": "2.2.12-alpha.29", + "@budibase/client": "2.2.12-alpha.29", "@budibase/pro": "2.2.12-alpha.28", - "@budibase/string-templates": "2.2.12-alpha.28", - "@budibase/types": "2.2.12-alpha.28", + "@budibase/string-templates": "2.2.12-alpha.29", + "@budibase/types": "2.2.12-alpha.29", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 5a340ac4c3..af4cec3963 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.28", + "version": "2.2.12-alpha.29", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 80cd277851..8d86cc17c3 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.28", + "version": "2.2.12-alpha.29", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 1be6e2c4e0..9a1754322d 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.28", + "version": "2.2.12-alpha.29", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.28", + "@budibase/backend-core": "2.2.12-alpha.29", "@budibase/pro": "2.2.12-alpha.28", - "@budibase/string-templates": "2.2.12-alpha.28", - "@budibase/types": "2.2.12-alpha.28", + "@budibase/string-templates": "2.2.12-alpha.29", + "@budibase/types": "2.2.12-alpha.29", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 6aebc214decdbf387dc3ec9a31c7392ca2fac9c5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 19 Jan 2023 16:24:28 +0000 Subject: [PATCH 136/387] Update pro version to 2.2.12-alpha.29 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 7e583dd334..a96c8494a5 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.29", "@budibase/client": "2.2.12-alpha.29", - "@budibase/pro": "2.2.12-alpha.28", + "@budibase/pro": "2.2.12-alpha.29", "@budibase/string-templates": "2.2.12-alpha.29", "@budibase/types": "2.2.12-alpha.29", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index d3bf0d23d4..6d4b3f99d2 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.28": - version "2.2.12-alpha.28" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.28.tgz#c35db9d7ddb5f381b99b1226b90bc0c41ace74e5" - integrity sha512-D3j3HhDsBuuMf+LlMTLoiPQuUkp9bMksJcNlTMqh/HAqCWxBNA933KKdv30CVQ5htY5lLGtpDuK/uxUzu36nNw== +"@budibase/backend-core@2.2.12-alpha.29": + version "2.2.12-alpha.29" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.29.tgz#5cfba9e1b276f50f5250cd07edc0aff1040e64c6" + integrity sha512-bAr3RNP3o/UCz8mOpYKSWbB34hvKkO42FT3wKYhfLWPm+yjkoSWGrlSzX3z6f7x7PbKVO0JfXNk5zCOsJBFFoQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.28" + "@budibase/types" "2.2.12-alpha.29" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.28": - version "2.2.12-alpha.28" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.28.tgz#3f3150e5833fcbf6b7ad67b51a46d37bc3f4f785" - integrity sha512-0zLOHuI55Hp/6nrAu52i12/Z4agiyStSVREIBm5iXgRN3rLFAS4uu/oqGt5uXtHB4X5WOZ/e29r0uwTGamLhlg== +"@budibase/pro@2.2.12-alpha.29": + version "2.2.12-alpha.29" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.29.tgz#0883f38e39552bce49c95b2dbd04cae7112072d9" + integrity sha512-ssZSxYaCicuYFZSmPFghFAQQP2DPfGuJM76Jfmu1XFq/4TPqGVIPtjKowiMsS/+D6O+59xOb4KhCKy2N5pYphw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.28" - "@budibase/types" "2.2.12-alpha.28" + "@budibase/backend-core" "2.2.12-alpha.29" + "@budibase/types" "2.2.12-alpha.29" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1405,10 +1405,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.28": - version "2.2.12-alpha.28" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.28.tgz#3e937aa478b32ff220ef5482036198e717165768" - integrity sha512-anQMAI27PeA94iHh2NPhFg3ARgVUxErMk2W9fWwj7kOoq1xxhYj1AI9+65v+5HUa3Q0AR9Dx25ja5ZJ7Lhg2ew== +"@budibase/types@2.2.12-alpha.29": + version "2.2.12-alpha.29" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.29.tgz#9eedba7adc26b65b991dac2f26b96710835cfbc7" + integrity sha512-vEqFCzAH8/Tu+yRxOYi1x9kjgGy5AE81lMa2z+F9nZfdU7iL07xsd3WfE1EMzS8Byn5F8OTjZoRcQjzoTNMdhw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 9a1754322d..598284e15b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.29", - "@budibase/pro": "2.2.12-alpha.28", + "@budibase/pro": "2.2.12-alpha.29", "@budibase/string-templates": "2.2.12-alpha.29", "@budibase/types": "2.2.12-alpha.29", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index a88d5f4cc8..e26c8863d9 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.28": - version "2.2.12-alpha.28" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.28.tgz#c35db9d7ddb5f381b99b1226b90bc0c41ace74e5" - integrity sha512-D3j3HhDsBuuMf+LlMTLoiPQuUkp9bMksJcNlTMqh/HAqCWxBNA933KKdv30CVQ5htY5lLGtpDuK/uxUzu36nNw== +"@budibase/backend-core@2.2.12-alpha.29": + version "2.2.12-alpha.29" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.29.tgz#5cfba9e1b276f50f5250cd07edc0aff1040e64c6" + integrity sha512-bAr3RNP3o/UCz8mOpYKSWbB34hvKkO42FT3wKYhfLWPm+yjkoSWGrlSzX3z6f7x7PbKVO0JfXNk5zCOsJBFFoQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.28" + "@budibase/types" "2.2.12-alpha.29" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,23 +521,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.28": - version "2.2.12-alpha.28" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.28.tgz#3f3150e5833fcbf6b7ad67b51a46d37bc3f4f785" - integrity sha512-0zLOHuI55Hp/6nrAu52i12/Z4agiyStSVREIBm5iXgRN3rLFAS4uu/oqGt5uXtHB4X5WOZ/e29r0uwTGamLhlg== +"@budibase/pro@2.2.12-alpha.29": + version "2.2.12-alpha.29" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.29.tgz#0883f38e39552bce49c95b2dbd04cae7112072d9" + integrity sha512-ssZSxYaCicuYFZSmPFghFAQQP2DPfGuJM76Jfmu1XFq/4TPqGVIPtjKowiMsS/+D6O+59xOb4KhCKy2N5pYphw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.28" - "@budibase/types" "2.2.12-alpha.28" + "@budibase/backend-core" "2.2.12-alpha.29" + "@budibase/types" "2.2.12-alpha.29" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.28": - version "2.2.12-alpha.28" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.28.tgz#3e937aa478b32ff220ef5482036198e717165768" - integrity sha512-anQMAI27PeA94iHh2NPhFg3ARgVUxErMk2W9fWwj7kOoq1xxhYj1AI9+65v+5HUa3Q0AR9Dx25ja5ZJ7Lhg2ew== +"@budibase/types@2.2.12-alpha.29": + version "2.2.12-alpha.29" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.29.tgz#9eedba7adc26b65b991dac2f26b96710835cfbc7" + integrity sha512-vEqFCzAH8/Tu+yRxOYi1x9kjgGy5AE81lMa2z+F9nZfdU7iL07xsd3WfE1EMzS8Byn5F8OTjZoRcQjzoTNMdhw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 47663ca395c2f54ac2507f13229d148fcc983004 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 19 Jan 2023 16:43:06 +0000 Subject: [PATCH 137/387] update datasource config to allow env var selection --- .../bbui/src/Form/Core/EnvDropdown.svelte | 241 ++++++++++++++++++ packages/bbui/src/Form/EnvDropdown.svelte | 48 ++++ packages/bbui/src/index.js | 1 + .../IntegrationConfigForm.svelte | 28 +- .../common/bindings/BindingPanel.svelte | 1 + .../bindings/DrawerBindableInput.svelte | 3 +- .../integration/KeyValueBuilder.svelte | 2 +- .../CreateEditVariableModal.svelte | 0 .../components/start/ExportAppModal.svelte | 9 +- .../_components/EditVariableColumn.svelte | 2 +- .../portal/settings/environment/index.svelte | 4 +- .../builder/src/stores/portal/environment.js | 1 - .../builder/src/stores/portal/licensing.js | 2 + 13 files changed, 331 insertions(+), 11 deletions(-) create mode 100644 packages/bbui/src/Form/Core/EnvDropdown.svelte create mode 100644 packages/bbui/src/Form/EnvDropdown.svelte rename packages/builder/src/{pages/builder/portal/settings/environment/_components => components/portal/environment}/CreateEditVariableModal.svelte (100%) diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte new file mode 100644 index 0000000000..9b6346a8e1 --- /dev/null +++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte @@ -0,0 +1,241 @@ + + +
+
+ + + +
+ {#if open} +
+
    + {#if variables.length} + {#each variables as variable, idx} +
  • handleVarSelect(variable.name)} + > + +
    + {variable.name} + +
    + +     +
    • + {/each} + {:else} +
  • + +
    + You don't have any environment variables yet +
    +     +
    • + {/if} +
+ +
+ +
showModal()} class="primary-text"> + Add Variable +
+
+
+ {/if} +
+ + diff --git a/packages/bbui/src/Form/EnvDropdown.svelte b/packages/bbui/src/Form/EnvDropdown.svelte new file mode 100644 index 0000000000..941b036e24 --- /dev/null +++ b/packages/bbui/src/Form/EnvDropdown.svelte @@ -0,0 +1,48 @@ + + + + + diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 601c4dcbca..06f3c22037 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -27,6 +27,7 @@ export { default as RadioGroup } from "./Form/RadioGroup.svelte" export { default as Checkbox } from "./Form/Checkbox.svelte" export { default as InputDropdown } from "./Form/InputDropdown.svelte" export { default as PickerDropdown } from "./Form/PickerDropdown.svelte" +export { default as EnvDropdown } from "./Form/EnvDropdown.svelte" export { default as DetailSummary } from "./DetailSummary/DetailSummary.svelte" export { default as Popover } from "./Popover/Popover.svelte" export { default as ProgressBar } from "./ProgressBar/ProgressBar.svelte" diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte index 05649e1773..fab633ffa2 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte @@ -6,16 +6,22 @@ Toggle, Button, TextArea, + Modal, + EnvDropdown, } from "@budibase/bbui" import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte" import { capitalise } from "helpers" import { IntegrationTypes } from "constants/backend" import { createValidationStore } from "helpers/validation/yup" - import { createEventDispatcher } from "svelte" + import { createEventDispatcher, onMount } from "svelte" + import { environment } from "stores/portal" + import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte" export let datasource export let schema export let creating + + let createVariableModal const validation = createValidationStore() const dispatch = createEventDispatcher() @@ -60,6 +66,18 @@ } return capitalise(name) } + + function save(data) { + environment.createVariable(data) + createVariableModal.hide() + } + + function showModal() { + createVariableModal.show() + } + onMount(async () => { + await environment.loadVariables() + })
@@ -103,7 +121,9 @@ {:else}
- + + + + diff --git a/packages/bbui/src/Link/Link.svelte b/packages/bbui/src/Link/Link.svelte index 8ad722d553..ea9496ba72 100644 --- a/packages/bbui/src/Link/Link.svelte +++ b/packages/bbui/src/Link/Link.svelte @@ -15,7 +15,7 @@ e.stopPropagation() && dispatch(e)} + on:click={e => dispatch("click") && e.stopPropagation()} {href} {target} {download} From 70ca2cc8793ad05d7a02f056aea863bf511db9de Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 19 Jan 2023 20:08:13 +0000 Subject: [PATCH 142/387] v2.2.12-alpha.30 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 897fd9adab..83955820f9 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.29", + "version": "2.2.12-alpha.30", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 68ecdb9fd6..cb6526a22f 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.29", + "version": "2.2.12-alpha.30", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.29", + "@budibase/types": "2.2.12-alpha.30", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 4081b3ece7..f6263d0715 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.29", + "version": "2.2.12-alpha.30", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.29", + "@budibase/string-templates": "2.2.12-alpha.30", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/avatar": "3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 56e0f1a1c8..acfae3a26b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.29", + "version": "2.2.12-alpha.30", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.29", - "@budibase/client": "2.2.12-alpha.29", - "@budibase/frontend-core": "2.2.12-alpha.29", - "@budibase/string-templates": "2.2.12-alpha.29", + "@budibase/bbui": "2.2.12-alpha.30", + "@budibase/client": "2.2.12-alpha.30", + "@budibase/frontend-core": "2.2.12-alpha.30", + "@budibase/string-templates": "2.2.12-alpha.30", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index e0b78e0e0b..27cc8186c3 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.29", + "version": "2.2.12-alpha.30", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.29", - "@budibase/string-templates": "2.2.12-alpha.29", - "@budibase/types": "2.2.12-alpha.29", + "@budibase/backend-core": "2.2.12-alpha.30", + "@budibase/string-templates": "2.2.12-alpha.30", + "@budibase/types": "2.2.12-alpha.30", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index cbd23aa222..5c0969ea14 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.29", + "version": "2.2.12-alpha.30", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.29", - "@budibase/frontend-core": "2.2.12-alpha.29", - "@budibase/string-templates": "2.2.12-alpha.29", + "@budibase/bbui": "2.2.12-alpha.30", + "@budibase/frontend-core": "2.2.12-alpha.30", + "@budibase/string-templates": "2.2.12-alpha.30", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index b32cbccbb1..89d3a8f04c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.29", + "version": "2.2.12-alpha.30", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.29", + "@budibase/bbui": "2.2.12-alpha.30", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 95de5c2037..79e76c1490 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.29", + "version": "2.2.12-alpha.30", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index a96c8494a5..4082f72bd0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.29", + "version": "2.2.12-alpha.30", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.29", - "@budibase/client": "2.2.12-alpha.29", + "@budibase/backend-core": "2.2.12-alpha.30", + "@budibase/client": "2.2.12-alpha.30", "@budibase/pro": "2.2.12-alpha.29", - "@budibase/string-templates": "2.2.12-alpha.29", - "@budibase/types": "2.2.12-alpha.29", + "@budibase/string-templates": "2.2.12-alpha.30", + "@budibase/types": "2.2.12-alpha.30", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index af4cec3963..39509ef428 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.29", + "version": "2.2.12-alpha.30", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 8d86cc17c3..ff42e0aace 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.29", + "version": "2.2.12-alpha.30", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 598284e15b..6f3401a1d4 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.29", + "version": "2.2.12-alpha.30", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.29", + "@budibase/backend-core": "2.2.12-alpha.30", "@budibase/pro": "2.2.12-alpha.29", - "@budibase/string-templates": "2.2.12-alpha.29", - "@budibase/types": "2.2.12-alpha.29", + "@budibase/string-templates": "2.2.12-alpha.30", + "@budibase/types": "2.2.12-alpha.30", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 5351e1ab293af0759ee39e9ff8e4a7f696fd20d5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Thu, 19 Jan 2023 20:12:03 +0000 Subject: [PATCH 143/387] Update pro version to 2.2.12-alpha.30 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 4082f72bd0..9a6a3622fb 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.30", "@budibase/client": "2.2.12-alpha.30", - "@budibase/pro": "2.2.12-alpha.29", + "@budibase/pro": "2.2.12-alpha.30", "@budibase/string-templates": "2.2.12-alpha.30", "@budibase/types": "2.2.12-alpha.30", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 6d4b3f99d2..87b1b5dd0e 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.29": - version "2.2.12-alpha.29" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.29.tgz#5cfba9e1b276f50f5250cd07edc0aff1040e64c6" - integrity sha512-bAr3RNP3o/UCz8mOpYKSWbB34hvKkO42FT3wKYhfLWPm+yjkoSWGrlSzX3z6f7x7PbKVO0JfXNk5zCOsJBFFoQ== +"@budibase/backend-core@2.2.12-alpha.30": + version "2.2.12-alpha.30" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.30.tgz#0adb36fb32914fa998b3c44f91442bda80c7de02" + integrity sha512-PJgitAwVS8heI7pxO3bwiNTrIuJnLJwtF0nNCconoklx8QZVXLLDMuusxICrDugilbGfWuOI2k4p5DgK22T+kA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.29" + "@budibase/types" "2.2.12-alpha.30" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.29": - version "2.2.12-alpha.29" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.29.tgz#0883f38e39552bce49c95b2dbd04cae7112072d9" - integrity sha512-ssZSxYaCicuYFZSmPFghFAQQP2DPfGuJM76Jfmu1XFq/4TPqGVIPtjKowiMsS/+D6O+59xOb4KhCKy2N5pYphw== +"@budibase/pro@2.2.12-alpha.30": + version "2.2.12-alpha.30" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.30.tgz#bcf906828cfb9ce9ab6e2834c9465b426699f077" + integrity sha512-c8FbGk1Z9OAFtRE3PbjlZwju/5bUIEgYiGLavhR9dioo6o5H3j42SZX/1nnhfeykFbeMM9YUAzq7i8xmE5CtJA== dependencies: - "@budibase/backend-core" "2.2.12-alpha.29" - "@budibase/types" "2.2.12-alpha.29" + "@budibase/backend-core" "2.2.12-alpha.30" + "@budibase/types" "2.2.12-alpha.30" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1405,10 +1405,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.29": - version "2.2.12-alpha.29" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.29.tgz#9eedba7adc26b65b991dac2f26b96710835cfbc7" - integrity sha512-vEqFCzAH8/Tu+yRxOYi1x9kjgGy5AE81lMa2z+F9nZfdU7iL07xsd3WfE1EMzS8Byn5F8OTjZoRcQjzoTNMdhw== +"@budibase/types@2.2.12-alpha.30": + version "2.2.12-alpha.30" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.30.tgz#e1d20adbb3a151c7935310bf03800e572b4498f6" + integrity sha512-bShoMjQ1VqjrEfl5TeK94SCJUnnOCkWIB4AJOYIVr6thu+O0qyLwSP8YoTGtSKxXtJ2TAN3hIxx/EdDKMSrFqg== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 6f3401a1d4..15931bc690 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.30", - "@budibase/pro": "2.2.12-alpha.29", + "@budibase/pro": "2.2.12-alpha.30", "@budibase/string-templates": "2.2.12-alpha.30", "@budibase/types": "2.2.12-alpha.30", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index e26c8863d9..bacffd79cb 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.29": - version "2.2.12-alpha.29" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.29.tgz#5cfba9e1b276f50f5250cd07edc0aff1040e64c6" - integrity sha512-bAr3RNP3o/UCz8mOpYKSWbB34hvKkO42FT3wKYhfLWPm+yjkoSWGrlSzX3z6f7x7PbKVO0JfXNk5zCOsJBFFoQ== +"@budibase/backend-core@2.2.12-alpha.30": + version "2.2.12-alpha.30" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.30.tgz#0adb36fb32914fa998b3c44f91442bda80c7de02" + integrity sha512-PJgitAwVS8heI7pxO3bwiNTrIuJnLJwtF0nNCconoklx8QZVXLLDMuusxICrDugilbGfWuOI2k4p5DgK22T+kA== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.29" + "@budibase/types" "2.2.12-alpha.30" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,23 +521,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.29": - version "2.2.12-alpha.29" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.29.tgz#0883f38e39552bce49c95b2dbd04cae7112072d9" - integrity sha512-ssZSxYaCicuYFZSmPFghFAQQP2DPfGuJM76Jfmu1XFq/4TPqGVIPtjKowiMsS/+D6O+59xOb4KhCKy2N5pYphw== +"@budibase/pro@2.2.12-alpha.30": + version "2.2.12-alpha.30" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.30.tgz#bcf906828cfb9ce9ab6e2834c9465b426699f077" + integrity sha512-c8FbGk1Z9OAFtRE3PbjlZwju/5bUIEgYiGLavhR9dioo6o5H3j42SZX/1nnhfeykFbeMM9YUAzq7i8xmE5CtJA== dependencies: - "@budibase/backend-core" "2.2.12-alpha.29" - "@budibase/types" "2.2.12-alpha.29" + "@budibase/backend-core" "2.2.12-alpha.30" + "@budibase/types" "2.2.12-alpha.30" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.29": - version "2.2.12-alpha.29" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.29.tgz#9eedba7adc26b65b991dac2f26b96710835cfbc7" - integrity sha512-vEqFCzAH8/Tu+yRxOYi1x9kjgGy5AE81lMa2z+F9nZfdU7iL07xsd3WfE1EMzS8Byn5F8OTjZoRcQjzoTNMdhw== +"@budibase/types@2.2.12-alpha.30": + version "2.2.12-alpha.30" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.30.tgz#e1d20adbb3a151c7935310bf03800e572b4498f6" + integrity sha512-bShoMjQ1VqjrEfl5TeK94SCJUnnOCkWIB4AJOYIVr6thu+O0qyLwSP8YoTGtSKxXtJ2TAN3hIxx/EdDKMSrFqg== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From fc73a2f3586180ceb9b720b432909f23f604a7d2 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 19 Jan 2023 21:09:13 +0000 Subject: [PATCH 144/387] Saving. TODO - Validation --- .../CreateEditRelationshipCopy.svelte | 271 ++++++++++++++++++ 1 file changed, 271 insertions(+) create mode 100644 packages/builder/src/components/backend/Datasources/CreateEditRelationshipCopy.svelte diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationshipCopy.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationshipCopy.svelte new file mode 100644 index 0000000000..5ab099e61b --- /dev/null +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationshipCopy.svelte @@ -0,0 +1,271 @@ + + + + { + fromColumn = tableOptions.find(opt => opt.value === e.detail).label + }} + /> + {#if isManyToOne && fromTable} + { + toColumn = tableOptions.find(opt => opt.value === e.detail).label + }} + /> + {#if isManyToMany} + + + {/if} +
+ Column names +
+ + Budibase manages SQL relationships as a new column in the table, please + provide a name for these columns. + + + +
+ {#if originalFromColumnName != null} + + {/if} +
+ + + From 8a4c0c6acd28e34f833d90bde5138021cee7342e Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 19 Jan 2023 22:54:06 +0000 Subject: [PATCH 145/387] Overhaul of CreateEditRelationship modal --- .../Datasources/CreateEditRelationship.svelte | 417 +++++++++--------- 1 file changed, 211 insertions(+), 206 deletions(-) diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte index 7110374569..1454408017 100644 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte @@ -10,7 +10,6 @@ } from "@budibase/bbui" import { tables } from "stores/backend" import { Helpers } from "@budibase/bbui" - import { writable } from "svelte/store" export let save export let datasource @@ -18,47 +17,95 @@ export let fromRelationship = {} export let toRelationship = {} export let close - export let selectedFromTable - let originalFromName = fromRelationship.name, - originalToName = toRelationship.name + const colNotSet = "Please specify a column name" + const relationshipTypes = [ + { + label: "One to Many", + value: RelationshipTypes.MANY_TO_ONE, + }, + { + label: "Many to Many", + value: RelationshipTypes.MANY_TO_MANY, + }, + ] + + let originalFromColumnName = fromRelationship.name, + originalToColumnName = toRelationship.name let originalFromTable = plusTables.find( table => table._id === toRelationship?.tableId ) let originalToTable = plusTables.find( table => table._id === fromRelationship?.tableId ) - let fromTable, toTable, through, linkTable, tableOptions - let isManyToMany, isManyToOne, relationshipTypes - let errors, valid - let currentTables = {} - if (fromRelationship && !fromRelationship.relationshipType) { - fromRelationship.relationshipType = RelationshipTypes.MANY_TO_ONE - } + let tableOptions + let errors = {} + let hasClickedSave = !!fromRelationship.relationshipType + let fromPrimary, + fromForeign, + fromTable, + toTable, + throughTable, + fromColumn, + toColumn + let fromId, toId, throughId, throughToKey, throughFromKey + let isManyToMany, isManyToOne, relationshipType - if (toRelationship && selectedFromTable) { - toRelationship.tableId = selectedFromTable._id - } - - function inSchema(table, prop, ogName) { - if (!table || !prop || prop === ogName) { - return false + $: { + if (!fromPrimary) { + fromPrimary = fromRelationship.foreignKey + fromForeign = toRelationship.foreignKey + } + if (!fromColumn && !errors.fromColumn) { + fromColumn = toRelationship.name + } + if (!toColumn && !errors.toColumn) { + toColumn = fromRelationship.name + } + if (!fromId) { + fromId = toRelationship.tableId + } + if (!toId) { + toId = fromRelationship.tableId + } + if (!throughId) { + throughId = fromRelationship.through + throughFromKey = fromRelationship.throughFrom + throughToKey = fromRelationship.throughTo + } + if (!relationshipType) { + relationshipType = fromRelationship.relationshipType } - const keys = Object.keys(table.schema).map(key => key.toLowerCase()) - return keys.indexOf(prop.toLowerCase()) !== -1 } - const touched = writable({}) + $: tableOptions = plusTables.map(table => ({ + label: table.name, + value: table._id, + })) + $: valid = getErrorCount(errors) === 0 || !hasClickedSave - function invalidThroughTable({ through, throughTo, throughFrom }) { + $: isManyToMany = relationshipType === RelationshipTypes.MANY_TO_MANY + $: isManyToOne = relationshipType === RelationshipTypes.MANY_TO_ONE + $: fromTable = plusTables.find(table => table._id === fromId) + $: toTable = plusTables.find(table => table._id === toId) + $: throughTable = plusTables.find(table => table._id === throughId) + + $: toRelationship.relationshipType = fromRelationship?.relationshipType + + const getErrorCount = errors => + Object.entries(errors) + .filter(entry => !!entry[1]) + .map(entry => entry[0]).length + + function invalidThroughTable() { // need to know the foreign key columns to check error - if (!through || !throughTo || !throughFrom) { + if (!throughId || !throughToKey || !throughFromKey) { return false } - const throughTable = plusTables.find(tbl => tbl._id === through) - const otherColumns = Object.values(throughTable.schema).filter( - col => col.name !== throughFrom && col.name !== throughTo + const throughTbl = plusTables.find(tbl => tbl._id === throughId) + const otherColumns = Object.values(throughTbl.schema).filter( + col => col.name !== throughFromKey && col.name !== throughToKey ) for (let col of otherColumns) { if (col.constraints?.presence && !col.autocolumn) { @@ -68,145 +115,134 @@ return false } - function checkForErrors(fromRelate, toRelate) { - const isMany = - fromRelate.relationshipType === RelationshipTypes.MANY_TO_MANY + function validate() { + const isMany = relationshipType === RelationshipTypes.MANY_TO_MANY const tableNotSet = "Please specify a table" + const foreignKeyNotSet = "Please pick a foreign key" const errObj = {} - if ($touched.from && !fromTable) { - errObj.from = tableNotSet + if (!relationshipType) { + errObj.relationshipType = "Please specify a relationship type" } - if ($touched.to && !toTable) { - errObj.to = tableNotSet + if (!fromTable) { + errObj.fromTable = tableNotSet } - if ($touched.through && isMany && !fromRelate.through) { - errObj.through = tableNotSet + if (!toTable) { + errObj.toTable = tableNotSet } - if ($touched.through && invalidThroughTable(fromRelate)) { - errObj.through = "Ensure non-key columns are nullable or auto-generated" + if (isMany && !throughTable) { + errObj.throughTable = tableNotSet } - if ($touched.foreign && !isMany && !fromRelate.fieldName) { - errObj.foreign = "Please pick the foreign key" + if (isMany && !throughFromKey) { + errObj.throughFromKey = foreignKeyNotSet } - const colNotSet = "Please specify a column name" - if ($touched.fromCol && !toRelate.name) { - errObj.fromCol = colNotSet + if (isMany && !throughToKey) { + errObj.throughToKey = foreignKeyNotSet } - if ($touched.toCol && !fromRelate.name) { - errObj.toCol = colNotSet + if (invalidThroughTable()) { + errObj.throughTable = + "Ensure non-key columns are nullable or auto-generated" } - if ($touched.primary && !isMany && !fromPrimary) { - errObj.primary = "Please pick the primary key" + if (!isMany && !fromForeign) { + errObj.fromForeign = foreignKeyNotSet } + if (!fromColumn) { + errObj.fromColumn = colNotSet + } + if (!toColumn) { + errObj.toColumn = colNotSet + } + if (!isMany && !fromPrimary) { + errObj.fromPrimary = "Please pick the primary key" + } + // currently don't support relationships back onto the table itself, needs to relate out const tableError = "From/to/through tables must be different" - if (fromTable && (fromTable === toTable || fromTable === through)) { - errObj.from = tableError + if (fromTable && (fromTable === toTable || fromTable === throughTable)) { + errObj.fromTable = tableError } - if (toTable && (toTable === fromTable || toTable === through)) { - errObj.to = tableError + if (toTable && (toTable === fromTable || toTable === throughTable)) { + errObj.toTable = tableError } - if (through && (through === fromTable || through === toTable)) { - errObj.through = tableError + if ( + throughTable && + (throughTable === fromTable || throughTable === toTable) + ) { + errObj.throughTable = tableError } const colError = "Column name cannot be an existing column" - if (inSchema(fromTable, fromRelate.name, originalFromName)) { - errObj.fromCol = colError + if (isColumnNameBeingUsed(fromTable, fromColumn, originalFromColumnName)) { + errObj.fromColumn = colError } - if (inSchema(toTable, toRelate.name, originalToName)) { - errObj.toCol = colError + if (isColumnNameBeingUsed(toTable, toColumn, originalToColumnName)) { + errObj.toColumn = colError } let fromType, toType - if (fromPrimary && fromRelate.fieldName) { + if (fromPrimary && fromForeign) { fromType = fromTable?.schema[fromPrimary]?.type - toType = toTable?.schema[fromRelate.fieldName]?.type + toType = toTable?.schema[fromForeign]?.type } if (fromType && toType && fromType !== toType) { - errObj.foreign = + errObj.fromForeign = "Column type of the foreign key must match the primary key" } + errors = errObj + return getErrorCount(errors) === 0 } - let fromPrimary - $: { - if (!fromPrimary && fromTable) { - fromPrimary = fromRelationship?.foreignKey - } - } - $: isManyToMany = - fromRelationship?.relationshipType === RelationshipTypes.MANY_TO_MANY - $: isManyToOne = - fromRelationship?.relationshipType === RelationshipTypes.MANY_TO_ONE - $: tableOptions = plusTables.map(table => ({ - label: table.name, - value: table._id, - })) - $: fromTable = plusTables.find(table => table._id === toRelationship?.tableId) - $: toTable = plusTables.find(table => table._id === fromRelationship?.tableId) - $: through = plusTables.find(table => table._id === fromRelationship?.through) - $: checkForErrors(fromRelationship, toRelationship) - $: valid = - Object.keys(errors).length === 0 && - Object.keys($touched).length !== 0 && - fromTable && - toTable - - $: linkTable = through || toTable - $: relationshipTypes = [ - { - label: "Many", - value: RelationshipTypes.MANY_TO_MANY, - }, - { - label: "One", - value: RelationshipTypes.MANY_TO_ONE, - }, - ] - $: updateRelationshipType(fromRelationship?.relationshipType) - $: tableChanged(fromTable, toTable) - - function updateRelationshipType(fromType) { - if (fromType === RelationshipTypes.MANY_TO_MANY) { - toRelationship.relationshipType = RelationshipTypes.MANY_TO_MANY - } else { - toRelationship.relationshipType = RelationshipTypes.MANY_TO_ONE + function isColumnNameBeingUsed(table, columnName, originalName) { + if (!table || !columnName || columnName === originalName) { + return false } + const keys = Object.keys(table.schema).map(key => key.toLowerCase()) + return keys.indexOf(columnName.toLowerCase()) !== -1 } function buildRelationships() { - // if any to many only need to check from - const manyToMany = - fromRelationship.relationshipType === RelationshipTypes.MANY_TO_MANY - // main is simply used to know this is the side the user configured it from const id = Helpers.uuid() - if (!manyToMany) { - delete fromRelationship.through - delete toRelationship.through - } + //Map temporary variables let relateFrom = { ...fromRelationship, + tableId: toId, + name: toColumn, + relationshipType, + fieldName: fromForeign, + through: throughId, + throughFrom: throughFromKey, + throughTo: throughToKey, type: "link", main: true, _id: id, } - let relateTo = { + let relateTo = (toRelationship = { ...toRelationship, + tableId: fromId, + name: fromColumn, + through: throughId, type: "link", _id: id, + }) + + // if any to many only need to check from + const manyToMany = + relateFrom.relationshipType === RelationshipTypes.MANY_TO_MANY + + if (!manyToMany) { + delete relateFrom.through + delete relateTo.through } // [0] is because we don't support composite keys for relationships right now if (manyToMany) { relateFrom = { ...relateFrom, - through: through._id, + through: throughTable._id, fieldName: toTable.primary[0], } relateTo = { ...relateTo, - through: through._id, + through: throughTable._id, fieldName: fromTable.primary[0], throughFrom: relateFrom.throughTo, throughTo: relateFrom.throughFrom, @@ -235,9 +271,27 @@ toRelationship = relateTo } - // save the relationship on to the datasource + function removeExistingRelationship() { + if (originalFromTable && originalFromColumnName) { + delete datasource.entities[originalFromTable.name].schema[ + originalFromColumnName + ] + } + if (originalToTable && originalToColumnName) { + delete datasource.entities[originalToTable.name].schema[ + originalToColumnName + ] + } + } + async function saveRelationship() { + hasClickedSave = true + if (!validate()) { + return false + } buildRelationships() + removeExistingRelationship() + // source of relationship datasource.entities[fromTable.name].schema[fromRelationship.name] = fromRelationship @@ -245,61 +299,14 @@ datasource.entities[toTable.name].schema[toRelationship.name] = toRelationship - // If relationship has been renamed or a different table selected - if ( - originalFromTable?.name && - (originalFromName !== fromRelationship.name || - hasTableChanged(fromTable, toTable)) - ) { - delete datasource.entities[originalFromTable.name].schema[ - originalFromName - ] - } - if ( - originalToTable?.name && - (originalToName !== toRelationship.name || - hasTableChanged(fromTable, toTable)) - ) { - delete datasource.entities[originalToTable.name].schema[originalToName] - } - - // store the original names so it won't cause an error - originalToName = toRelationship.name - originalFromName = fromRelationship.name await save() } - async function deleteRelationship() { - delete datasource.entities[originalFromTable.name].schema[originalFromName] - delete datasource.entities[originalToTable.name].schema[originalToName] + removeExistingRelationship() await save() await tables.fetch() close() } - - function hasTableChanged(fromTbl, toTbl) { - const areRelationshipsSet = - (originalFromName || originalToName) && - originalFromTable?.name === fromTbl?.name && - originalToTable?.name === toTbl?.name - - return ( - currentTables?.from?._id !== fromTbl?._id || - currentTables?.to?._id !== toTbl?._id || - !areRelationshipsSet - ) - } - - function tableChanged(fromTbl, toTbl) { - if (!hasTableChanged(fromTbl, toTbl)) { - return - } - fromRelationship.name = toTbl?.name || "" - errors.fromCol = "" - toRelationship.name = fromTbl?.name || "" - errors.toCol = "" - currentTables = { from: fromTbl, to: toTbl } - } (errors.relationshipType = null)} />
Tables @@ -319,68 +328,64 @@ ($touched.primary = true)} - bind:error={errors.primary} + label={`Primary Key (${fromTable.name})`} + options={Object.keys(fromTable.schema)} bind:value={fromPrimary} + bind:error={errors.fromPrimary} + on:change={e => (errors.fromPrimary = null)} /> {/if} { - $touched.through = true - $touched.fromForeign = true - $touched.toForeign = true - }} - bind:error={errors.through} - bind:value={fromRelationship.through} + bind:value={throughId} + bind:error={errors.throughTable} /> - {#if fromTable && toTable && through} + {#if fromTable && toTable && throughTable} ($touched.toForeign = true)} - bind:error={errors.toForeign} - bind:value={fromRelationship.throughFrom} + options={Object.keys(throughTable?.schema)} + bind:value={throughFromKey} + bind:error={errors.throughFromKey} + on:change={e => (errors.throughFromKey = null)} /> {/if} {:else if isManyToOne && toTable} ($touched.fromCol = true)} - on:change={() => ($touched.fromCol = true)} - bind:error={errors.fromCol} label="From table column" - bind:value={toRelationship.name} + bind:value={fromColumn} + bind:error={errors.fromColumn} + on:change={e => { + errors.fromColumn = e.detail?.length > 0 ? null : colNotSet + }} /> ($touched.toCol = true)} - on:change={() => ($touched.toCol = true)} - bind:error={errors.toCol} label="To table column" - bind:value={fromRelationship.name} + bind:value={toColumn} + bind:error={errors.toColumn} + on:change={e => (errors.toColumn = e.detail?.length > 0 ? null : colNotSet)} />
- {#if originalFromName != null} + {#if originalFromColumnName != null} {/if}
From 738e0f28d719f6ac8eaa0bae241ff76b19bc8a3b Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 19 Jan 2023 22:54:46 +0000 Subject: [PATCH 146/387] lint --- .../backend/Datasources/CreateEditRelationship.svelte | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte index 1454408017..76fcd36720 100644 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte @@ -320,7 +320,7 @@ options={relationshipTypes} bind:value={relationshipType} bind:error={errors.relationshipType} - on:change={e => (errors.relationshipType = null)} + on:change={() => (errors.relationshipType = null)} />
Tables @@ -342,7 +342,7 @@ options={Object.keys(fromTable.schema)} bind:value={fromPrimary} bind:error={errors.fromPrimary} - on:change={e => (errors.fromPrimary = null)} + on:change={() => (errors.fromPrimary = null)} /> {/if} (errors.throughFromKey = null)} + on:change={() => (errors.throughFromKey = null)} /> {/if} {:else if isManyToOne && toTable} @@ -385,7 +385,7 @@ options={Object.keys(toTable?.schema)} bind:value={fromForeign} bind:error={errors.fromForeign} - on:change={e => (errors.fromForeign = null)} + on:change={() => (errors.fromForeign = null)} /> {/if}
From 382db8ac78416f97cd1c886794948fd8d0104398 Mon Sep 17 00:00:00 2001 From: Mel O'Hagan Date: Thu, 19 Jan 2023 22:57:19 +0000 Subject: [PATCH 147/387] Delete file copy --- .../CreateEditRelationshipCopy.svelte | 271 ------------------ 1 file changed, 271 deletions(-) delete mode 100644 packages/builder/src/components/backend/Datasources/CreateEditRelationshipCopy.svelte diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationshipCopy.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationshipCopy.svelte deleted file mode 100644 index 5ab099e61b..0000000000 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationshipCopy.svelte +++ /dev/null @@ -1,271 +0,0 @@ - - - - { - fromColumn = tableOptions.find(opt => opt.value === e.detail).label - }} - /> - {#if isManyToOne && fromTable} - { - toColumn = tableOptions.find(opt => opt.value === e.detail).label - }} - /> - {#if isManyToMany} - - - {/if} -
- Column names -
- - Budibase manages SQL relationships as a new column in the table, please - provide a name for these columns. - - - -
- {#if originalFromColumnName != null} - - {/if} -
- - - From 89e4b8b86e341c6be7a3fa2a8bcb06ec76be4463 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 20 Jan 2023 08:14:37 +0000 Subject: [PATCH 148/387] Fix label animation --- packages/bbui/src/FancyForm/FancyFieldLabel.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/bbui/src/FancyForm/FancyFieldLabel.svelte b/packages/bbui/src/FancyForm/FancyFieldLabel.svelte index b1e29cd9c1..6ae6aede27 100644 --- a/packages/bbui/src/FancyForm/FancyFieldLabel.svelte +++ b/packages/bbui/src/FancyForm/FancyFieldLabel.svelte @@ -10,11 +10,11 @@ div { font-size: 14px; font-weight: 500; - transform: translateY(-50%); position: absolute; - top: 18px; + top: 10px; color: var(--spectrum-global-color-gray-600); - transition: font-size 130ms ease-out, top 130ms ease-out; + transition: font-size 130ms ease-out, top 130ms ease-out, + transform 130ms ease-out; } div.placeholder { top: 50%; From 0489f9243d5d15b55cb85555ed42037127a26e70 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 20 Jan 2023 08:54:17 +0000 Subject: [PATCH 149/387] Improve styles of fancy components --- packages/bbui/src/ActionButton/ActionButton.svelte | 1 + packages/bbui/src/FancyForm/FancyButtonRadio.svelte | 12 +++++++++--- packages/bbui/src/FancyForm/FancyCheckbox.svelte | 1 + packages/bbui/src/FancyForm/FancyField.svelte | 5 +++++ packages/bbui/src/FancyForm/FancyFieldLabel.svelte | 1 + packages/bbui/src/FancyForm/FancyInput.svelte | 2 ++ packages/bbui/src/FancyForm/FancySelect.svelte | 6 ++++-- packages/bbui/src/FancyForm/index.js | 1 + 8 files changed, 24 insertions(+), 5 deletions(-) diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte index cfc810807e..cc4417be2a 100644 --- a/packages/bbui/src/ActionButton/ActionButton.svelte +++ b/packages/bbui/src/ActionButton/ActionButton.svelte @@ -88,6 +88,7 @@ } .is-selected:not(.spectrum-ActionButton--emphasized) { background: var(--spectrum-global-color-gray-300); + border-color: var(--spectrum-global-color-gray-700); } .noPadding { padding: 0; diff --git a/packages/bbui/src/FancyForm/FancyButtonRadio.svelte b/packages/bbui/src/FancyForm/FancyButtonRadio.svelte index 0fe9131a0b..719ccea97c 100644 --- a/packages/bbui/src/FancyForm/FancyButtonRadio.svelte +++ b/packages/bbui/src/FancyForm/FancyButtonRadio.svelte @@ -33,7 +33,7 @@ } - + {#if label} {label} {/if} @@ -42,7 +42,6 @@ {#each options as option} onChange(getOptionValue(option))} > {getOptionLabel(option)} @@ -53,11 +52,18 @@ diff --git a/packages/bbui/src/FancyForm/FancyCheckbox.svelte b/packages/bbui/src/FancyForm/FancyCheckbox.svelte index 84caf117fe..191cc79485 100644 --- a/packages/bbui/src/FancyForm/FancyCheckbox.svelte +++ b/packages/bbui/src/FancyForm/FancyCheckbox.svelte @@ -39,6 +39,7 @@ } .text { font-size: 15px; + line-height: 17px; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; diff --git a/packages/bbui/src/FancyForm/FancyField.svelte b/packages/bbui/src/FancyForm/FancyField.svelte index 536dabad2d..89f2dec7d0 100644 --- a/packages/bbui/src/FancyForm/FancyField.svelte +++ b/packages/bbui/src/FancyForm/FancyField.svelte @@ -10,6 +10,7 @@ export let validate export let value export let ref + export let autoHeight const formContext = getContext("fancy-form") const id = Math.random() @@ -41,6 +42,7 @@ class:disabled class:focused class:clickable + class:auto-height={autoHeight} >
@@ -94,6 +96,9 @@ height: 64px; padding: 0 16px; } + .fancy-field.auto-height .content { + height: auto; + } .content, .field { display: flex; diff --git a/packages/bbui/src/FancyForm/FancyFieldLabel.svelte b/packages/bbui/src/FancyForm/FancyFieldLabel.svelte index 6ae6aede27..181cff50e4 100644 --- a/packages/bbui/src/FancyForm/FancyFieldLabel.svelte +++ b/packages/bbui/src/FancyForm/FancyFieldLabel.svelte @@ -9,6 +9,7 @@ diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte index 5a54cafcd5..d8633a4fbc 100644 --- a/packages/builder/src/pages/builder/auth/login.svelte +++ b/packages/builder/src/pages/builder/auth/login.svelte @@ -5,12 +5,11 @@ Button, Divider, Heading, + Input, Layout, notifications, Link, } from "@budibase/bbui" - import { FancyInput, FancyForm } from "@budibase/bbui" - import { TestimonialPage } from "@budibase/frontend-core" import { goto } from "@roxi/routify" import { auth, organisation, oidc, admin } from "stores/portal" import GoogleButton from "./_components/GoogleButton.svelte" @@ -21,16 +20,12 @@ let username = "" let password = "" let loaded = false - let form $: company = $organisation.company || "Budibase" $: multiTenancyEnabled = $admin.multiTenancy $: cloud = $admin.cloud async function login() { - if (!form.validate()) { - return - } try { await auth.login({ username: username.trim(), @@ -62,78 +57,60 @@ - - - - - logo - Log in to {company} - - {#if loaded} - - - {/if} - - - !x && "Please enter your work email"} - label="Your work email" - value={username} - on:change={e => (username = e.detail)} - /> - (username = e.detail)} - /> - (username = e.detail)} - /> - !x && "Please enter your password"} - label="Password" - type="password" - value={password} - on:change={e => (password = e.detail)} - /> - - -
- -
- - $goto("./forgot")}> - Forgot password? - - {#if multiTenancyEnabled && !cloud} - { - admin.unload() - $goto("./org") - }} + diff --git a/packages/builder/src/components/portal/onboarding/TourWrap.svelte b/packages/builder/src/components/portal/onboarding/TourWrap.svelte new file mode 100644 index 0000000000..5761247ba3 --- /dev/null +++ b/packages/builder/src/components/portal/onboarding/TourWrap.svelte @@ -0,0 +1,27 @@ + + + diff --git a/packages/builder/src/components/portal/onboarding/steps/OnboardingData.svelte b/packages/builder/src/components/portal/onboarding/steps/OnboardingData.svelte new file mode 100644 index 0000000000..674d5c14ab --- /dev/null +++ b/packages/builder/src/components/portal/onboarding/steps/OnboardingData.svelte @@ -0,0 +1,10 @@ +
+ In this section you can mange the data for your app: +
    +
  • Connect data sources
    • +
  • Edit data
    • +
  • Manage read & write access
    • +
  • Create views
    • +
  • Add bindings
    • +
+
diff --git a/packages/builder/src/components/portal/onboarding/steps/OnboardingDesign.svelte b/packages/builder/src/components/portal/onboarding/steps/OnboardingDesign.svelte new file mode 100644 index 0000000000..84d84777f5 --- /dev/null +++ b/packages/builder/src/components/portal/onboarding/steps/OnboardingDesign.svelte @@ -0,0 +1,10 @@ +
+ After setting up your data, Design is where you build the screens for your + app: +
    +
  • Add screens
    • +
  • Add components
    • +
  • Choose your theme
    • +
  • Edit navigation
    • +
+
diff --git a/packages/builder/src/components/portal/onboarding/steps/OnboardingPublish.svelte b/packages/builder/src/components/portal/onboarding/steps/OnboardingPublish.svelte new file mode 100644 index 0000000000..8913d77482 --- /dev/null +++ b/packages/builder/src/components/portal/onboarding/steps/OnboardingPublish.svelte @@ -0,0 +1,7 @@ +
+ Once you’re happy with your app you can publish it to production! +

+ After publishing, any changes you make will not take affect until you next + publish. +

+
diff --git a/packages/builder/src/components/portal/onboarding/steps/index.js b/packages/builder/src/components/portal/onboarding/steps/index.js new file mode 100644 index 0000000000..8e27748f36 --- /dev/null +++ b/packages/builder/src/components/portal/onboarding/steps/index.js @@ -0,0 +1,3 @@ +export { default as OnboardingData } from "./OnboardingData.svelte" +export { default as OnboardingDesign } from "./OnboardingDesign.svelte" +export { default as OnboardingPublish } from "./OnboardingPublish.svelte" diff --git a/packages/builder/src/components/portal/onboarding/tourHandler.js b/packages/builder/src/components/portal/onboarding/tourHandler.js new file mode 100644 index 0000000000..d4a564f23a --- /dev/null +++ b/packages/builder/src/components/portal/onboarding/tourHandler.js @@ -0,0 +1,47 @@ +import { store } from "builderStore/index" +import { get } from "svelte/store" + +const registerNode = async (node, tourStepKey) => { + if (!node) { + console.log("Tour Handler - an anchor node is required") + } + + if (!get(store).tourKey) { + console.log("Tour Handler - No active tour ", tourStepKey, node) + return + } + + store.update(state => { + const update = { + ...state, + tourNodes: { + ...state.tourNodes, + [tourStepKey]: node, + }, + } + return update + }) +} + +export function tourHandler(node, tourStepKey) { + if (node && tourStepKey) { + registerNode(node, tourStepKey) + } + return { + destroy: () => { + const updatedTourNodes = get(store).tourNodes + if (updatedTourNodes && updatedTourNodes[tourStepKey]) { + delete updatedTourNodes[tourStepKey] + store.update(state => { + const update = { + ...state, + tourNodes: { + ...updatedTourNodes, + }, + } + return update + }) + } + }, + } +} diff --git a/packages/builder/src/components/portal/onboarding/tours.js b/packages/builder/src/components/portal/onboarding/tours.js new file mode 100644 index 0000000000..59f4c8daf9 --- /dev/null +++ b/packages/builder/src/components/portal/onboarding/tours.js @@ -0,0 +1,90 @@ +import { get } from "svelte/store" +import { store } from "builderStore" +import { users, auth } from "stores/portal" +import analytics from "analytics" +import { OnboardingData, OnboardingDesign, OnboardingPublish } from "./steps" +const ONBOARDING_EVENT_PREFIX = "onboarding" + +export const TOUR_STEP_KEYS = { + BUILDER_APP_PUBLISH: "builder-app-publish", + BUILDER_DATA_SECTION: "builder-data-section", + BUILDER_DESIGN_SECTION: "builder-design-section", + BUILDER_AUTOMATE_SECTION: "builder-automate-section", +} + +export const TOUR_KEYS = { + TOUR_BUILDER_ONBOARDING: "builder-onboarding", +} + +const tourEvent = eventKey => { + console.log("Emitting EVENT ", eventKey) + analytics.captureEvent(`${ONBOARDING_EVENT_PREFIX}:${eventKey}`, { + eventSource: EventSource.PORTAL, + }) +} + +const getTours = () => { + return { + [TOUR_KEYS.TOUR_BUILDER_ONBOARDING]: [ + { + id: TOUR_STEP_KEYS.BUILDER_DATA_SECTION, + title: "Data", + route: "/builder/app/:application/data", + layout: OnboardingData, + query: ".topcenternav .spectrum-Tabs-item#builder-data-tab", + onLoad: async () => { + tourEvent(TOUR_STEP_KEYS.BUILDER_DATA_SECTION) + }, + }, + { + id: TOUR_STEP_KEYS.BUILDER_DESIGN_SECTION, + title: "Design", + route: "/builder/app/:application/design", + layout: OnboardingDesign, + query: ".topcenternav .spectrum-Tabs-item#builder-design-tab", + onLoad: () => { + tourEvent(TOUR_STEP_KEYS.BUILDER_DESIGN_SECTION) + }, + }, + { + id: TOUR_STEP_KEYS.BUILDER_AUTOMATE_SECTION, + title: "Automations", + route: "/builder/app/:application/automate", + query: ".topcenternav .spectrum-Tabs-item#builder-automate-tab", + body: "Once you have your app screens made, you can set up automations to fit in with your current workflow", + onLoad: () => { + tourEvent(TOUR_STEP_KEYS.BUILDER_AUTOMATE_SECTION) + }, + }, + { + id: TOUR_STEP_KEYS.BUILDER_APP_PUBLISH, + title: "Publish", + layout: OnboardingPublish, + query: ".toprightnav #builder-app-publish-button", + onLoad: () => { + tourEvent(TOUR_STEP_KEYS.BUILDER_APP_PUBLISH) + }, + onComplete: async () => { + // Mark the users onboarding as complete + // Clear all tour related state + if (get(auth).user) { + await users.save({ + ...get(auth).user, + onboardedAt: new Date().toISOString(), + }) + + store.update(state => ({ + ...state, + tourNodes: null, + tourKey: null, + tourKeyStep: null, + onboarding: false, + })) + } + }, + }, + ], + } +} + +export const TOURS = getTours() diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte index 06ae57fa85..c99776320f 100644 --- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte @@ -1,6 +1,7 @@ diff --git a/packages/builder/src/components/portal/onboarding/tours.js b/packages/builder/src/components/portal/onboarding/tours.js index 6477dc0c96..d483a5af8b 100644 --- a/packages/builder/src/components/portal/onboarding/tours.js +++ b/packages/builder/src/components/portal/onboarding/tours.js @@ -72,11 +72,14 @@ const getTours = () => { onboardedAt: new Date().toISOString(), }) + // Update the cached user + await auth.getSelf() + store.update(state => ({ ...state, - tourNodes: null, - tourKey: null, - tourKeyStep: null, + tourNodes: undefined, + tourKey: undefined, + tourKeyStep: undefined, onboarding: false, })) } From 910a077d19f0fdd632fa062c2d3ff59cfc25c419 Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 23 Jan 2023 09:59:01 +0000 Subject: [PATCH 161/387] Merge fix --- packages/bbui/src/Form/Core/Picker.svelte | 8 -------- 1 file changed, 8 deletions(-) diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte index f0b22e5cca..32cfcf3310 100644 --- a/packages/bbui/src/Form/Core/Picker.svelte +++ b/packages/bbui/src/Form/Core/Picker.svelte @@ -131,25 +131,17 @@ >>>>>> origin/develop bind:this={popover} {open} on:close={() => (open = false)} useAnchorWidth={!autoWidth} maxWidth={autoWidth ? 400 : null} > -<<<<<<< HEAD -
-=======
(open = false)} > ->>>>>>> origin/develop {#if autocomplete} Date: Mon, 23 Jan 2023 10:05:16 +0000 Subject: [PATCH 162/387] Fix image and move folders --- hosting/{tests => dependencies}/Dockerfile | 2 +- hosting/dependencies/README.md | 57 +++++++++++++++++++ .../jest-testcontainers-config.js | 0 hosting/{tests => dependencies}/runner.sh | 0 package.json | 7 ++- 5 files changed, 62 insertions(+), 4 deletions(-) rename hosting/{tests => dependencies}/Dockerfile (92%) create mode 100644 hosting/dependencies/README.md rename hosting/{tests => dependencies}/jest-testcontainers-config.js (100%) rename hosting/{tests => dependencies}/runner.sh (100%) diff --git a/hosting/tests/Dockerfile b/hosting/dependencies/Dockerfile similarity index 92% rename from hosting/tests/Dockerfile rename to hosting/dependencies/Dockerfile index c39cb62931..eb35c19847 100644 --- a/hosting/tests/Dockerfile +++ b/hosting/dependencies/Dockerfile @@ -12,7 +12,7 @@ RUN chmod +x install.sh && ./install.sh WORKDIR / -ADD tests/runner.sh . +ADD hosting/tests/runner.sh . RUN chmod +x ./runner.sh EXPOSE 5984 diff --git a/hosting/dependencies/README.md b/hosting/dependencies/README.md new file mode 100644 index 0000000000..ccfc386ea5 --- /dev/null +++ b/hosting/dependencies/README.md @@ -0,0 +1,57 @@ +# Docker Image for Running Budibase Tests + +## Overview +This image contains the basic setup for running + +## Usage + +- Build the Image +- Run the Container + + +### Build the Image +The guidance below is based on building the Budibase single image on Debian 11 and AlmaLinux 8. If you use another distro or OS you will need to amend the commands to suit. +#### Install Node +Budibase requires a more recent version of node (14+) than is available in the base Debian repos so: + +``` +curl -sL https://deb.nodesource.com/setup_16.x | sudo bash - +apt install -y nodejs +node -v +``` +Install yarn and lerna: +``` +npm install -g yarn jest lerna +``` +#### Install Docker + +``` +apt install -y docker.io +``` + +Check the versions of each installed version. This process was tested with the version numbers below so YMMV using anything else: + +- Docker: 20.10.5 +- node: 16.15.1 +- yarn: 1.22.19 +- lerna: 5.1.4 + +#### Get the Code +Clone the Budibase repo +``` +git clone https://github.com/Budibase/budibase.git +cd budibase +``` +#### Setup Node +Node setup: +``` +node ./hosting/scripts/setup.js +yarn +yarn bootstrap +yarn build +``` +#### Build Image +The following yarn command does some prep and then runs the docker build command: +``` +yarn build:docker:tests +``` diff --git a/hosting/tests/jest-testcontainers-config.js b/hosting/dependencies/jest-testcontainers-config.js similarity index 100% rename from hosting/tests/jest-testcontainers-config.js rename to hosting/dependencies/jest-testcontainers-config.js diff --git a/hosting/tests/runner.sh b/hosting/dependencies/runner.sh similarity index 100% rename from hosting/tests/runner.sh rename to hosting/dependencies/runner.sh diff --git a/package.json b/package.json index dca639102c..6b509ccf84 100644 --- a/package.json +++ b/package.json @@ -66,8 +66,9 @@ "build:docker:single:multiarch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/single/Dockerfile -t budibase:latest .", "build:docker:single:image": "docker build -f hosting/single/Dockerfile -t budibase:latest .", "build:docker:single": "npm run build:docker:pre && npm run build:docker:single:image", - "build:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.2.1 --push ./hosting/couchdb", - "build:docker:tests": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/tests/Dockerfile -t budibase/tests:latest -t budibase/tests:v3.2.1 --push ./hosting", + "build:docker:tests": "docker build -f hosting/tests/Dockerfile -t budibase/tests:local .", + "publish:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.2.1 --push ./hosting/couchdb", + "publish:docker:tests": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/tests/Dockerfile -t budibase/tests:latest -t budibase/tests:v3.2.1 --push ./hosting", "build:docs": "lerna run build:docs", "release:helm": "node scripts/releaseHelmChart", "env:multi:enable": "lerna run env:multi:enable", @@ -86,4 +87,4 @@ "install:pro": "bash scripts/pro/install.sh", "dep:clean": "yarn clean && yarn bootstrap" } -} +} \ No newline at end of file From f94f4b2e9fd02e079d190f92cc3e5049092852cc Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 23 Jan 2023 10:45:59 +0000 Subject: [PATCH 163/387] Renamings --- hosting/dependencies/Dockerfile | 2 +- hosting/docker-compose.dev.yaml | 2 +- ...-testcontainers-config.js => jest-testcontainers-config.js | 2 +- package.json | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename hosting/dependencies/jest-testcontainers-config.js => jest-testcontainers-config.js (83%) diff --git a/hosting/dependencies/Dockerfile b/hosting/dependencies/Dockerfile index eb35c19847..859ba10c83 100644 --- a/hosting/dependencies/Dockerfile +++ b/hosting/dependencies/Dockerfile @@ -12,7 +12,7 @@ RUN chmod +x install.sh && ./install.sh WORKDIR / -ADD hosting/tests/runner.sh . +ADD hosting/dependencies/runner.sh . RUN chmod +x ./runner.sh EXPOSE 5984 diff --git a/hosting/docker-compose.dev.yaml b/hosting/docker-compose.dev.yaml index a6752ad67c..97f84cf3eb 100644 --- a/hosting/docker-compose.dev.yaml +++ b/hosting/docker-compose.dev.yaml @@ -6,7 +6,7 @@ services: dev-service: container_name: budi-dev restart: on-failure - image: budibase/tests + image: budibase/dependencies ports: - "${MINIO_PORT}:9000" - "9001:9001" diff --git a/hosting/dependencies/jest-testcontainers-config.js b/jest-testcontainers-config.js similarity index 83% rename from hosting/dependencies/jest-testcontainers-config.js rename to jest-testcontainers-config.js index debff4a722..6bf29db9bd 100644 --- a/hosting/dependencies/jest-testcontainers-config.js +++ b/jest-testcontainers-config.js @@ -1,6 +1,6 @@ module.exports = { devEnv: { - image: "budibase/tests", + image: "budibase/dependencies", tag: "latest", ports: [6379, 5984, 9000], env: {}, diff --git a/package.json b/package.json index 6b509ccf84..ca16edd72c 100644 --- a/package.json +++ b/package.json @@ -66,9 +66,9 @@ "build:docker:single:multiarch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/single/Dockerfile -t budibase:latest .", "build:docker:single:image": "docker build -f hosting/single/Dockerfile -t budibase:latest .", "build:docker:single": "npm run build:docker:pre && npm run build:docker:single:image", - "build:docker:tests": "docker build -f hosting/tests/Dockerfile -t budibase/tests:local .", + "build:docker:dependencies": "docker build -f hosting/dependencies/Dockerfile -t budibase/dependencies:local .", "publish:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.2.1 --push ./hosting/couchdb", - "publish:docker:tests": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/tests/Dockerfile -t budibase/tests:latest -t budibase/tests:v3.2.1 --push ./hosting", + "publish:docker:dependencies": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest -t budibase/dependencies:v3.2.1 --push ./hosting", "build:docs": "lerna run build:docs", "release:helm": "node scripts/releaseHelmChart", "env:multi:enable": "lerna run env:multi:enable", From 85fd8f241412b08a14fccfeb91f125166c756424 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 23 Jan 2023 12:02:44 +0000 Subject: [PATCH 164/387] Unlink jest-testcontainers-config --- packages/server/jest-testcontainers-config.js | 1 - 1 file changed, 1 deletion(-) delete mode 120000 packages/server/jest-testcontainers-config.js diff --git a/packages/server/jest-testcontainers-config.js b/packages/server/jest-testcontainers-config.js deleted file mode 120000 index a7b7bbeed7..0000000000 --- a/packages/server/jest-testcontainers-config.js +++ /dev/null @@ -1 +0,0 @@ -../../hosting/tests/jest-testcontainers-config.js \ No newline at end of file From 6071b650d721b6d7ca1a0ebddbbbfcec86ce5d79 Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 23 Jan 2023 12:26:59 +0000 Subject: [PATCH 165/387] Feedback update for reactive filter statements --- .../DataTable/modals/ExportModal.svelte | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte index 3a406d716e..68968d5785 100644 --- a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte +++ b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte @@ -32,24 +32,9 @@ let exportFormat = FORMATS[0].key let filterLookup - let exportOpDisplay = [] $: luceneFilter = LuceneUtils.buildLuceneQuery(filters) - - $: if (filters) { - exportOpDisplay = filterDisplay() - } - - $: if (sorting) { - exportOpDisplay = [ - ...exportOpDisplay, - { - Field: sorting.sortColumn, - Operation: "Order By", - "Field Value": sorting.sortOrder, - }, - ] - } + $: exportOpDisplay = buildExportOpDisplay(sorting, filterDisplay, filters) const buildFilterLookup = () => { return Object.keys(Constants.OperatorOptions).reduce((acc, key) => { @@ -61,6 +46,9 @@ filterLookup = buildFilterLookup() const filterDisplay = () => { + if (!filters) { + return [] + } return filters.map(filter => { let newFieldName = filter.field + "" const parts = newFieldName.split(":") @@ -74,6 +62,21 @@ }) } + const buildExportOpDisplay = (sorting, filterDisplay) => { + let filterDisplayConfig = filterDisplay() + if (sorting) { + filterDisplayConfig = [ + ...filterDisplayConfig, + { + Field: sorting.sortColumn, + Operation: "Order By", + "Field Value": sorting.sortOrder, + }, + ] + } + return filterDisplayConfig + } + const displaySchema = { Field: { type: "string", From b4e0e6a02fff1b88c005bb8c1d987ba84906f4da Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 23 Jan 2023 13:26:58 +0000 Subject: [PATCH 166/387] Tidy up small UI issues --- .../builder/src/components/portal/page/SideNavItem.svelte | 2 +- .../builder/src/pages/builder/portal/account/_layout.svelte | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/components/portal/page/SideNavItem.svelte b/packages/builder/src/components/portal/page/SideNavItem.svelte index b31afb683f..c22b8b6113 100644 --- a/packages/builder/src/components/portal/page/SideNavItem.svelte +++ b/packages/builder/src/components/portal/page/SideNavItem.svelte @@ -5,7 +5,7 @@ - {text} + {text || ""} diff --git a/packages/bbui/src/FancyForm/FancyButtonRadio.svelte b/packages/bbui/src/FancyForm/FancyButtonRadio.svelte new file mode 100644 index 0000000000..510fd8efb8 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyButtonRadio.svelte @@ -0,0 +1,70 @@ + + + + {#if label} + {label} + {/if} + +
+ {#each options as option} + onChange(getOptionValue(option))} + > + {getOptionLabel(option)} + + {/each} +
+ + + diff --git a/packages/bbui/src/FancyForm/FancyCheckbox.svelte b/packages/bbui/src/FancyForm/FancyCheckbox.svelte new file mode 100644 index 0000000000..191cc79485 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyCheckbox.svelte @@ -0,0 +1,53 @@ + + + + + + +
+ {#if text} + {text} + {/if} + +
+ + + diff --git a/packages/bbui/src/FancyForm/FancyField.svelte b/packages/bbui/src/FancyForm/FancyField.svelte new file mode 100644 index 0000000000..89f2dec7d0 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyField.svelte @@ -0,0 +1,126 @@ + + +
+
+
+ +
+ {#if error} +
+ +
+ {/if} +
+ {#if error} +
+ {error} +
+ {/if} +
+ + diff --git a/packages/bbui/src/FancyForm/FancyFieldLabel.svelte b/packages/bbui/src/FancyForm/FancyFieldLabel.svelte new file mode 100644 index 0000000000..181cff50e4 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyFieldLabel.svelte @@ -0,0 +1,25 @@ + + +
+ +
+ + diff --git a/packages/bbui/src/FancyForm/FancyForm.svelte b/packages/bbui/src/FancyForm/FancyForm.svelte new file mode 100644 index 0000000000..f874238572 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyForm.svelte @@ -0,0 +1,40 @@ + + +
+ +
+ + diff --git a/packages/bbui/src/FancyForm/FancyInput.svelte b/packages/bbui/src/FancyForm/FancyInput.svelte new file mode 100644 index 0000000000..ef254949c8 --- /dev/null +++ b/packages/bbui/src/FancyForm/FancyInput.svelte @@ -0,0 +1,63 @@ + + + + {#if label} + {label} + {/if} + (focused = true)} + on:blur={() => (focused = false)} + class:placeholder + /> + + + diff --git a/packages/bbui/src/FancyForm/FancySelect.svelte b/packages/bbui/src/FancyForm/FancySelect.svelte new file mode 100644 index 0000000000..240871fc9a --- /dev/null +++ b/packages/bbui/src/FancyForm/FancySelect.svelte @@ -0,0 +1,135 @@ + + + (open = true)} +> + {#if label} + {label} + {/if} + +
+ {value || ""} +
+ +
+ +
+ + + (open = false)} + useAnchorWidth={true} + maxWidth={null} +> +
+ {#if options.length} + {#each options as option, idx} +
onChange(getOptionValue(option, idx))} + > + + {getOptionLabel(option, idx)} + + {#if value === getOptionValue(option, idx)} + + {/if} +
+ {/each} + {/if} +
+ + + diff --git a/packages/bbui/src/FancyForm/index.js b/packages/bbui/src/FancyForm/index.js new file mode 100644 index 0000000000..241036fb35 --- /dev/null +++ b/packages/bbui/src/FancyForm/index.js @@ -0,0 +1,6 @@ +export { default as FancyInput } from "./FancyInput.svelte" +export { default as FancyCheckbox } from "./FancyCheckbox.svelte" +export { default as FancySelect } from "./FancySelect.svelte" +export { default as FancyButton } from "./FancyButton.svelte" +export { default as FancyForm } from "./FancyForm.svelte" +export { default as FancyButtonRadio } from "./FancyButtonRadio.svelte" diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte index 3e15b7f6ef..721083e3a6 100644 --- a/packages/bbui/src/Form/Core/Select.svelte +++ b/packages/bbui/src/Form/Core/Select.svelte @@ -18,8 +18,11 @@ export let autoWidth = false export let autocomplete = false export let sort = false + const dispatch = createEventDispatcher() + let open = false + $: fieldText = getFieldText(value, options, placeholder) $: fieldIcon = getFieldAttribute(getOptionIcon, value, options) $: fieldColour = getFieldAttribute(getOptionColour, value, options) diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte index 15aabd2c61..01111fda9a 100644 --- a/packages/bbui/src/Layout/Page.svelte +++ b/packages/bbui/src/Layout/Page.svelte @@ -18,6 +18,7 @@
+
import "@spectrum-css/link/dist/index-vars.css" + import { createEventDispatcher } from "svelte" export let href = "#" export let size = "M" @@ -9,10 +10,12 @@ export let overBackground = false export let target export let download + + const dispatch = createEventDispatcher() dispatch("click") && e.stopPropagation()} {href} {target} {download} diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 601c4dcbca..3de0bc2f46 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -101,3 +101,6 @@ export { banner, BANNER_TYPES } from "./Stores/banner" // Helpers export * as Helpers from "./helpers" + +// Fancy form components +export * from "./FancyForm" diff --git a/packages/builder/src/components/portal/page/SideNavItem.svelte b/packages/builder/src/components/portal/page/SideNavItem.svelte index b31afb683f..c22b8b6113 100644 --- a/packages/builder/src/components/portal/page/SideNavItem.svelte +++ b/packages/builder/src/components/portal/page/SideNavItem.svelte @@ -5,7 +5,7 @@ - {text} + {text || ""} diff --git a/packages/frontend-core/src/components/TestimonialPage.svelte b/packages/frontend-core/src/components/TestimonialPage.svelte new file mode 100644 index 0000000000..3028d4447a --- /dev/null +++ b/packages/frontend-core/src/components/TestimonialPage.svelte @@ -0,0 +1,62 @@ + + + + +
+
+ +
+ "Here is an example of how Budibase changed my life for the better and + now all I do is eat, sleep, build apps, repeat." +
+
+ +
+
No-code Enthusiast
+
Bedroom TLD
+
+
+ +
+
+ + + diff --git a/packages/frontend-core/src/components/index.js b/packages/frontend-core/src/components/index.js new file mode 100644 index 0000000000..7ca21c4ff9 --- /dev/null +++ b/packages/frontend-core/src/components/index.js @@ -0,0 +1,2 @@ +export { default as SplitPage } from "./SplitPage.svelte" +export { default as TestimonialPage } from "./TestimonialPage.svelte" diff --git a/packages/frontend-core/src/index.js b/packages/frontend-core/src/index.js index aecca81cda..01bf05c69e 100644 --- a/packages/frontend-core/src/index.js +++ b/packages/frontend-core/src/index.js @@ -3,3 +3,4 @@ export { fetchData } from "./fetch/fetchData" export * as Constants from "./constants" export * from "./stores" export * from "./utils" +export * from "./components" From 486bc6b18d020426574fe7cc307a43a725b6fde8 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 23 Jan 2023 15:52:23 +0000 Subject: [PATCH 173/387] Add jest-testcontainers-config --- packages/backend-core/src/auth/auth.ts | 8 -------- packages/server/jest-testcontainers-config.js | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) create mode 100644 packages/server/jest-testcontainers-config.js diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts index 75e425bd0f..bbefb2933d 100644 --- a/packages/backend-core/src/auth/auth.ts +++ b/packages/backend-core/src/auth/auth.ts @@ -9,16 +9,8 @@ import { jwt as jwtPassport, local, authenticated, - auditLog, tenancy, - authError, - ssoCallbackUrl, csrf, - internalApi, - adminOnly, - builderOnly, - builderOrAdmin, - joiValidator, oidc, google, } from "../middleware" diff --git a/packages/server/jest-testcontainers-config.js b/packages/server/jest-testcontainers-config.js new file mode 100644 index 0000000000..50940cb76d --- /dev/null +++ b/packages/server/jest-testcontainers-config.js @@ -0,0 +1 @@ +module.exports = require("../../jest-testcontainers-config") From 4436a2131b790f1454e7923f1f8cb75e3b9c3cfd Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 23 Jan 2023 15:53:12 +0000 Subject: [PATCH 174/387] v2.2.12-alpha.33 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 0606169dd3..74eaa3e18a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index ca87d6daa4..30fd97c124 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.32", + "@budibase/types": "2.2.12-alpha.33", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 6b67ca77d0..d88bb8a3d8 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.32", + "@budibase/string-templates": "2.2.12-alpha.33", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/avatar": "3.0.2", diff --git a/packages/builder/package.json b/packages/builder/package.json index 82c939d1f4..a333827bbd 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.32", - "@budibase/client": "2.2.12-alpha.32", - "@budibase/frontend-core": "2.2.12-alpha.32", - "@budibase/string-templates": "2.2.12-alpha.32", + "@budibase/bbui": "2.2.12-alpha.33", + "@budibase/client": "2.2.12-alpha.33", + "@budibase/frontend-core": "2.2.12-alpha.33", + "@budibase/string-templates": "2.2.12-alpha.33", "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index fd514d6917..d4ebbeaee1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.32", - "@budibase/string-templates": "2.2.12-alpha.32", - "@budibase/types": "2.2.12-alpha.32", + "@budibase/backend-core": "2.2.12-alpha.33", + "@budibase/string-templates": "2.2.12-alpha.33", + "@budibase/types": "2.2.12-alpha.33", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 6f6422c236..19ca5d6b69 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.32", - "@budibase/frontend-core": "2.2.12-alpha.32", - "@budibase/string-templates": "2.2.12-alpha.32", + "@budibase/bbui": "2.2.12-alpha.33", + "@budibase/frontend-core": "2.2.12-alpha.33", + "@budibase/string-templates": "2.2.12-alpha.33", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 321d95a284..48987c620b 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.32", + "@budibase/bbui": "2.2.12-alpha.33", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index ad4f5615f1..26699b8bb1 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 0ba9468623..ea448f11a0 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.32", - "@budibase/client": "2.2.12-alpha.32", + "@budibase/backend-core": "2.2.12-alpha.33", + "@budibase/client": "2.2.12-alpha.33", "@budibase/pro": "2.2.12-alpha.32", - "@budibase/string-templates": "2.2.12-alpha.32", - "@budibase/types": "2.2.12-alpha.32", + "@budibase/string-templates": "2.2.12-alpha.33", + "@budibase/types": "2.2.12-alpha.33", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b523f2cd0e..89350c4ba3 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 8a27829c47..95ed13050b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 3cef4d12f6..8c53517919 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.32", + "version": "2.2.12-alpha.33", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.32", + "@budibase/backend-core": "2.2.12-alpha.33", "@budibase/pro": "2.2.12-alpha.32", - "@budibase/string-templates": "2.2.12-alpha.32", - "@budibase/types": "2.2.12-alpha.32", + "@budibase/string-templates": "2.2.12-alpha.33", + "@budibase/types": "2.2.12-alpha.33", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From fc0652f3820f6c4ec2cb676cd4b74a74421e40ac Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 23 Jan 2023 15:57:26 +0000 Subject: [PATCH 175/387] Update pro version to 2.2.12-alpha.33 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index ea448f11a0..02b805d97a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.33", "@budibase/client": "2.2.12-alpha.33", - "@budibase/pro": "2.2.12-alpha.32", + "@budibase/pro": "2.2.12-alpha.33", "@budibase/string-templates": "2.2.12-alpha.33", "@budibase/types": "2.2.12-alpha.33", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 0514fed5d6..8da4fe0f19 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.32": - version "2.2.12-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.32.tgz#5d53fdde38e80fdade73c59cb81623041984a5fc" - integrity sha512-XoaqGrttx01wlblI0+O23R9uS5FTMgK07juY6mUkdReCK46IvmG7FFnuYu0euKVRbhChSf5X8S+fvKIAEi1ZFw== +"@budibase/backend-core@2.2.12-alpha.33": + version "2.2.12-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.33.tgz#c89c23b215b21ad2a5f9dff0a19d9902ce80b9ac" + integrity sha512-jDYFAw/m4sLSNGydFX9WUBcFW3+E4wRfFWU67oz4G2lqzIfVKy4MAVZdZaex1fomSJspEuH1v0b+PEB5MpUiyg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.32" + "@budibase/types" "2.2.12-alpha.33" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.32": - version "2.2.12-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.32.tgz#4f35b0ada97458cc69ee41ebb40d56b361518065" - integrity sha512-Kn/IahgIb9Ydzmasv4Bhlh3rvyAC2tBVSoI33OZ/6PKF0vPYJNJkFds3iGELNV7SyWoLbVWb2z5SQ4SSaOYsJw== +"@budibase/pro@2.2.12-alpha.33": + version "2.2.12-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.33.tgz#e6e1c8de90a8fe25c7ea954230ba6106e7f65760" + integrity sha512-eXU1AJVYpV6Ca4t8d/5MpUvP508grVAcL5m+3qxnAXaP9nQkbxL1vvPD2etYJB6y2rR5vxxb+LZRHGQD1jnxzw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.32" - "@budibase/types" "2.2.12-alpha.32" + "@budibase/backend-core" "2.2.12-alpha.33" + "@budibase/types" "2.2.12-alpha.33" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1405,10 +1405,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.32": - version "2.2.12-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.32.tgz#71af8e8cff66acbfd65aa87e66183dd95d76ce6f" - integrity sha512-ZZwmO+0ORGEFbU/EQvtnjo1VonUbBdsciFkTOiopVupU5iNY2oCKgbYTQiTZZisQrRuiKdPV6P17uV+YTkjQSQ== +"@budibase/types@2.2.12-alpha.33": + version "2.2.12-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.33.tgz#89f8d407ef3f9484563ebf2b10515d70433614f5" + integrity sha512-crvFyeBkpw9q0C0bqDCgdvOR/e5QIia+AHNfIgW17zLaZChtTv4vNGJ3wuMy2GE6AOUx9D98tNK6lI7oJemAWA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 8c53517919..bf62d79396 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.33", - "@budibase/pro": "2.2.12-alpha.32", + "@budibase/pro": "2.2.12-alpha.33", "@budibase/string-templates": "2.2.12-alpha.33", "@budibase/types": "2.2.12-alpha.33", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 052edf0197..caa21ca3fb 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.32": - version "2.2.12-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.32.tgz#5d53fdde38e80fdade73c59cb81623041984a5fc" - integrity sha512-XoaqGrttx01wlblI0+O23R9uS5FTMgK07juY6mUkdReCK46IvmG7FFnuYu0euKVRbhChSf5X8S+fvKIAEi1ZFw== +"@budibase/backend-core@2.2.12-alpha.33": + version "2.2.12-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.33.tgz#c89c23b215b21ad2a5f9dff0a19d9902ce80b9ac" + integrity sha512-jDYFAw/m4sLSNGydFX9WUBcFW3+E4wRfFWU67oz4G2lqzIfVKy4MAVZdZaex1fomSJspEuH1v0b+PEB5MpUiyg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.32" + "@budibase/types" "2.2.12-alpha.33" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,23 +521,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.32": - version "2.2.12-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.32.tgz#4f35b0ada97458cc69ee41ebb40d56b361518065" - integrity sha512-Kn/IahgIb9Ydzmasv4Bhlh3rvyAC2tBVSoI33OZ/6PKF0vPYJNJkFds3iGELNV7SyWoLbVWb2z5SQ4SSaOYsJw== +"@budibase/pro@2.2.12-alpha.33": + version "2.2.12-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.33.tgz#e6e1c8de90a8fe25c7ea954230ba6106e7f65760" + integrity sha512-eXU1AJVYpV6Ca4t8d/5MpUvP508grVAcL5m+3qxnAXaP9nQkbxL1vvPD2etYJB6y2rR5vxxb+LZRHGQD1jnxzw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.32" - "@budibase/types" "2.2.12-alpha.32" + "@budibase/backend-core" "2.2.12-alpha.33" + "@budibase/types" "2.2.12-alpha.33" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.32": - version "2.2.12-alpha.32" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.32.tgz#71af8e8cff66acbfd65aa87e66183dd95d76ce6f" - integrity sha512-ZZwmO+0ORGEFbU/EQvtnjo1VonUbBdsciFkTOiopVupU5iNY2oCKgbYTQiTZZisQrRuiKdPV6P17uV+YTkjQSQ== +"@budibase/types@2.2.12-alpha.33": + version "2.2.12-alpha.33" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.33.tgz#89f8d407ef3f9484563ebf2b10515d70433614f5" + integrity sha512-crvFyeBkpw9q0C0bqDCgdvOR/e5QIia+AHNfIgW17zLaZChtTv4vNGJ3wuMy2GE6AOUx9D98tNK6lI7oJemAWA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 106563c4499e285dae69374b3704a2980428ce2c Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 23 Jan 2023 16:45:06 +0000 Subject: [PATCH 176/387] Use couchdb from docker container --- packages/server/jest.config.ts | 1 - packages/server/src/tests/jestSetup.ts | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index 5ce654fa5c..4997300953 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -5,7 +5,6 @@ const preset = require("ts-jest/jest-preset") const config: Config.InitialOptions = { ...preset, preset: "@trendyol/jest-testcontainers", - testEnvironment: "node", setupFiles: ["./src/tests/jestEnv.ts"], setupFilesAfterEnv: ["./src/tests/jestSetup.ts"], collectCoverageFrom: [ diff --git a/packages/server/src/tests/jestSetup.ts b/packages/server/src/tests/jestSetup.ts index fc1477a500..ae229ddd7d 100644 --- a/packages/server/src/tests/jestSetup.ts +++ b/packages/server/src/tests/jestSetup.ts @@ -1,3 +1,5 @@ +import env from "../environment" +import { env as coreEnv } from "@budibase/backend-core" import { mocks } from "@budibase/backend-core/tests" // mock all dates to 2020-01-01T00:00:00.000Z @@ -15,3 +17,22 @@ if (!process.env.CI) { // 100 seconds jest.setTimeout(100000) } + +function overrideConfigValue(key: string, value: string) { + env._set(key, value) + coreEnv._set(key, value) +} + +overrideConfigValue("COUCH_DB_PORT", global.__TESTCONTAINERS_DEVENV_PORT_5984__) +overrideConfigValue( + "COUCH_DB_URL", + `http://localhost:${global.__TESTCONTAINERS_DEVENV_PORT_5984__}` +) + +overrideConfigValue( + "MINIO_URL", + `http://localhost:${global.__TESTCONTAINERS_DEVENV_PORT_9000__}` +) + +overrideConfigValue("COUCH_DB_USERNAME", "admin") +overrideConfigValue("COUCH_DB_PASSWORD", "admin") From 0daacf3425b2ef0d58c4f0ec8c6c85c27c59d4a8 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Mon, 23 Jan 2023 16:46:02 +0000 Subject: [PATCH 177/387] Add fields for MongoDB SSL cert file paths (#8260) * Added fields for tls certificate files * lint * Only include cert fields if SELF_HOSTED * lint * Refactor getSchema function * Add datasource field group with accordion * Handle no display column on fieldGroup field * Override text transform accordian header * Renamed from TLS to SSL in UI config * readable flag * Add accordion component * Refactor --- packages/bbui/package.json | 3 +- packages/bbui/src/Accordion/Accordion.svelte | 58 ++ packages/bbui/src/index.js | 1 + packages/bbui/yarn.lock | 13 +- packages/builder/package.json | 3 +- .../IntegrationConfigForm.svelte | 35 +- packages/builder/yarn.lock | 5 + packages/server/src/integrations/mongodb.ts | 596 ++++++++++-------- packages/types/src/sdk/datasources.ts | 13 +- 9 files changed, 442 insertions(+), 285 deletions(-) create mode 100644 packages/bbui/src/Accordion/Accordion.svelte diff --git a/packages/bbui/package.json b/packages/bbui/package.json index d88bb8a3d8..cea1075963 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -38,6 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", + "@spectrum-css/accordion": "3.0.24", "@budibase/string-templates": "2.2.12-alpha.33", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", @@ -89,4 +90,4 @@ "loader-utils": "1.4.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} +} \ No newline at end of file diff --git a/packages/bbui/src/Accordion/Accordion.svelte b/packages/bbui/src/Accordion/Accordion.svelte new file mode 100644 index 0000000000..1c88450c9a --- /dev/null +++ b/packages/bbui/src/Accordion/Accordion.svelte @@ -0,0 +1,58 @@ + + +
+
+

+ + +

+
+ +
+
+
+ + diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.js index 3de0bc2f46..b56aa597ad 100644 --- a/packages/bbui/src/index.js +++ b/packages/bbui/src/index.js @@ -75,6 +75,7 @@ export { default as ListItem } from "./List/ListItem.svelte" export { default as IconSideNav } from "./IconSideNav/IconSideNav.svelte" export { default as IconSideNavItem } from "./IconSideNav/IconSideNavItem.svelte" export { default as Slider } from "./Form/Slider.svelte" +export { default as Accordion } from "./Accordion/Accordion.svelte" // Renderers export { default as BoldRenderer } from "./Table/BoldRenderer.svelte" diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock index 72e36a6474..3286c33e69 100644 --- a/packages/bbui/yarn.lock +++ b/packages/bbui/yarn.lock @@ -109,10 +109,15 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@spectrum-css/actionbutton@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577" - integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw== +"@spectrum-css/accordion@3.0.24": + version "3.0.24" + resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74" + integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA== + +"@spectrum-css/actionbutton@^1.0.1": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.2.tgz#7753a94c64cebecfca6749ef20e37a5ea80c59be" + integrity sha512-laDWk7PCgy2I0AGsMjTmYKkiMVYVoF1B4tffJf4cIp66znTiqPHEbLDh5EDNU88JLTY2bWoCOY4cJxvXk5gERw== "@spectrum-css/actiongroup@1.0.1": version "1.0.1" diff --git a/packages/builder/package.json b/packages/builder/package.json index a333827bbd..38f18cea0e 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -78,6 +78,7 @@ "@sentry/browser": "5.19.1", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", + "@spectrum-css/accordion": "^3.0.24", "codemirror": "^5.59.0", "dayjs": "^1.11.2", "downloadjs": "1.4.7", @@ -123,4 +124,4 @@ "vite": "^3.0.8" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" -} +} \ No newline at end of file diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte index 05649e1773..6b35f3313f 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte @@ -6,6 +6,7 @@ Toggle, Button, TextArea, + Accordion, } from "@budibase/bbui" import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte" import { capitalise } from "helpers" @@ -51,15 +52,24 @@ let addButton - function getDisplayName(key) { + function getDisplayName(key, fieldKey) { let name - if (schema[key]?.display) { + if (fieldKey && schema[key]["fields"][fieldKey]?.display) { + name = schema[key]["fields"][fieldKey].display + } else if (fieldKey) { + name = fieldKey + } else if (schema[key]?.display) { name = schema[key].display } else { name = key } return capitalise(name) } + function getFieldGroupKeys(fieldGroup) { + return Object.entries(schema[fieldGroup].fields || {}) + .filter(el => filter(el)) + .map(([key]) => key) + }
@@ -100,6 +110,27 @@ error={$validation.errors[configKey]} />
+ {:else if schema[configKey].type === "fieldGroup"} + !!config[fieldKey] + )} + header={getDisplayName(configKey)} + > + + {#each getFieldGroupKeys(configKey) as fieldKey} +
+ + +
+ {/each} + + {:else}
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index bf3f7defb7..a491d14404 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -1356,6 +1356,11 @@ dependencies: "@sinonjs/commons" "^1.7.0" +"@spectrum-css/accordion@^3.0.24": + version "3.0.24" + resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74" + integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA== + "@spectrum-css/page@^3.0.1": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.8.tgz#001efa9e4c10095df9b2b37cf7d7d6eb60140190" diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts index 9ccefbda58..38b3891fe4 100644 --- a/packages/server/src/integrations/mongodb.ts +++ b/packages/server/src/integrations/mongodb.ts @@ -12,11 +12,16 @@ import { FindOneAndUpdateOptions, UpdateOptions, OperationOptions, + MongoClientOptions, } from "mongodb" +import environment from "../environment" interface MongoDBConfig { connectionString: string db: string + tlsCertificateFile: string + tlsCertificateKeyFile: string + tlsCAFile: string } interface MongoDBQuery { @@ -26,292 +31,331 @@ interface MongoDBQuery { } } -const SCHEMA: Integration = { - docs: "https://github.com/mongodb/node-mongodb-native", - friendlyName: "MongoDB", - type: "Non-relational", - description: - "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era.", - datasource: { - connectionString: { - type: DatasourceFieldType.STRING, - required: true, - default: "mongodb://localhost:27017", - }, - db: { - type: DatasourceFieldType.STRING, - required: true, - }, - }, - query: { - create: { - type: QueryType.JSON, - }, - read: { - type: QueryType.JSON, - }, - update: { - type: QueryType.JSON, - }, - delete: { - type: QueryType.JSON, - }, - aggregate: { - type: QueryType.JSON, - readable: true, - steps: [ - { - key: "$addFields", - template: "{\n\t\n}", - }, - { - key: "$bucket", - template: `{ - "groupBy": "", - "boundaries": [], - "default": "", - "output": {} -}`, - }, - { - key: "$bucketAuto", - template: `{ - "groupBy": "", - "buckets": 1, - "output": {}, - "granularity": "R5" -}`, - }, - { - key: "$changeStream", - template: `{ - "allChangesForCluster": true, - "fullDocument": "", - "fullDocumentBeforeChange": "", - "resumeAfter": 1, - "showExpandedEvents": true, - "startAfter": {}, - "startAtOperationTime": "" -}`, - }, - { - key: "$collStats", - template: `{ - "latencyStats": { "histograms": true } }, - "storageStats": { "scale": 1 } }, - "count": {}, - "queryExecStats": {} -}`, - }, - { - key: "$count", - template: ``, - }, - { - key: "$densify", - template: `{ - "field": "", - "partitionByFields": [], - "range": { - "step": 1, - "unit": 1, - "bounds": "full" - } -}`, - }, - { - key: "$documents", - template: `[]`, - }, - { - key: "$facet", - template: `{\n\t\n}`, - }, - { - key: "$fill", - template: `{ - "partitionBy": "", - "partitionByFields": [], - "sortBy": {}, - "output": {} -}`, - }, - { - key: "$geoNear", - template: `{ - "near": { - "type": "Point", - "coordinates": [ - -73.98142, 40.71782 - ] - }, - "key": "location", - "distanceField": "dist.calculated", - "query": { "category": "Parks" } -}`, - }, - { - key: "$graphLookup", - template: `{ - "from": "", - "startWith": "", - "connectFromField": "", - "connectToField": "", - "as": "", - "maxDepth": 1, - "depthField": "", - "restrictSearchWithMatch": {} -}`, - }, - { - key: "$group", - template: `{ - "_id": "" -}`, - }, - { - key: "$indexStats", - template: "{\n\t\n}", - }, - { - key: "$limit", - template: `1`, - }, - { - key: "$listLocalSessions", - template: `{\n\t\n}`, - }, - { - key: "$listSessions", - template: `{\n\t\n}`, - }, - { - key: "$lookup", - template: `{ - "from": "", - "localField": "", - "foreignField": "", - "as": "" -}`, - }, - { - key: "$match", - template: "{\n\t\n}", - }, - { - key: "$merge", - template: `{ - "into": {}, - "on": "_id", - "whenMatched": "replace", - "whenNotMatched": "insert" -}`, - }, - { - key: "$out", - template: `{ - "db": "", - "coll": "" -}`, - }, - { - key: "$planCacheStats", - template: "{\n\t\n}", - }, - { - key: "$project", - template: "{\n\t\n}", - }, - { - key: "$redact", - template: "", - }, - { - key: "$replaceRoot", - template: `{ "newRoot": "" }`, - }, - { - key: "$replaceWith", - template: ``, - }, - { - key: "$sample", - template: `{ "size": 3 }`, - }, - { - key: "$set", - template: "{\n\t\n}", - }, - { - key: "$setWindowFields", - template: `{ - "partitionBy": "", - "sortBy": {}, - "output": {} -}`, - }, - { - key: "$skip", - template: `1`, - }, - { - key: "$sort", - template: "{\n\t\n}", - }, - { - key: "$sortByCount", - template: "", - }, - { - key: "$unionWith", - template: `{ - "coll": "", - "pipeline": [] -}`, - }, - { - key: "$unset", - template: "", - }, - { - key: "$unwind", - template: `{ - "path": "", - "includeArrayIndex": "", - "preserveNullAndEmptyArrays": true -}`, - }, - ], - }, - }, - extra: { - collection: { - displayName: "Collection", - type: DatasourceFieldType.STRING, - required: true, - }, - actionType: { - displayName: "Query Type", - type: DatasourceFieldType.LIST, - required: true, - data: { - read: ["find", "findOne", "findOneAndUpdate", "count", "distinct"], - create: ["insertOne", "insertMany"], - update: ["updateOne", "updateMany"], - delete: ["deleteOne", "deleteMany"], - aggregate: ["json", "pipeline"], +const getSchema = () => { + let schema = { + docs: "https://github.com/mongodb/node-mongodb-native", + friendlyName: "MongoDB", + type: "Non-relational", + description: + "MongoDB is a general purpose, document-based, distributed database built for modern application developers and for the cloud era.", + datasource: { + connectionString: { + type: DatasourceFieldType.STRING, + required: true, + default: "mongodb://localhost:27017", + display: "Connection string", + }, + db: { + type: DatasourceFieldType.STRING, + required: true, + display: "DB", }, }, - }, + query: { + create: { + type: QueryType.JSON, + }, + read: { + type: QueryType.JSON, + }, + update: { + type: QueryType.JSON, + }, + delete: { + type: QueryType.JSON, + }, + aggregate: { + type: QueryType.JSON, + readable: true, + steps: [ + { + key: "$addFields", + template: "{\n\t\n}", + }, + { + key: "$bucket", + template: `{ + "groupBy": "", + "boundaries": [], + "default": "", + "output": {} + }`, + }, + { + key: "$bucketAuto", + template: `{ + "groupBy": "", + "buckets": 1, + "output": {}, + "granularity": "R5" + }`, + }, + { + key: "$changeStream", + template: `{ + "allChangesForCluster": true, + "fullDocument": "", + "fullDocumentBeforeChange": "", + "resumeAfter": 1, + "showExpandedEvents": true, + "startAfter": {}, + "startAtOperationTime": "" + }`, + }, + { + key: "$collStats", + template: `{ + "latencyStats": { "histograms": true } }, + "storageStats": { "scale": 1 } }, + "count": {}, + "queryExecStats": {} + }`, + }, + { + key: "$count", + template: ``, + }, + { + key: "$densify", + template: `{ + "field": "", + "partitionByFields": [], + "range": { + "step": 1, + "unit": 1, + "bounds": "full" + } + }`, + }, + { + key: "$documents", + template: `[]`, + }, + { + key: "$facet", + template: `{\n\t\n}`, + }, + { + key: "$fill", + template: `{ + "partitionBy": "", + "partitionByFields": [], + "sortBy": {}, + "output": {} + }`, + }, + { + key: "$geoNear", + template: `{ + "near": { + "type": "Point", + "coordinates": [ + -73.98142, 40.71782 + ] + }, + "key": "location", + "distanceField": "dist.calculated", + "query": { "category": "Parks" } + }`, + }, + { + key: "$graphLookup", + template: `{ + "from": "", + "startWith": "", + "connectFromField": "", + "connectToField": "", + "as": "", + "maxDepth": 1, + "depthField": "", + "restrictSearchWithMatch": {} + }`, + }, + { + key: "$group", + template: `{ + "_id": "" + }`, + }, + { + key: "$indexStats", + template: "{\n\t\n}", + }, + { + key: "$limit", + template: `1`, + }, + { + key: "$listLocalSessions", + template: `{\n\t\n}`, + }, + { + key: "$listSessions", + template: `{\n\t\n}`, + }, + { + key: "$lookup", + template: `{ + "from": "", + "localField": "", + "foreignField": "", + "as": "" + }`, + }, + { + key: "$match", + template: "{\n\t\n}", + }, + { + key: "$merge", + template: `{ + "into": {}, + "on": "_id", + "whenMatched": "replace", + "whenNotMatched": "insert" + }`, + }, + { + key: "$out", + template: `{ + "db": "", + "coll": "" + }`, + }, + { + key: "$planCacheStats", + template: "{\n\t\n}", + }, + { + key: "$project", + template: "{\n\t\n}", + }, + { + key: "$redact", + template: "", + }, + { + key: "$replaceRoot", + template: `{ "newRoot": "" }`, + }, + { + key: "$replaceWith", + template: ``, + }, + { + key: "$sample", + template: `{ "size": 3 }`, + }, + { + key: "$set", + template: "{\n\t\n}", + }, + { + key: "$setWindowFields", + template: `{ + "partitionBy": "", + "sortBy": {}, + "output": {} + }`, + }, + { + key: "$skip", + template: `1`, + }, + { + key: "$sort", + template: "{\n\t\n}", + }, + { + key: "$sortByCount", + template: "", + }, + { + key: "$unionWith", + template: `{ + "coll": "", + "pipeline": [] + }`, + }, + { + key: "$unset", + template: "", + }, + { + key: "$unwind", + template: `{ + "path": "", + "includeArrayIndex": "", + "preserveNullAndEmptyArrays": true + }`, + }, + ], + }, + }, + extra: { + collection: { + displayName: "Collection", + type: DatasourceFieldType.STRING, + required: true, + }, + actionType: { + displayName: "Query Type", + type: DatasourceFieldType.LIST, + required: true, + data: { + read: ["find", "findOne", "findOneAndUpdate", "count", "distinct"], + create: ["insertOne", "insertMany"], + update: ["updateOne", "updateMany"], + delete: ["deleteOne", "deleteMany"], + aggregate: ["json", "pipeline"], + }, + }, + }, + } + if (environment.SELF_HOSTED) { + schema.datasource = { + ...schema.datasource, + //@ts-ignore + tls: { + type: DatasourceFieldType.FIELD_GROUP, + display: "Configure SSL", + fields: { + tlsCertificateFile: { + type: DatasourceFieldType.STRING, + required: false, + display: "Certificate file path", + }, + tlsCertificateKeyFile: { + type: DatasourceFieldType.STRING, + required: false, + display: "Certificate Key file path", + }, + tlsCAFile: { + type: DatasourceFieldType.STRING, + required: false, + display: "CA file path", + }, + }, + }, + } + } + return schema } +const SCHEMA: Integration = getSchema() + class MongoIntegration implements IntegrationBase { private config: MongoDBConfig private client: any constructor(config: MongoDBConfig) { this.config = config - this.client = new MongoClient(config.connectionString) + const options: MongoClientOptions = { + tlsCertificateFile: config.tlsCertificateFile || undefined, + tlsCertificateKeyFile: config.tlsCertificateKeyFile || undefined, + tlsCAFile: config.tlsCAFile || undefined, + } + this.client = new MongoClient(config.connectionString, options) } async connect() { diff --git a/packages/types/src/sdk/datasources.ts b/packages/types/src/sdk/datasources.ts index 279a76446f..1847725c9d 100644 --- a/packages/types/src/sdk/datasources.ts +++ b/packages/types/src/sdk/datasources.ts @@ -33,6 +33,7 @@ export enum DatasourceFieldType { OBJECT = "object", JSON = "json", FILE = "file", + FIELD_GROUP = "fieldGroup", } export enum SourceName { @@ -95,6 +96,16 @@ export interface ExtraQueryConfig { } } +export interface DatasourceConfig { + [key: string]: { + type: string + display?: string + required?: boolean + default?: any + deprecated?: boolean + } +} + export interface Integration { docs: string plus?: boolean @@ -104,7 +115,7 @@ export interface Integration { friendlyName: string type?: string iconUrl?: string - datasource: {} + datasource: DatasourceConfig query: { [key: string]: QueryDefinition } From 98aa60879fb4820ae325a5092e270803803258f2 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 23 Jan 2023 16:53:34 +0000 Subject: [PATCH 178/387] Set parameters --- jest-testcontainers-config.js | 5 ++++- packages/server/src/tests/jestSetup.ts | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/jest-testcontainers-config.js b/jest-testcontainers-config.js index 6bf29db9bd..8417b9b845 100644 --- a/jest-testcontainers-config.js +++ b/jest-testcontainers-config.js @@ -3,7 +3,10 @@ module.exports = { image: "budibase/dependencies", tag: "latest", ports: [6379, 5984, 9000], - env: {}, + env: { + COUCHDB_USER: "test_couchdb_user", + COUCHDB_PASSWORD: "test_couchdb_password", + }, wait: { type: "text", text: "Test environment started...", diff --git a/packages/server/src/tests/jestSetup.ts b/packages/server/src/tests/jestSetup.ts index ae229ddd7d..47d277ef3b 100644 --- a/packages/server/src/tests/jestSetup.ts +++ b/packages/server/src/tests/jestSetup.ts @@ -34,5 +34,5 @@ overrideConfigValue( `http://localhost:${global.__TESTCONTAINERS_DEVENV_PORT_9000__}` ) -overrideConfigValue("COUCH_DB_USERNAME", "admin") -overrideConfigValue("COUCH_DB_PASSWORD", "admin") +overrideConfigValue("COUCH_DB_USERNAME", "test_couchdb_user") +overrideConfigValue("COUCH_DB_PASSWORD", "test_couchdb_password") From 496a984215737242f7558fb98f48e096f3929b25 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 23 Jan 2023 16:56:43 +0000 Subject: [PATCH 179/387] v2.2.12-alpha.34 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 6 +++--- packages/builder/package.json | 14 +++++++------- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 35 insertions(+), 35 deletions(-) diff --git a/lerna.json b/lerna.json index 74eaa3e18a..7c81df52ba 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 30fd97c124..f0bcbd54cb 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.33", + "@budibase/types": "2.2.12-alpha.34", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index cea1075963..ed4f9a93b7 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,8 +38,8 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", + "@budibase/string-templates": "2.2.12-alpha.34", "@spectrum-css/accordion": "3.0.24", - "@budibase/string-templates": "2.2.12-alpha.33", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", "@spectrum-css/avatar": "3.0.2", @@ -90,4 +90,4 @@ "loader-utils": "1.4.1" }, "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc" -} \ No newline at end of file +} diff --git a/packages/builder/package.json b/packages/builder/package.json index 38f18cea0e..69c0c1dc3c 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,14 +71,14 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.33", - "@budibase/client": "2.2.12-alpha.33", - "@budibase/frontend-core": "2.2.12-alpha.33", - "@budibase/string-templates": "2.2.12-alpha.33", + "@budibase/bbui": "2.2.12-alpha.34", + "@budibase/client": "2.2.12-alpha.34", + "@budibase/frontend-core": "2.2.12-alpha.34", + "@budibase/string-templates": "2.2.12-alpha.34", "@sentry/browser": "5.19.1", + "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", "@spectrum-css/vars": "^3.0.1", - "@spectrum-css/accordion": "^3.0.24", "codemirror": "^5.59.0", "dayjs": "^1.11.2", "downloadjs": "1.4.7", @@ -124,4 +124,4 @@ "vite": "^3.0.8" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" -} \ No newline at end of file +} diff --git a/packages/cli/package.json b/packages/cli/package.json index d4ebbeaee1..46064d7a52 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.33", - "@budibase/string-templates": "2.2.12-alpha.33", - "@budibase/types": "2.2.12-alpha.33", + "@budibase/backend-core": "2.2.12-alpha.34", + "@budibase/string-templates": "2.2.12-alpha.34", + "@budibase/types": "2.2.12-alpha.34", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 19ca5d6b69..f1b384e3a6 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.33", - "@budibase/frontend-core": "2.2.12-alpha.33", - "@budibase/string-templates": "2.2.12-alpha.33", + "@budibase/bbui": "2.2.12-alpha.34", + "@budibase/frontend-core": "2.2.12-alpha.34", + "@budibase/string-templates": "2.2.12-alpha.34", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 48987c620b..a612ab26b3 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.33", + "@budibase/bbui": "2.2.12-alpha.34", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 26699b8bb1..0a1c37690e 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 02b805d97a..2761abbaa6 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.33", - "@budibase/client": "2.2.12-alpha.33", + "@budibase/backend-core": "2.2.12-alpha.34", + "@budibase/client": "2.2.12-alpha.34", "@budibase/pro": "2.2.12-alpha.33", - "@budibase/string-templates": "2.2.12-alpha.33", - "@budibase/types": "2.2.12-alpha.33", + "@budibase/string-templates": "2.2.12-alpha.34", + "@budibase/types": "2.2.12-alpha.34", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 89350c4ba3..e0d2f109e2 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 95ed13050b..657430c8bf 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index bf62d79396..d12b8c884b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.33", + "version": "2.2.12-alpha.34", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.33", + "@budibase/backend-core": "2.2.12-alpha.34", "@budibase/pro": "2.2.12-alpha.33", - "@budibase/string-templates": "2.2.12-alpha.33", - "@budibase/types": "2.2.12-alpha.33", + "@budibase/string-templates": "2.2.12-alpha.34", + "@budibase/types": "2.2.12-alpha.34", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 7ef9b6c3571f29673a572fa364c936a64d04a93a Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 23 Jan 2023 17:00:29 +0000 Subject: [PATCH 180/387] Update pro version to 2.2.12-alpha.34 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 2761abbaa6..4440c6bd68 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.34", "@budibase/client": "2.2.12-alpha.34", - "@budibase/pro": "2.2.12-alpha.33", + "@budibase/pro": "2.2.12-alpha.34", "@budibase/string-templates": "2.2.12-alpha.34", "@budibase/types": "2.2.12-alpha.34", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 8da4fe0f19..4d6ab08f2c 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.33": - version "2.2.12-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.33.tgz#c89c23b215b21ad2a5f9dff0a19d9902ce80b9ac" - integrity sha512-jDYFAw/m4sLSNGydFX9WUBcFW3+E4wRfFWU67oz4G2lqzIfVKy4MAVZdZaex1fomSJspEuH1v0b+PEB5MpUiyg== +"@budibase/backend-core@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.34.tgz#0e2042ab8b2e52bf04c672283a50e153a3157e88" + integrity sha512-cViRaNxmi3RmAOZpBlRtFEj7l6umJjgB1k8B3J6KArvdxezZmV0smQrpX4colDLJhRfm1O5vQm6oigxGgZRpXg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.33" + "@budibase/types" "2.2.12-alpha.34" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.33": - version "2.2.12-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.33.tgz#e6e1c8de90a8fe25c7ea954230ba6106e7f65760" - integrity sha512-eXU1AJVYpV6Ca4t8d/5MpUvP508grVAcL5m+3qxnAXaP9nQkbxL1vvPD2etYJB6y2rR5vxxb+LZRHGQD1jnxzw== +"@budibase/pro@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.34.tgz#7978fc6b8590990fc262a861e94b5d6f11488e3e" + integrity sha512-A/GYLM/yGQMqPmli+hkOFVyc6gv+BwdnClb2Ajyak72zoyRU4pMrcI5TSGevuYEiBXbebZjOZS8TAxZNYO04Zw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.33" - "@budibase/types" "2.2.12-alpha.33" + "@budibase/backend-core" "2.2.12-alpha.34" + "@budibase/types" "2.2.12-alpha.34" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1405,10 +1405,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.33": - version "2.2.12-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.33.tgz#89f8d407ef3f9484563ebf2b10515d70433614f5" - integrity sha512-crvFyeBkpw9q0C0bqDCgdvOR/e5QIia+AHNfIgW17zLaZChtTv4vNGJ3wuMy2GE6AOUx9D98tNK6lI7oJemAWA== +"@budibase/types@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.34.tgz#1f1b9993221f4f43cb300d08870a5a81736d4bd1" + integrity sha512-SWjZDUi6e2KBVPVW3ErjGSsr86/mpNrYurWyv9QVbk0leNI6K1Zlokk6CsDaHatcrRTPVdNxQBfgYzsp8gWaCQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index d12b8c884b..4f86e6d0e3 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.34", - "@budibase/pro": "2.2.12-alpha.33", + "@budibase/pro": "2.2.12-alpha.34", "@budibase/string-templates": "2.2.12-alpha.34", "@budibase/types": "2.2.12-alpha.34", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index caa21ca3fb..3e85190c9b 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.33": - version "2.2.12-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.33.tgz#c89c23b215b21ad2a5f9dff0a19d9902ce80b9ac" - integrity sha512-jDYFAw/m4sLSNGydFX9WUBcFW3+E4wRfFWU67oz4G2lqzIfVKy4MAVZdZaex1fomSJspEuH1v0b+PEB5MpUiyg== +"@budibase/backend-core@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.34.tgz#0e2042ab8b2e52bf04c672283a50e153a3157e88" + integrity sha512-cViRaNxmi3RmAOZpBlRtFEj7l6umJjgB1k8B3J6KArvdxezZmV0smQrpX4colDLJhRfm1O5vQm6oigxGgZRpXg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.33" + "@budibase/types" "2.2.12-alpha.34" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,23 +521,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.33": - version "2.2.12-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.33.tgz#e6e1c8de90a8fe25c7ea954230ba6106e7f65760" - integrity sha512-eXU1AJVYpV6Ca4t8d/5MpUvP508grVAcL5m+3qxnAXaP9nQkbxL1vvPD2etYJB6y2rR5vxxb+LZRHGQD1jnxzw== +"@budibase/pro@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.34.tgz#7978fc6b8590990fc262a861e94b5d6f11488e3e" + integrity sha512-A/GYLM/yGQMqPmli+hkOFVyc6gv+BwdnClb2Ajyak72zoyRU4pMrcI5TSGevuYEiBXbebZjOZS8TAxZNYO04Zw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.33" - "@budibase/types" "2.2.12-alpha.33" + "@budibase/backend-core" "2.2.12-alpha.34" + "@budibase/types" "2.2.12-alpha.34" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.33": - version "2.2.12-alpha.33" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.33.tgz#89f8d407ef3f9484563ebf2b10515d70433614f5" - integrity sha512-crvFyeBkpw9q0C0bqDCgdvOR/e5QIia+AHNfIgW17zLaZChtTv4vNGJ3wuMy2GE6AOUx9D98tNK6lI7oJemAWA== +"@budibase/types@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.34.tgz#1f1b9993221f4f43cb300d08870a5a81736d4bd1" + integrity sha512-SWjZDUi6e2KBVPVW3ErjGSsr86/mpNrYurWyv9QVbk0leNI6K1Zlokk6CsDaHatcrRTPVdNxQBfgYzsp8gWaCQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From d6f0e5b1ec44fdac7424472a526f920fb19cb6de Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 23 Jan 2023 17:41:32 +0000 Subject: [PATCH 181/387] Dry, moving env variables to a .env.test file --- ...js => jestTestcontainersConfigGenerator.js | 9 +++------ package.json | 2 +- packages/server/.env.test | 3 +++ packages/server/jest-testcontainers-config.js | 9 ++++++++- packages/server/src/environment.ts | 19 ++++++++++++++----- packages/server/src/tests/jestSetup.ts | 7 ++----- 6 files changed, 31 insertions(+), 18 deletions(-) rename jest-testcontainers-config.js => jestTestcontainersConfigGenerator.js (58%) create mode 100644 packages/server/.env.test diff --git a/jest-testcontainers-config.js b/jestTestcontainersConfigGenerator.js similarity index 58% rename from jest-testcontainers-config.js rename to jestTestcontainersConfigGenerator.js index 8417b9b845..6e01efea32 100644 --- a/jest-testcontainers-config.js +++ b/jestTestcontainersConfigGenerator.js @@ -1,15 +1,12 @@ -module.exports = { +module.exports = env => ({ devEnv: { image: "budibase/dependencies", tag: "latest", ports: [6379, 5984, 9000], - env: { - COUCHDB_USER: "test_couchdb_user", - COUCHDB_PASSWORD: "test_couchdb_password", - }, + env, wait: { type: "text", text: "Test environment started...", }, }, -} +}) diff --git a/package.json b/package.json index 724e5f37fc..53d60249f7 100644 --- a/package.json +++ b/package.json @@ -87,4 +87,4 @@ "install:pro": "bash scripts/pro/install.sh", "dep:clean": "yarn clean && yarn bootstrap" } -} \ No newline at end of file +} diff --git a/packages/server/.env.test b/packages/server/.env.test new file mode 100644 index 0000000000..b7c736b15d --- /dev/null +++ b/packages/server/.env.test @@ -0,0 +1,3 @@ +JWT_SECRET=testsecret +COUCH_DB_PASSWORD=test_couchdb_user +COUCH_DB_USER=test_couchdb_password \ No newline at end of file diff --git a/packages/server/jest-testcontainers-config.js b/packages/server/jest-testcontainers-config.js index 50940cb76d..30ed1503d8 100644 --- a/packages/server/jest-testcontainers-config.js +++ b/packages/server/jest-testcontainers-config.js @@ -1 +1,8 @@ -module.exports = require("../../jest-testcontainers-config") +const { join } = require("path") +const { parsed: env } = require("dotenv").config({ + path: join(__dirname, ".env.test"), +}) + +const jestTestcontainersConfigGenerator = require("../../jestTestcontainersConfigGenerator") + +module.exports = jestTestcontainersConfigGenerator(env) diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts index 6272e0e462..b87be6b12f 100644 --- a/packages/server/src/environment.ts +++ b/packages/server/src/environment.ts @@ -21,11 +21,20 @@ function isCypress() { } let LOADED = false -if (!LOADED && isDev() && !isTest()) { - require("dotenv").config({ - path: join(__dirname, "..", ".env"), - }) - LOADED = true +if (!LOADED) { + if (isDev() && !isTest()) { + require("dotenv").config({ + path: join(__dirname, "..", ".env"), + }) + LOADED = true + } + // TODO: remove when all tests (cypress, e2e, unit, etc) use docker for testing dependencies + else if (isJest()) { + require("dotenv").config({ + path: join(__dirname, "..", ".env.test"), + }) + LOADED = true + } } function parseIntSafe(number?: string) { diff --git a/packages/server/src/tests/jestSetup.ts b/packages/server/src/tests/jestSetup.ts index 47d277ef3b..05aefef8df 100644 --- a/packages/server/src/tests/jestSetup.ts +++ b/packages/server/src/tests/jestSetup.ts @@ -26,13 +26,10 @@ function overrideConfigValue(key: string, value: string) { overrideConfigValue("COUCH_DB_PORT", global.__TESTCONTAINERS_DEVENV_PORT_5984__) overrideConfigValue( "COUCH_DB_URL", - `http://localhost:${global.__TESTCONTAINERS_DEVENV_PORT_5984__}` + `http://${global.__TESTCONTAINERS_DEVENV_IP__}:${global.__TESTCONTAINERS_DEVENV_PORT_5984__}` ) overrideConfigValue( "MINIO_URL", - `http://localhost:${global.__TESTCONTAINERS_DEVENV_PORT_9000__}` + `http://${global.__TESTCONTAINERS_DEVENV_IP__}:${global.__TESTCONTAINERS_DEVENV_PORT_9000__}` ) - -overrideConfigValue("COUCH_DB_USERNAME", "test_couchdb_user") -overrideConfigValue("COUCH_DB_PASSWORD", "test_couchdb_password") From d1d8ce36110f13f719de3233a079c1d1278e7e4f Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 23 Jan 2023 18:02:28 +0000 Subject: [PATCH 182/387] Move more stuff to .env.test --- packages/server/.env.test | 8 ++++++-- packages/server/src/environment.ts | 19 +++++-------------- packages/server/src/tests/jestEnv.ts | 4 ---- packages/server/src/tests/jestSetup.ts | 11 ++++++++--- 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/packages/server/.env.test b/packages/server/.env.test index b7c736b15d..07f6afa889 100644 --- a/packages/server/.env.test +++ b/packages/server/.env.test @@ -1,3 +1,7 @@ JWT_SECRET=testsecret -COUCH_DB_PASSWORD=test_couchdb_user -COUCH_DB_USER=test_couchdb_password \ No newline at end of file +COUCHDB_USER=test_couchdb_user +COUCH_DB_USER=test_couchdb_user +COUCHDB_PASSWORD=test_couchdb_password +COUCH_DB_PASSWORD=test_couchdb_password +MINIO_ACCESS_KEY=budibase +MINIO_SECRET_KEY=budibase \ No newline at end of file diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts index b87be6b12f..6272e0e462 100644 --- a/packages/server/src/environment.ts +++ b/packages/server/src/environment.ts @@ -21,20 +21,11 @@ function isCypress() { } let LOADED = false -if (!LOADED) { - if (isDev() && !isTest()) { - require("dotenv").config({ - path: join(__dirname, "..", ".env"), - }) - LOADED = true - } - // TODO: remove when all tests (cypress, e2e, unit, etc) use docker for testing dependencies - else if (isJest()) { - require("dotenv").config({ - path: join(__dirname, "..", ".env.test"), - }) - LOADED = true - } +if (!LOADED && isDev() && !isTest()) { + require("dotenv").config({ + path: join(__dirname, "..", ".env"), + }) + LOADED = true } function parseIntSafe(number?: string) { diff --git a/packages/server/src/tests/jestEnv.ts b/packages/server/src/tests/jestEnv.ts index 38b74afdce..26f73e3119 100644 --- a/packages/server/src/tests/jestEnv.ts +++ b/packages/server/src/tests/jestEnv.ts @@ -1,10 +1,8 @@ import env from "../environment" -import { env as coreEnv } from "@budibase/backend-core" import { tmpdir } from "os" env._set("SELF_HOSTED", "1") env._set("NODE_ENV", "jest") -env._set("JWT_SECRET", "test-jwtsecret") env._set("CLIENT_ID", "test-client-id") // @ts-ignore env._set("BUDIBASE_DIR", tmpdir("budibase-unittests")) @@ -13,5 +11,3 @@ env._set("PORT", 0) env._set("MINIO_URL", "http://localhost") env._set("MINIO_ACCESS_KEY", "test") env._set("MINIO_SECRET_KEY", "test") -coreEnv._set("COUCH_DB_USER", "budibase") -coreEnv._set("COUCH_DB_PASSWORD", "budibase") diff --git a/packages/server/src/tests/jestSetup.ts b/packages/server/src/tests/jestSetup.ts index 05aefef8df..8ca0667fc3 100644 --- a/packages/server/src/tests/jestSetup.ts +++ b/packages/server/src/tests/jestSetup.ts @@ -23,13 +23,18 @@ function overrideConfigValue(key: string, value: string) { coreEnv._set(key, value) } -overrideConfigValue("COUCH_DB_PORT", global.__TESTCONTAINERS_DEVENV_PORT_5984__) +const globalSafe = global as any + +overrideConfigValue( + "COUCH_DB_PORT", + globalSafe.__TESTCONTAINERS_DEVENV_PORT_5984__ +) overrideConfigValue( "COUCH_DB_URL", - `http://${global.__TESTCONTAINERS_DEVENV_IP__}:${global.__TESTCONTAINERS_DEVENV_PORT_5984__}` + `http://${globalSafe.__TESTCONTAINERS_DEVENV_IP__}:${globalSafe.__TESTCONTAINERS_DEVENV_PORT_5984__}` ) overrideConfigValue( "MINIO_URL", - `http://${global.__TESTCONTAINERS_DEVENV_IP__}:${global.__TESTCONTAINERS_DEVENV_PORT_9000__}` + `http://${globalSafe.__TESTCONTAINERS_DEVENV_IP__}:${globalSafe.__TESTCONTAINERS_DEVENV_PORT_9000__}` ) From bdacb34c7a8da2ba2e5e5b57cd5a9dd6a869c457 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 23 Jan 2023 18:04:25 +0000 Subject: [PATCH 183/387] Remove config.moduleNameMapper --- packages/backend-core/jest.config.ts | 10 ---------- packages/server/jest.config.ts | 17 ----------------- packages/worker/jest.config.ts | 19 ------------------- 3 files changed, 46 deletions(-) diff --git a/packages/backend-core/jest.config.ts b/packages/backend-core/jest.config.ts index b33e48d695..059d3d2a43 100644 --- a/packages/backend-core/jest.config.ts +++ b/packages/backend-core/jest.config.ts @@ -13,14 +13,4 @@ const config: Config.InitialOptions = { }, } -if (!process.env.CI) { - // use sources when not in CI - config.moduleNameMapper = { - "@budibase/types": "/../types/src", - "^axios.*$": "/node_modules/axios/lib/axios.js", - } -} else { - console.log("Running tests with compiled dependency sources") -} - export default config diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index 4997300953..c261d109c9 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -18,21 +18,4 @@ const config: Config.InitialOptions = { }, } -if (!process.env.CI) { - // use sources when not in CI - config.moduleNameMapper = { - "@budibase/backend-core/(.*)": "/../backend-core/$1", - "@budibase/backend-core": "/../backend-core/src", - "@budibase/types": "/../types/src", - "^axios.*$": "/node_modules/axios/lib/axios.js", - } - // add pro sources if they exist - if (fs.existsSync("../../../budibase-pro")) { - config.moduleNameMapper["@budibase/pro"] = - "/../../../budibase-pro/packages/pro/src" - } -} else { - console.log("Running tests with compiled dependency sources") -} - export default config diff --git a/packages/worker/jest.config.ts b/packages/worker/jest.config.ts index a7913aae2a..0d06446862 100644 --- a/packages/worker/jest.config.ts +++ b/packages/worker/jest.config.ts @@ -15,23 +15,4 @@ const config: Config.InitialOptions = { }, } -if (!process.env.CI) { - // use sources when not in CI - config.moduleNameMapper = { - "@budibase/backend-core/(.*)": "/../backend-core/$1", - "@budibase/backend-core": "/../backend-core/src", - "@budibase/types": "/../types/src", - "^axios.*$": "/node_modules/axios/lib/axios.js", - } - // add pro sources if they exist - if (fs.existsSync("../../../budibase-pro")) { - config.moduleNameMapper["@budibase/pro/(.*)"] = - "/../../../budibase-pro/packages/pro/$1" - config.moduleNameMapper["@budibase/pro"] = - "/../../../budibase-pro/packages/pro/src" - } -} else { - console.log("Running tests with compiled dependency sources") -} - export default config From 5a2937c8d2e893fa176edbc3062807b556d8c656 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 23 Jan 2023 18:18:06 +0000 Subject: [PATCH 184/387] Adding events for environment variables (created, deleted, upgrade panel opened). --- .../events/publishers/environmentVariable.ts | 38 +++++++++++++++++++ .../src/events/publishers/index.ts | 1 + .../src/sdk/events/environmentVariable.ts | 14 +++++++ packages/types/src/sdk/events/event.ts | 5 +++ packages/types/src/sdk/events/index.ts | 1 + 5 files changed, 59 insertions(+) create mode 100644 packages/backend-core/src/events/publishers/environmentVariable.ts create mode 100644 packages/types/src/sdk/events/environmentVariable.ts diff --git a/packages/backend-core/src/events/publishers/environmentVariable.ts b/packages/backend-core/src/events/publishers/environmentVariable.ts new file mode 100644 index 0000000000..d28e259b82 --- /dev/null +++ b/packages/backend-core/src/events/publishers/environmentVariable.ts @@ -0,0 +1,38 @@ +import { + Event, + EnvironmentVariableCreatedEvent, + EnvironmentVariableDeletedEvent, + EnvironmentVariableUpgradePanelOpenedEvent, +} from "@budibase/types" +import { publishEvent } from "../events" + +async function created(name: string, environments: string[]) { + const properties: EnvironmentVariableCreatedEvent = { + name, + environments, + } + await publishEvent(Event.ENVIRONMENT_VARIABLE_CREATED, properties) +} + +async function deleted(name: string) { + const properties: EnvironmentVariableDeletedEvent = { + name, + } + await publishEvent(Event.ENVIRONMENT_VARIABLE_DELETED, properties) +} + +async function upgradePanelOpened(userId: string) { + const properties: EnvironmentVariableUpgradePanelOpenedEvent = { + userId, + } + await publishEvent( + Event.ENVIRONMENT_VARIABLE_UPGRADE_PANEL_OPENED, + properties + ) +} + +export default { + created, + deleted, + upgradePanelOpened, +} diff --git a/packages/backend-core/src/events/publishers/index.ts b/packages/backend-core/src/events/publishers/index.ts index 2316785ed7..34e47b2990 100644 --- a/packages/backend-core/src/events/publishers/index.ts +++ b/packages/backend-core/src/events/publishers/index.ts @@ -20,3 +20,4 @@ export { default as backfill } from "./backfill" export { default as group } from "./group" export { default as plugin } from "./plugin" export { default as backup } from "./backup" +export { default as environmentVariable } from "./environmentVariable" diff --git a/packages/types/src/sdk/events/environmentVariable.ts b/packages/types/src/sdk/events/environmentVariable.ts new file mode 100644 index 0000000000..0b81d78df8 --- /dev/null +++ b/packages/types/src/sdk/events/environmentVariable.ts @@ -0,0 +1,14 @@ +import { BaseEvent } from "./event" + +export interface EnvironmentVariableCreatedEvent extends BaseEvent { + name: string + environments: string[] +} + +export interface EnvironmentVariableDeletedEvent extends BaseEvent { + name: string +} + +export interface EnvironmentVariableUpgradePanelOpenedEvent extends BaseEvent { + userId: string +} diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts index 2c197e7738..5d1f30883c 100644 --- a/packages/types/src/sdk/events/event.ts +++ b/packages/types/src/sdk/events/event.ts @@ -172,6 +172,11 @@ export enum Event { // BACKUP APP_BACKUP_RESTORED = "app:backup:restored", APP_BACKUP_TRIGGERED = "app:backup:triggered", + + // ENVIRONMENT VARIABLE + ENVIRONMENT_VARIABLE_CREATED = "environment_variable:created", + ENVIRONMENT_VARIABLE_DELETED = "environment_variable:deleted", + ENVIRONMENT_VARIABLE_UPGRADE_PANEL_OPENED = "environment_variable:upgrade_panel_opened", } // properties added at the final stage of the event pipeline diff --git a/packages/types/src/sdk/events/index.ts b/packages/types/src/sdk/events/index.ts index 5abc30f5b9..009d9beac4 100644 --- a/packages/types/src/sdk/events/index.ts +++ b/packages/types/src/sdk/events/index.ts @@ -21,3 +21,4 @@ export * from "./identification" export * from "./userGroup" export * from "./plugin" export * from "./backup" +export * from "./environmentVariable" From 422d4e92cc62b75bba82dbbf80dcfaf96d115aa8 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Mon, 23 Jan 2023 18:23:11 +0000 Subject: [PATCH 185/387] Yarn bootstrap --- packages/backend-core/yarn.lock | 270 +++++++++++++++++++++++++++++++- packages/worker/yarn.lock | 40 +++-- 2 files changed, 287 insertions(+), 23 deletions(-) diff --git a/packages/backend-core/yarn.lock b/packages/backend-core/yarn.lock index 235fb89750..d07a95d5f8 100644 --- a/packages/backend-core/yarn.lock +++ b/packages/backend-core/yarn.lock @@ -1204,6 +1204,15 @@ dependencies: "@types/koa" "*" +"@types/koa-pino-logger@3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/koa-pino-logger/-/koa-pino-logger-3.0.0.tgz#275d4b000abc14b1928dc2e9ab476c8296a64b6a" + integrity sha512-sP+12JNX01q+nHpCRqkVIuLjaRemQEfDoFg0evpTnjUEI3jUI2ZrOkhQ5coxn3yVm2tedui/2YhlaPn/XrYNWA== + dependencies: + "@types/koa" "*" + "@types/pino" "*" + "@types/pino-http" "*" + "@types/koa@*", "@types/koa@2.13.4": version "2.13.4" resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.4.tgz#10620b3f24a8027ef5cbae88b393d1b31205726b" @@ -1251,6 +1260,44 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.20.tgz#268f028b36eaf51181c3300252f605488c4f0650" integrity sha512-Q8KKwm9YqEmUBRsqJ2GWJDtXltBDxTdC4m5vTdXBolu2PeQh8LX+f6BTwU+OuXPu37fLxoN6gidqBmnky36FXA== +"@types/pino-http@*", "@types/pino-http@5.8.1": + version "5.8.1" + resolved "https://registry.yarnpkg.com/@types/pino-http/-/pino-http-5.8.1.tgz#ebb194750ad2f9245c3028b5d2c4e6d64f685ba9" + integrity sha512-A9MW6VCnx5ii7s+Fs5aFIw+aSZcBCpsZ/atpxamu8tTsvWFacxSf2Hrn1Ohn1jkVRB/LiPGOapRXcFawDBnDnA== + dependencies: + "@types/pino" "6.3" + +"@types/pino-pretty@*": + version "5.0.0" + resolved "https://registry.yarnpkg.com/@types/pino-pretty/-/pino-pretty-5.0.0.tgz#aa7a61cfd553b051764acfa0a49872f7a09a1722" + integrity sha512-N1uzqSzioqz8R3AkDbSJwcfDWeI3YMPNapSQQhnB2ISU4NYgUIcAh+hYT5ygqBM+klX4htpEhXMmoJv3J7GrdA== + dependencies: + pino-pretty "*" + +"@types/pino-std-serializers@*": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@types/pino-std-serializers/-/pino-std-serializers-4.0.0.tgz#1e28b80b554c8222858e99a4e0fc77fd070e10e8" + integrity sha512-gXfUZx2xIBbFYozGms53fT0nvkacx/+62c8iTxrEqH5PkIGAQvDbXg2774VWOycMPbqn5YJBQ3BMsg4Li3dWbg== + dependencies: + pino-std-serializers "*" + +"@types/pino@*": + version "7.0.5" + resolved "https://registry.yarnpkg.com/@types/pino/-/pino-7.0.5.tgz#1c84a81b924a6a9e263dbb581dffdbad7a3c60c4" + integrity sha512-wKoab31pknvILkxAF8ss+v9iNyhw5Iu/0jLtRkUD74cNfOOLJNnqfFKAv0r7wVaTQxRZtWrMpGfShwwBjOcgcg== + dependencies: + pino "*" + +"@types/pino@6.3": + version "6.3.12" + resolved "https://registry.yarnpkg.com/@types/pino/-/pino-6.3.12.tgz#4425db6ced806109c3df957100cba9dfcd73c228" + integrity sha512-dsLRTq8/4UtVSpJgl9aeqHvbh6pzdmjYD3C092SYgLD2TyoCqHpTJk6vp8DvCTGGc7iowZ2MoiYiVUUCcu7muw== + dependencies: + "@types/node" "*" + "@types/pino-pretty" "*" + "@types/pino-std-serializers" "*" + sonic-boom "^2.1.0" + "@types/pouchdb-adapter-cordova-sqlite@*": version "1.0.1" resolved "https://registry.yarnpkg.com/@types/pouchdb-adapter-cordova-sqlite/-/pouchdb-adapter-cordova-sqlite-1.0.1.tgz#49e5ee6df7cc0c23196fcb340f43a560e74eb1d6" @@ -1494,7 +1541,7 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -abort-controller@3.0.0: +abort-controller@3.0.0, abort-controller@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== @@ -1663,6 +1710,11 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== +atomic-sleep@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" + integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== + aws-cloudfront-sign@2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/aws-cloudfront-sign/-/aws-cloudfront-sign-2.2.0.tgz#3910f5a6d0d90fec07f2b4ef8ab07f3eefb5625d" @@ -1855,6 +1907,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -1929,6 +1988,14 @@ buffer@^5.5.0, buffer@^5.6.0: base64-js "^1.3.1" ieee754 "^1.1.13" +buffer@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6" + integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.2.1" + buildcheck@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.3.tgz#70451897a95d80f7807e68fc412eb2e7e35ff4d5" @@ -2030,10 +2097,10 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chance@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.3.tgz#414f08634ee479c7a316b569050ea20751b82dd3" - integrity sha512-XeJsdoVAzDb1WRPRuMBesRSiWpW1uNTo5Fd7mYxPJsAfgX71+jfuCOHOdbyBz2uAUZ8TwKcXgWk3DMedFfJkbg== +chance@1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.8.tgz#5d6c2b78c9170bf6eb9df7acdda04363085be909" + integrity sha512-v7fi5Hj2VbR6dJEGRWLmJBA83LJMS47pkAbmROFxHWd9qmE1esHRZW8Clf1Fhzr3rjxnNZVCjOEv/ivFxeIMtg== char-regex@^1.0.2: version "1.0.2" @@ -2155,6 +2222,11 @@ color-support@^1.1.2: resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== +colorette@^2.0.7: + version "2.0.19" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" + integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== + combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -2226,6 +2298,13 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== +correlation-id@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/correlation-id/-/correlation-id-4.0.0.tgz#c1d3038e5f30d7bfeae5728ff96f27a7506bc2c0" + integrity sha512-WvXtJBlovvOBKqTz/YwWP2gm6CXJZJArfGimp9s/ehmhJMPFbmnPMQe3K60Q9idGNixMvKojMjleyDhZEFdHfg== + dependencies: + uuid "^8.3.1" + cpu-features@~0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.4.tgz#0023475bb4f4c525869c162e4108099e35bf19d8" @@ -2280,6 +2359,11 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" +dateformat@^4.6.3: + version "4.6.3" + resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" + integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== + debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -2572,6 +2656,11 @@ events@1.1.1: resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" integrity sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw== +events@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + execa@^5.0.0: version "5.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" @@ -2625,6 +2714,11 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== +fast-copy@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/fast-copy/-/fast-copy-3.0.0.tgz#875ebf33b13948ae012b6e51d33da5e6e7571ab8" + integrity sha512-4HzS+9pQ5Yxtv13Lhs1Z1unMXamBdn5nA4bEi1abYpDNSpSp7ODYQ1KPMF6nTatfEzgH6/zPvXKU1zvHiUjWlA== + fast-deep-equal@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -2635,6 +2729,16 @@ fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== +fast-redact@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.1.2.tgz#d58e69e9084ce9fa4c1a6fa98a3e1ecf5d7839aa" + integrity sha512-+0em+Iya9fKGfEQGcd62Yv6onjBmmhV1uh86XVfOU8VwAe6kaFdQCWI9s0/Nnugx5Vd9tdbZ7e6gE2tR9dzXdw== + +fast-safe-stringify@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" + integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== + fb-watchman@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" @@ -2873,6 +2977,17 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + global-dirs@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" @@ -2977,6 +3092,14 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" +help-me@^4.0.1: + version "4.2.0" + resolved "https://registry.yarnpkg.com/help-me/-/help-me-4.2.0.tgz#50712bfd799ff1854ae1d312c36eafcea85b0563" + integrity sha512-TAOnTB8Tz5Dw8penUuzHVrKNKlCIbwwbHnXraNJxPwf8LRtE2HlM84RYuezMFcwOJmoYOCWVDyJ8TQGxn9PgxA== + dependencies: + glob "^8.0.0" + readable-stream "^3.6.0" + homedir-polyfill@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" @@ -3047,7 +3170,7 @@ ieee754@1.1.13: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== -ieee754@^1.1.13, ieee754@^1.1.4: +ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== @@ -3731,6 +3854,11 @@ join-component@^1.1.0: resolved "https://registry.yarnpkg.com/join-component/-/join-component-1.1.0.tgz#b8417b750661a392bee2c2537c68b2a9d4977cd5" integrity sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ== +joycon@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03" + integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw== + js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -4229,6 +4357,13 @@ minimatch@^3.0.4, minimatch@^3.1.1: dependencies: brace-expansion "^1.1.7" +minimatch@^5.0.1: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + minimist@^1.2.0: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" @@ -4470,6 +4605,11 @@ object-inspect@^1.9.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== +on-exit-leak-free@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-2.1.0.tgz#5c703c968f7e7f851885f6459bf8a8a57edc9cc4" + integrity sha512-VuCaZZAjReZ3vUwgOB8LxAosIurDiAW0s13rI1YwmaP++jvcxP77AWoQvenZebpCA2m8WC1/EosPYPMjnRAp/w== + on-finished@^2.3.0: version "2.4.1" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" @@ -4699,6 +4839,56 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +pino-abstract-transport@^1.0.0, pino-abstract-transport@v1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.0.0.tgz#cc0d6955fffcadb91b7b49ef220a6cc111d48bb3" + integrity sha512-c7vo5OpW4wIS42hUVcT5REsL8ZljsUfBjqV/e2sFxmFEFZiq1XLUp5EYLtuDH6PEHq9W1egWqRbnLUP5FuZmOA== + dependencies: + readable-stream "^4.0.0" + split2 "^4.0.0" + +pino-pretty@*: + version "9.1.1" + resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-9.1.1.tgz#e7d64c1db98266ca428ab56567b844ba780cd0e1" + integrity sha512-iJrnjgR4FWQIXZkUF48oNgoRI9BpyMhaEmihonHeCnZ6F50ZHAS4YGfGBT/ZVNsPmd+hzkIPGzjKdY08+/yAXw== + dependencies: + colorette "^2.0.7" + dateformat "^4.6.3" + fast-copy "^3.0.0" + fast-safe-stringify "^2.1.1" + help-me "^4.0.1" + joycon "^3.1.1" + minimist "^1.2.6" + on-exit-leak-free "^2.1.0" + pino-abstract-transport "^1.0.0" + pump "^3.0.0" + readable-stream "^4.0.0" + secure-json-parse "^2.4.0" + sonic-boom "^3.0.0" + strip-json-comments "^3.1.1" + +pino-std-serializers@*, pino-std-serializers@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-6.1.0.tgz#307490fd426eefc95e06067e85d8558603e8e844" + integrity sha512-KO0m2f1HkrPe9S0ldjx7za9BJjeHqBku5Ch8JyxETxT8dEFGz1PwgrHaOQupVYitpzbFSYm7nnljxD8dik2c+g== + +pino@*: + version "8.8.0" + resolved "https://registry.yarnpkg.com/pino/-/pino-8.8.0.tgz#1f0d6695a224aa06afc7ad60f2ccc4772d3b9233" + integrity sha512-cF8iGYeu2ODg2gIwgAHcPrtR63ILJz3f7gkogaHC/TXVVXxZgInmNYiIpDYEwgEkxZti2Se6P2W2DxlBIZe6eQ== + dependencies: + atomic-sleep "^1.0.0" + fast-redact "^3.1.1" + on-exit-leak-free "^2.1.0" + pino-abstract-transport v1.0.0 + pino-std-serializers "^6.0.0" + process-warning "^2.0.0" + quick-format-unescaped "^4.0.3" + real-require "^0.2.0" + safe-stable-stringify "^2.3.1" + sonic-boom "^3.1.0" + thread-stream "^2.0.0" + pirates@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" @@ -4961,6 +5151,16 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +process-warning@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-2.1.0.tgz#1e60e3bfe8183033bbc1e702c2da74f099422d1a" + integrity sha512-9C20RLxrZU/rFnxWncDkuF6O999NdIf3E1ws4B0ZeY3sRVPzWBMsYDE2lxjxhiXxg464cQTgKUGm8/i6y2YGXg== + +process@^0.11.10: + version "0.11.10" + resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" + integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== + prompts@^2.0.1: version "2.4.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" @@ -5036,6 +5236,11 @@ querystringify@^2.1.1: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== +quick-format-unescaped@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7" + integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg== + range-parser@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" @@ -5080,6 +5285,16 @@ readable-stream@1.1.14, readable-stream@^1.0.27-1: string_decoder "^1.1.1" util-deprecate "^1.0.1" +readable-stream@^4.0.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.3.0.tgz#0914d0c72db03b316c9733bb3461d64a3cc50cba" + integrity sha512-MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ== + dependencies: + abort-controller "^3.0.0" + buffer "^6.0.3" + events "^3.3.0" + process "^0.11.10" + readable-stream@~0.0.2: version "0.0.4" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-0.0.4.tgz#f32d76e3fb863344a548d79923007173665b3b8d" @@ -5110,6 +5325,11 @@ readline-sync@^1.4.9: resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b" integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw== +real-require@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.2.0.tgz#209632dea1810be2ae063a6ac084fee7e33fba78" + integrity sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg== + redis-commands@1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/redis-commands/-/redis-commands-1.7.0.tgz#15a6fea2d58281e27b1cd1acfb4b293e278c3a89" @@ -5252,6 +5472,11 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +safe-stable-stringify@^2.3.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz#ec7b037768098bf65310d1d64370de0dc02353aa" + integrity sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA== + safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -5272,6 +5497,11 @@ sax@>=0.1.1, sax@>=0.6.0: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +secure-json-parse@^2.4.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.7.0.tgz#5a5f9cd6ae47df23dba3151edd06855d47e09862" + integrity sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw== + semver-diff@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" @@ -5354,6 +5584,20 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +sonic-boom@^2.1.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-2.8.0.tgz#c1def62a77425090e6ad7516aad8eb402e047611" + integrity sha512-kuonw1YOYYNOve5iHdSahXPOK49GqwA+LZhI6Wz/l0rP57iKyXXIHaRagOBHAPmGwJC6od2Z9zgvZ5loSgMlVg== + dependencies: + atomic-sleep "^1.0.0" + +sonic-boom@^3.0.0, sonic-boom@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-3.2.1.tgz#972ceab831b5840a08a002fa95a672008bda1c38" + integrity sha512-iITeTHxy3B9FGu8aVdiDXUVAcHMF9Ss0cCsAOo2HfCrmVGT3/DT5oYaeu0M/YKZDlKTvChEyPq0zI9Hf33EX6A== + dependencies: + atomic-sleep "^1.0.0" + source-map-support@0.5.13: version "0.5.13" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" @@ -5389,6 +5633,11 @@ split2@^2.1.0: dependencies: through2 "^2.0.2" +split2@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809" + integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ== + sprintf-js@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" @@ -5643,6 +5892,13 @@ testcontainers@4.7.0: stream-to-array "^2.3.0" tar-fs "^2.1.0" +thread-stream@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-2.3.0.tgz#4fc07fb39eff32ae7bad803cb7dd9598349fed33" + integrity sha512-kaDqm1DET9pp3NXwR8382WHbnpXnRkN9xGN9dQt3B2+dmXiW8X1SOwmFOxAErEQ47ObhZ96J6yhZNXuyCOL7KA== + dependencies: + real-require "^0.2.0" + through2@3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" @@ -5936,7 +6192,7 @@ uuid@8.1.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d" integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg== -uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.2: +uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.1, uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index a2e1b5657a..1af692e5c5 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,13 +475,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.6": - version "2.2.12-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.6.tgz#284d54e71895e4b3ca3595c2b9e245f7ebb89e98" - integrity sha512-Q63z+qEHG/Y/unp44Yxp/VNL/By9qQDj5Kqh8uPnVUulAjQ2aJkNHulrMpfwC+l2eOnouOsYW/WA66Sv8cDRiA== +"@budibase/backend-core@2.2.12-alpha.32": + version "2.2.12-alpha.32" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.32.tgz#5d53fdde38e80fdade73c59cb81623041984a5fc" + integrity sha512-XoaqGrttx01wlblI0+O23R9uS5FTMgK07juY6mUkdReCK46IvmG7FFnuYu0euKVRbhChSf5X8S+fvKIAEi1ZFw== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.6" + "@budibase/types" "2.2.12-alpha.32" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -489,6 +489,7 @@ bcrypt "5.0.1" bcryptjs "2.4.3" bull "4.10.1" + correlation-id "4.0.0" dotenv "16.0.1" emitter-listener "1.1.2" ioredis "4.28.0" @@ -525,23 +526,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.6": - version "2.2.12-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.6.tgz#4bdd678f4be76b2c0732cf0d3e8941e18dd19dbb" - integrity sha512-Cxzw9QldMzltzJdUnh5gudjoqZrJPsQKLMdV/OXRyj1jqhlhrSIUQpgHx46zgVSQnp8IuPdBmpT6n77u1oJCLQ== +"@budibase/pro@2.2.12-alpha.32": + version "2.2.12-alpha.32" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.32.tgz#4f35b0ada97458cc69ee41ebb40d56b361518065" + integrity sha512-Kn/IahgIb9Ydzmasv4Bhlh3rvyAC2tBVSoI33OZ/6PKF0vPYJNJkFds3iGELNV7SyWoLbVWb2z5SQ4SSaOYsJw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.6" - "@budibase/types" "2.2.12-alpha.6" + "@budibase/backend-core" "2.2.12-alpha.32" + "@budibase/types" "2.2.12-alpha.32" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.6": - version "2.2.12-alpha.6" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.6.tgz#9d7c4f66b54964cbb8d8a6257ccd2060e9cbcada" - integrity sha512-5QiCmpKlPrAO55bCF/g8xeU0oxXgzLgJn/R9wtsER+OsfmWTLdwiL9STl+LLbWY4F/KxXT9zd8xOm4e04J5MDA== +"@budibase/types@2.2.12-alpha.32": + version "2.2.12-alpha.32" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.32.tgz#71af8e8cff66acbfd65aa87e66183dd95d76ce6f" + integrity sha512-ZZwmO+0ORGEFbU/EQvtnjo1VonUbBdsciFkTOiopVupU5iNY2oCKgbYTQiTZZisQrRuiKdPV6P17uV+YTkjQSQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" @@ -2750,6 +2751,13 @@ core-util-is@^1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== +correlation-id@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/correlation-id/-/correlation-id-4.0.0.tgz#c1d3038e5f30d7bfeae5728ff96f27a7506bc2c0" + integrity sha512-WvXtJBlovvOBKqTz/YwWP2gm6CXJZJArfGimp9s/ehmhJMPFbmnPMQe3K60Q9idGNixMvKojMjleyDhZEFdHfg== + dependencies: + uuid "^8.3.1" + cpu-features@~0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.4.tgz#0023475bb4f4c525869c162e4108099e35bf19d8" @@ -8099,7 +8107,7 @@ uuid@8.1.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.1.0.tgz#6f1536eb43249f473abc6bd58ff983da1ca30d8d" integrity sha512-CI18flHDznR0lq54xBycOVmphdCYnQLKn8abKn7PXUiKUGdEd+/l9LWNJmugXel4hXq7S+RMNl34ecyC9TntWg== -uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.2: +uuid@8.3.2, uuid@^8.3.0, uuid@^8.3.1, uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== From 557a9a8eeb680e55ddf5c511d08e80cbc13c5720 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 23 Jan 2023 18:56:44 +0000 Subject: [PATCH 186/387] Adding an API for publishing an event from the frontend. --- packages/frontend-core/src/api/events.js | 0 packages/types/src/api/web/global/events.ts | 7 +++++++ packages/types/src/api/web/global/index.ts | 1 + .../worker/src/api/controllers/global/events.ts | 17 +++++++++++++++++ packages/worker/src/api/routes/global/events.ts | 8 ++++++++ 5 files changed, 33 insertions(+) create mode 100644 packages/frontend-core/src/api/events.js create mode 100644 packages/types/src/api/web/global/events.ts create mode 100644 packages/worker/src/api/controllers/global/events.ts create mode 100644 packages/worker/src/api/routes/global/events.ts diff --git a/packages/frontend-core/src/api/events.js b/packages/frontend-core/src/api/events.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/types/src/api/web/global/events.ts b/packages/types/src/api/web/global/events.ts new file mode 100644 index 0000000000..907cfc74aa --- /dev/null +++ b/packages/types/src/api/web/global/events.ts @@ -0,0 +1,7 @@ +export enum EventPublishType { + ENVIRONMENT_VARIABLE_UPGRADE_PANEL_OPENED = "environment_variable_upgrade_panel_opened", +} + +export interface PostEventPublishRequest { + type: EventPublishType +} diff --git a/packages/types/src/api/web/global/index.ts b/packages/types/src/api/web/global/index.ts index a99934c39c..415ed55ab1 100644 --- a/packages/types/src/api/web/global/index.ts +++ b/packages/types/src/api/web/global/index.ts @@ -1 +1,2 @@ export * from "./environmentVariables" +export * from "./events" diff --git a/packages/worker/src/api/controllers/global/events.ts b/packages/worker/src/api/controllers/global/events.ts new file mode 100644 index 0000000000..758fb41b54 --- /dev/null +++ b/packages/worker/src/api/controllers/global/events.ts @@ -0,0 +1,17 @@ +import { + UserCtx, + PostEventPublishRequest, + EventPublishType, +} from "@budibase/types" +import { events } from "@budibase/backend-core" + +export async function publish(ctx: UserCtx) { + switch (ctx.request.body.type) { + case EventPublishType.ENVIRONMENT_VARIABLE_UPGRADE_PANEL_OPENED: + await events.environmentVariable.upgradePanelOpened(ctx.user._id!) + break + default: + ctx.throw(400, "Invalid publish event type.") + } + ctx.status = 200 +} diff --git a/packages/worker/src/api/routes/global/events.ts b/packages/worker/src/api/routes/global/events.ts new file mode 100644 index 0000000000..6fe8088761 --- /dev/null +++ b/packages/worker/src/api/routes/global/events.ts @@ -0,0 +1,8 @@ +import Router from "@koa/router" +import * as controller from "../../controllers/global/events" + +const router: Router = new Router() + +router.post("/api/global/event/publish", controller.publish) + +export default router From 63d882efc6b9a6abda39d0919684e2991a6a54f8 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Mon, 23 Jan 2023 19:18:02 +0000 Subject: [PATCH 187/387] Adding frontend event publishing for events like upgrade panel opened. --- .../portal/settings/environment/index.svelte | 5 ++++- packages/builder/src/stores/portal/environment.js | 8 ++++++++ packages/frontend-core/src/api/events.js | 13 +++++++++++++ packages/frontend-core/src/api/index.js | 2 ++ packages/frontend-core/src/constants.js | 4 ++++ packages/worker/src/api/routes/index.ts | 2 ++ 6 files changed, 33 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte index e6876408fe..fbe5a675c9 100644 --- a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte +++ b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte @@ -93,7 +93,10 @@ diff --git a/packages/builder/src/stores/portal/environment.js b/packages/builder/src/stores/portal/environment.js index 03e73371b1..458eea27be 100644 --- a/packages/builder/src/stores/portal/environment.js +++ b/packages/builder/src/stores/portal/environment.js @@ -1,5 +1,6 @@ import { writable } from "svelte/store" import { API } from "api" +import { Constants } from "@budibase/frontend-core" export function createEnvironmentStore() { const { subscribe, update } = writable({ @@ -47,6 +48,12 @@ export function createEnvironmentStore() { await API.updateEnvironmentVariable(data) } + async function upgradePanelOpened() { + await API.publishEvent( + Constants.EventPublishType.ENV_VAR_UPGRADE_PANEL_OPENED + ) + } + return { subscribe, checkStatus, @@ -54,6 +61,7 @@ export function createEnvironmentStore() { createVariable, deleteVariable, updateVariable, + upgradePanelOpened, } } diff --git a/packages/frontend-core/src/api/events.js b/packages/frontend-core/src/api/events.js index e69de29bb2..3f17722d3e 100644 --- a/packages/frontend-core/src/api/events.js +++ b/packages/frontend-core/src/api/events.js @@ -0,0 +1,13 @@ +export const buildEventEndpoints = API => ({ + /** + * Publish a specific event to the backend. + */ + publishEvent: async eventType => { + return await API.post({ + url: `/api/global/event/publish`, + body: { + type: eventType, + }, + }) + }, +}) diff --git a/packages/frontend-core/src/api/index.js b/packages/frontend-core/src/api/index.js index ca065776b2..e2935b416b 100644 --- a/packages/frontend-core/src/api/index.js +++ b/packages/frontend-core/src/api/index.js @@ -27,6 +27,7 @@ import { buildGroupsEndpoints } from "./groups" import { buildPluginEndpoints } from "./plugins" import { buildBackupsEndpoints } from "./backups" import { buildEnvironmentVariableEndpoints } from "./environmentVariables" +import { buildEventEndpoints } from "./events" const defaultAPIClientConfig = { /** * Certain definitions can't change at runtime for client apps, such as the @@ -248,5 +249,6 @@ export const createAPIClient = config => { ...buildPluginEndpoints(API), ...buildBackupsEndpoints(API), ...buildEnvironmentVariableEndpoints(API), + ...buildEventEndpoints(API), } } diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index ff9f4628d0..f2e48b6fef 100644 --- a/packages/frontend-core/src/constants.js +++ b/packages/frontend-core/src/constants.js @@ -174,3 +174,7 @@ export const Themes = [ base: "darkest", }, ] + +export const EventPublishType = { + ENV_VAR_UPGRADE_PANEL_OPENED: "environment_variable_upgrade_panel_opened", +} diff --git a/packages/worker/src/api/routes/index.ts b/packages/worker/src/api/routes/index.ts index f0d4911771..3aa9422238 100644 --- a/packages/worker/src/api/routes/index.ts +++ b/packages/worker/src/api/routes/index.ts @@ -7,6 +7,7 @@ import templateRoutes from "./global/templates" import emailRoutes from "./global/email" import authRoutes from "./global/auth" import roleRoutes from "./global/roles" +import eventRoutes from "./global/events" import environmentRoutes from "./system/environment" import tenantsRoutes from "./system/tenants" import statusRoutes from "./system/status" @@ -34,4 +35,5 @@ export const routes: Router[] = [ migrationRoutes, accountRoutes, restoreRoutes, + eventRoutes, ] From 8d8ec91be8d054fb429d744d01dbfe6a92079eed Mon Sep 17 00:00:00 2001 From: FlaminWrap <97764630+FlaminWrap@users.noreply.github.com> Date: Mon, 23 Jan 2023 23:24:44 +0000 Subject: [PATCH 188/387] Resolve merge problems (#9420) --- .../builder/portal/settings/version.svelte | 61 ++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/settings/version.svelte b/packages/builder/src/pages/builder/portal/settings/version.svelte index 694475edcc..c9b2f618e3 100644 --- a/packages/builder/src/pages/builder/portal/settings/version.svelte +++ b/packages/builder/src/pages/builder/portal/settings/version.svelte @@ -8,6 +8,8 @@ Divider, notifications, Label, + Modal, + ModalContent, } from "@budibase/bbui" import { API } from "api" import { auth, admin } from "stores/portal" @@ -15,6 +17,11 @@ let version let loaded = false + let githubVersion + let githubPublishedDate + let githubPublishedTime + let needsUpdate = true + let updateModal // Only admins allowed here $: { @@ -47,8 +54,37 @@ } } + async function getLatestVersion() { + try { + //Check github API for the latest release + const githubCheck = await fetch( + "https://api.github.com/repos/Budibase/budibase/releases/latest" + ) + const githubResponse = await githubCheck.json() + + //Get tag and remove the v infront of the tage name e.g. v1.0.0 is 1.0.0 + githubVersion = githubResponse.tag_name.slice(1) + + //Get the release date and output it in the local time format + githubPublishedDate = new Date(githubResponse.published_at) + githubPublishedTime = githubPublishedDate.toLocaleTimeString() + githubPublishedDate = githubPublishedDate.toLocaleDateString() + + //Does Budibase need to be updated? + if (githubVersion === version) { + needsUpdate = false + } else { + needsUpdate = true + } + } catch (error) { + notifications.error("Error getting the latest Budibase version") + githubVersion = null + } + } + onMount(async () => { await getVersion() + await getLatestVersion() loaded = true }) @@ -69,9 +105,32 @@ {version || "-"} + + + + {githubVersion} + + +
- + + + + Are you sure you want to update your budibase installation to the + latest version? + +
{/if} From fb3d66b6ae1a624553b0d48ce4c0d2c8f4c03802 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 23:29:11 +0000 Subject: [PATCH 189/387] Bump cookiejar from 2.1.3 to 2.1.4 in /packages/server (#9417) Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.3 to 2.1.4. - [Release notes](https://github.com/bmeck/node-cookiejar/releases) - [Commits](https://github.com/bmeck/node-cookiejar/commits) --- updated-dependencies: - dependency-name: cookiejar dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/server/yarn.lock | 803 +++++++++++++++++++++++++++++++++++++- 1 file changed, 790 insertions(+), 13 deletions(-) diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 4d6ab08f2c..5093584e46 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -2,6 +2,11 @@ # yarn lockfile v1 +"@adobe/spectrum-css-workflow-icons@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4" + integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w== + "@adobe/spectrum-css-workflow-icons@^1.2.1": version "1.5.3" resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.5.3.tgz#5e31ce842b7626f4b99f9d5cd0b17599d287b0bf" @@ -1312,6 +1317,60 @@ uuid "8.3.2" zlib "1.0.5" +"@budibase/bbui@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.2.12-alpha.34.tgz#b8e27b325ffc01f9b392e7c9a908a7f9bd99f3b4" + integrity sha512-URCaj2QwlnX9XWaDBTx1CAB0Rj+fhfZO1Ch+VZycHiVYEOxL+ljKy4Xe1cd8e8nfPXuKpBtdkow6qdfM11KNKA== + dependencies: + "@adobe/spectrum-css-workflow-icons" "1.2.1" + "@budibase/string-templates" "2.2.12-alpha.34" + "@spectrum-css/accordion" "3.0.24" + "@spectrum-css/actionbutton" "1.0.1" + "@spectrum-css/actiongroup" "1.0.1" + "@spectrum-css/avatar" "3.0.2" + "@spectrum-css/button" "3.0.1" + "@spectrum-css/buttongroup" "3.0.2" + "@spectrum-css/checkbox" "3.0.2" + "@spectrum-css/dialog" "3.0.1" + "@spectrum-css/divider" "1.0.3" + "@spectrum-css/dropzone" "3.0.2" + "@spectrum-css/fieldgroup" "3.0.2" + "@spectrum-css/fieldlabel" "3.0.1" + "@spectrum-css/icon" "3.0.1" + "@spectrum-css/illustratedmessage" "3.0.2" + "@spectrum-css/inlinealert" "2.0.1" + "@spectrum-css/inputgroup" "3.0.2" + "@spectrum-css/label" "2.0.10" + "@spectrum-css/link" "3.1.1" + "@spectrum-css/menu" "3.0.1" + "@spectrum-css/modal" "3.0.1" + "@spectrum-css/pagination" "3.0.3" + "@spectrum-css/picker" "1.0.1" + "@spectrum-css/popover" "3.0.1" + "@spectrum-css/progressbar" "1.0.2" + "@spectrum-css/progresscircle" "1.0.2" + "@spectrum-css/radio" "3.0.2" + "@spectrum-css/search" "3.0.2" + "@spectrum-css/sidenav" "3.0.2" + "@spectrum-css/slider" "3.0.1" + "@spectrum-css/statuslight" "3.0.2" + "@spectrum-css/stepper" "3.0.3" + "@spectrum-css/switch" "1.0.2" + "@spectrum-css/table" "3.0.1" + "@spectrum-css/tabs" "3.2.12" + "@spectrum-css/tags" "3.0.2" + "@spectrum-css/textfield" "3.0.1" + "@spectrum-css/toast" "3.0.1" + "@spectrum-css/tooltip" "3.0.3" + "@spectrum-css/treeview" "3.0.2" + "@spectrum-css/typography" "3.0.1" + "@spectrum-css/underlay" "2.0.9" + "@spectrum-css/vars" "3.0.1" + dayjs "^1.10.4" + easymde "^2.16.1" + svelte-flatpickr "^3.2.3" + svelte-portal "^1.0.0" + "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1362,6 +1421,71 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" +"@budibase/client@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.2.12-alpha.34.tgz#8387fe9367aec3d79d85504d0ad37e9e6d5b476e" + integrity sha512-DEH9LEW6MKmjWS3T7uMffQTUzTvuwSxhknRKuzUqJ/lRvfHC4IAgLA41VCE/99R3NleAEJYpid+RDAWF4fbVgw== + dependencies: + "@budibase/bbui" "2.2.12-alpha.34" + "@budibase/frontend-core" "2.2.12-alpha.34" + "@budibase/string-templates" "2.2.12-alpha.34" + "@spectrum-css/button" "^3.0.3" + "@spectrum-css/card" "^3.0.3" + "@spectrum-css/divider" "^1.0.3" + "@spectrum-css/link" "^3.1.3" + "@spectrum-css/page" "^3.0.1" + "@spectrum-css/tag" "^3.1.4" + "@spectrum-css/typography" "^3.0.2" + "@spectrum-css/vars" "^3.0.1" + apexcharts "^3.22.1" + dayjs "^1.10.5" + downloadjs "1.4.7" + html5-qrcode "^2.2.1" + leaflet "^1.7.1" + regexparam "^1.3.0" + sanitize-html "^2.7.0" + screenfull "^6.0.1" + shortid "^2.2.15" + socket.io-client "^4.5.1" + svelte "^3.49.0" + svelte-apexcharts "^1.0.2" + svelte-flatpickr "^3.1.0" + svelte-spa-router "^3.0.5" + +"@budibase/frontend-core@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.2.12-alpha.34.tgz#ed8a57944554bad9516a0626b452f76f02a1c32f" + integrity sha512-IMZW5Jyx2U4i99iSt5XCS4KMmOdiSCR9F0o8xcEm935M15WrdEV/9E+7ZBVcY8W2TxpqeyN8r+eyYGkwmEjkqw== + dependencies: + "@budibase/bbui" "2.2.12-alpha.34" + lodash "^4.17.21" + svelte "^3.46.2" + +"@budibase/handlebars-helpers@^0.11.8": + version "0.11.8" + resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" + integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ== + dependencies: + array-sort "^1.0.0" + define-property "^2.0.2" + extend-shallow "^3.0.2" + for-in "^1.0.2" + get-object "^0.2.0" + get-value "^3.0.1" + handlebars "^4.7.7" + handlebars-utils "^1.0.6" + has-value "^2.0.2" + helper-md "^0.2.2" + html-tag "^2.0.0" + is-even "^1.0.0" + is-glob "^4.0.1" + kind-of "^6.0.3" + micromatch "^3.1.5" + relative "^3.0.2" + striptags "^3.1.1" + to-gfm-code-block "^0.1.1" + year "^0.2.1" + "@budibase/nano@10.1.1": version "10.1.1" resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038" @@ -1405,6 +1529,18 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" +"@budibase/string-templates@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.2.12-alpha.34.tgz#47a9842bbe8cf973f5537021a16aa912517c1d02" + integrity sha512-ybGtHnLOAsEXGgNk9h3SlQ3jSDh6UUkrZB07zUEhBoxJ4w2qk+x/HvTsLMYLVmKidQcWx6cfSbhLrIupn+OZRw== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.4" + "@budibase/types@2.2.12-alpha.34": version "2.2.12-alpha.34" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.34.tgz#1f1b9993221f4f43cb300d08870a5a81736d4bd1" @@ -2617,26 +2753,51 @@ resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== +"@spectrum-css/accordion@3.0.24": + version "3.0.24" + resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74" + integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA== + +"@spectrum-css/actionbutton@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577" + integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw== + "@spectrum-css/actionbutton@^1.0.1": version "1.1.14" resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.1.14.tgz#4e12eb7f482fb5944c3d97547591964baebeb1d4" integrity sha512-ViBjdWi23J6vIR4t8JTRQ6jY/+KgpZgCALj3otgy495zMNG7jPeN7sKoy6i6JZJcdIRJA4MjOTVvcDOGkYWUZg== +"@spectrum-css/actiongroup@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c" + integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA== + "@spectrum-css/actiongroup@^1.0.1": version "1.0.26" resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.26.tgz#181ee059f28b1342389a128c39d20d2e10566aae" integrity sha512-T1IK9a2Gxix9givm+chGvFtZh5oGBZQc/S2UA9F76JZKu45eCkLkvUH6F670XOrBhDGkVfzvN21QnFymSY43ow== -"@spectrum-css/avatar@^3.0.2": +"@spectrum-css/avatar@3.0.2", "@spectrum-css/avatar@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95" integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ== +"@spectrum-css/button@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.1.tgz#6db8c3e851baecd0f1c2d88fef37d49d01c6e643" + integrity sha512-YXrBtjIYisk4Vaxnp0RiE4gdElQX04P2mc4Pi2GlQ27dJKlHmufYcF+kAqGdtiyK5yjdN/vKRcC8y13aA4rusA== + "@spectrum-css/button@^3.0.1", "@spectrum-css/button@^3.0.3": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84" integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg== +"@spectrum-css/buttongroup@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.2.tgz#fd3387973ca3131609e32112de42a1c0400a48d8" + integrity sha512-Wu7B4GJ/SAeVHz9SUGAkeIH8pLaZh4t+w2ykSKOPQIRuK2jCBoudkEClVxviNVwqekccf5XLFXg9GpYF1a3Uaw== + "@spectrum-css/buttongroup@^3.0.2": version "3.0.10" resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.10.tgz#897ea04b3ffea389fc7fe5bf67a6d1f3454b774d" @@ -2647,16 +2808,33 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b" integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg== +"@spectrum-css/checkbox@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.0.2.tgz#53ca2fba0d9faa1fead10e7206eb1f6cdcfd6ddd" + integrity sha512-hPbGcnm7kJvJS4jp/P/bdaZvbyR1eIE9mteuZqcBgdmyp9m/k6+mW5jmsbtqb3Y4mMPWvOJFfz/sIvWJP0F0Zg== + "@spectrum-css/checkbox@^3.0.2": version "3.1.2" resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.1.2.tgz#88698969091da9b50de781d25839446084b4a5f4" integrity sha512-vIuknIhRF/Xtq6OHjOtlhYt722FPcTLBb7Y7tY0Ho8VEpynj3JrVLP/1YYp/YIrYMpsTugxPmbCrEkikkdL6Mg== +"@spectrum-css/dialog@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.1.tgz#33aae036282159f6aa998848b8c0828640a9620a" + integrity sha512-hUFbRR6RGT63MNuP7wP+k9KU+uRuICsduMihskh700e+jiQ+Gsv53fBFDlB843FoZYlIXzFQXgtjMUC5a4Qibw== + "@spectrum-css/dialog@^3.0.1": version "3.0.12" resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.12.tgz#fc97e002ca768a3d99dd10cb6a135c2b06052004" integrity sha512-50rbFa+9eUKT+3uYBX7CkmI7SbQ0Z3CAFwjyjai+itYZ8kf/FcHVFwcLjgrry9scUnKhexMs94kkr0gfQpPe8Q== +"@spectrum-css/divider@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385" + integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA== + dependencies: + "@spectrum-css/vars" "^3.0.2" + "@spectrum-css/divider@^1.0.3": version "1.0.26" resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.26.tgz#44b610b1b6c747536fca08b3f09286341e18ab29" @@ -2664,56 +2842,106 @@ dependencies: "@spectrum-css/vars" "^8.0.0" +"@spectrum-css/dropzone@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.2.tgz#34f137851054442b219fed7f32006b93fc5e0bcf" + integrity sha512-BuBBzm5re6lM0AWgd6V+mI5eEGnnmFEtcFiJBEn9jYNEQYgflFhvnERUt89jMX5WmspiecwI2JBWJFrtFsOzug== + "@spectrum-css/dropzone@^3.0.2": version "3.0.24" resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.24.tgz#edefb3ca5a01705a64d0161a599c59199bab6299" integrity sha512-JY60hUZAAuzS+o2xFOKv0o31cc+5/cjLpTyKEy73oGKsdUXEEMiQtW2PQBCuxh7PNyw29wCULeZ1EW1QdNPyxg== +"@spectrum-css/fieldgroup@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.0.2.tgz#1c1afd3c444d8650fefac275dc66a7a913933846" + integrity sha512-Vyw0kQJdLW18J6w4H+YAsoLntvkw5rXmW3CH5H3SDTXkBztxtHSSe3e106Nw5MoZxTfHlom6CxbYXYCTjQfqGw== + "@spectrum-css/fieldgroup@^3.0.2": version "3.1.3" resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.1.3.tgz#945123da56534f1ff6118a9defd18b8a883e34a8" integrity sha512-HIbB3jweNviWXcADoYQW3hanww9RTUIsBUhe0YxSMXUXnQJc/7nlyeLoTRMr2eEVSCREfRnMot/8bZloW7ctnA== +"@spectrum-css/fieldlabel@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.1.tgz#39f7c0f25cc2ff402afeff005341b0832f7c588c" + integrity sha512-LMfwrwIq8wEEvxFLobdLvXRwKrp8o9Fty4iJ9aYl2Rj1uXkfRd8qLz9HGZjLEE1OuJgoTBgamYABl7EvoA5PLw== + "@spectrum-css/fieldlabel@^3.0.1": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.3.tgz#f73c04d20734d4718ffb620dc46458904685b449" integrity sha512-nEvIkEXCD5n4fW67Unq6Iu7VXoauEd/JGpfTY02VsC5p4FJLnwKfPDbJUuUsqClAxqw7nAsmXVKtn4zQFf5yPQ== +"@spectrum-css/icon@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.1.tgz#e300a6fc353c85c6b5d6e7a364408a940c31b177" + integrity sha512-cGFtIrcQ/7tthdkHK1npuEFiCdYVHLqwmLxghUYQw8Tb8KgJaw3OBO1tpjgsUizexNgu26BjVRIbGxNWuBXIHQ== + "@spectrum-css/icon@^3.0.1": version "3.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.22.tgz#1dd77e2460121951c60c583edb470d0ba52e6822" integrity sha512-ilrPlHDRGzn7kXVVAwUhoSaMfS6sGlb21ix2gn8IRLBAjDOV8BBV1wJJtjGNw+kzCXMhnVnVOekTdht17Oe9bw== +"@spectrum-css/illustratedmessage@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.2.tgz#6a480be98b027e050b086e7899e40d87adb0a8c0" + integrity sha512-dqnE8X27bGcO0HN8+dYx8O4o0dNNIAqeivOzDHhe2El+V4dTzMrNIerF6G0NLm3GjVf6XliwmitsZK+K6FmbtA== + "@spectrum-css/illustratedmessage@^3.0.2": version "3.0.17" resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.17.tgz#49cb2549fda97a6812156bfba6ccdd3a18bebd11" integrity sha512-kpDqeq1U+rEjG1XuiXkbGvS71vn6mpFF/hiwCgFJWudVOfypDPQ4KLfYw1ditFSUzMCm5H6U/RqAShAJn8oMWA== +"@spectrum-css/inlinealert@2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.1.tgz#7521f88f6c845806403cc7d925773c7414e204a2" + integrity sha512-Xy5RCOwgurqUXuGQCsEDUduDd5408bmEpmFg+feynG7VFUgLFZWBeylSENB/OqjlFtO76PHXNVdHkhDscPIHTA== + "@spectrum-css/inlinealert@^2.0.1": version "2.0.6" resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.6.tgz#4c5e923a1f56a96cc1adb30ef1f06ae04f2c6376" integrity sha512-OpvvoWP02wWyCnF4IgG8SOPkXymovkC9cGtgMS1FdDubnG3tJZB/JeKTsRR9C9Vt3WBaOmISRdSKlZ4lC9CFzA== +"@spectrum-css/inputgroup@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.2.tgz#f1b13603832cbd22394f3d898af13203961f8691" + integrity sha512-O0G3Lw9gxsh8gTLQWIAKkN1O8cWhjpEUl+oR1PguIKFni72uNr2ikU9piOwy/r0gJG2Q/TVs6hAshoAAkmsSzw== + "@spectrum-css/inputgroup@^3.0.2": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.8.tgz#fc23afc8a73c24d17249c9d2337e8b42085b298b" integrity sha512-cmQWzFp0GU+4IMc8SSeVFdmQDlRUdPelXaQdKUR9mZuO2iYettg37s0lfBCeJyYkUNTagz0zP8O7A0iXfmeE6g== -"@spectrum-css/label@^2.0.10": +"@spectrum-css/label@2.0.10", "@spectrum-css/label@^2.0.10": version "2.0.10" resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001" integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ== +"@spectrum-css/link@3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb" + integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA== + "@spectrum-css/link@^3.1.1", "@spectrum-css/link@^3.1.3": version "3.1.22" resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.22.tgz#1e061d674789c5b3be5b0680f9f6eae3e695e1c1" integrity sha512-Zf8bfy+rtq07l4qoR6chNxefmatLZQZjudIm96v+lsCXBkjVbiMpjkW9oOcNwTqKB08koMONHHhOf1wk2Faqiw== +"@spectrum-css/menu@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe" + integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg== + "@spectrum-css/menu@^3.0.1": version "3.0.21" resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.21.tgz#d1f7e6e69d30b5e1edd7ed2c86ea4e08dfd670ab" integrity sha512-G5AIUO26O6IAc6HUGZu4AZgyw0QRyLfSbcKlFGu4oJHzP36cQc1S1uCh8Xp4g5d+n6mU62LxNDLSMpVbwnA00A== +"@spectrum-css/modal@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.1.tgz#613a6b83d0330a4d38db41a98090800751c56d8d" + integrity sha512-F7D99F3cjDGT9DM9sogx/p49jrNYT7a1J6TUoqV73wUf+0gP+dTsskBOo9jB8VbUE+POQPjiDLB+SWLp6iBB+w== + "@spectrum-css/modal@^3.0.1": version "3.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.22.tgz#05593a613e246a7cbef85d08a6945219e1207209" @@ -2726,107 +2954,222 @@ dependencies: "@spectrum-css/vars" "^4.3.1" +"@spectrum-css/pagination@3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.3.tgz#b204c3ada384c4af751a354bc428346d82eeea65" + integrity sha512-OJ/v9GeNXJOZ9Yr9LDBYPrR2NCiLOWP9wANT/a5sqFuugRnQbn/HYMnRp9TBxwpDY6ihaPo0T/wi7kLiAJFdDw== + "@spectrum-css/pagination@^3.0.3": version "3.0.11" resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.11.tgz#68d9f34fe8eb36bf922e41b11f49eac62ac2fc41" integrity sha512-wjZr7NAcqHK6fxNIGKTYEVtAOJugJTbcz4d8K7DZuUDgBVwLJJHJBi4uJ4KrIRYliMWOvqWTZzCJLmmTfx4cyw== +"@spectrum-css/picker@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.1.tgz#98991198576d26bd14160824e7b6f3c278ff930b" + integrity sha512-Rv4/UBOdNW1gs7WVBCJnPD5VFly8MqP++psDX6kcugUIcfJy0GC3acvElotmKRlCDk8Qxks2W2A0jKeSgphTmA== + "@spectrum-css/picker@^1.0.1": version "1.2.9" resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.2.9.tgz#854cdca407daaf8e1f821777978690f0804b3c08" integrity sha512-HDUDiqHwM84xfbHJWm4wR67Km3NXcDluhDrkVn8uqOEZrm8y4YiW+esL6FzPgzqLdPIHboQjrdpRq4LiDzGjjA== +"@spectrum-css/popover@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.1.tgz#5863c1efc53f98f9aba2de9186666780041303fc" + integrity sha512-LmOSj/yCwQQ9iGmCYnHiJsJR/HfPiGqI1Jl7pkKxBOCxYBMS/5+ans9vfCN2Qnd0eK7WSbfPg72S6mjye7db2Q== + "@spectrum-css/popover@^3.0.1": version "3.0.11" resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.11.tgz#a7450c01bcf1609264b4a9df58821368b9e224d1" integrity sha512-bzyNQJVw6Mn1EBelTaRlXCdd0ZfykNX9O6SHx3a+jXPYu8VBrRpHm0gsfWzPAz1etd1vj1CxwG/teQt4qvyZ/Q== +"@spectrum-css/progressbar@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.2.tgz#b5a59432517f9ae6dad49d9504691bc5ac42b424" + integrity sha512-+jExeBLtVCqo3BqtFq5WCtZ028Dzk+oUnX6y4z6ZamKPqOyOELOtFnhYnyhyRndQOqYwKUTXx9zsaWA/lpJOHw== + "@spectrum-css/progressbar@^1.0.2": version "1.0.30" resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.30.tgz#1f1e81ab6080fb843831421f736ed2bccc9b18ed" integrity sha512-tUquDN33RQG8gyrWmwPaCu6I2rxRyv5BBGBPii+1sK7L/DTCJrKXe7TAqoxjNEYzdCvTF/HI1NvnSColWNq0Rw== +"@spectrum-css/progresscircle@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.2.tgz#258ea9170fb70f795edda03e38a61d93bef4487c" + integrity sha512-JLULpyzjIY95lzlWR1yE1gv4l1K6p+scQ+edmuZZUHBzwM3pUtkvHJmUlA9TYdResUYW6Uka60VRdY6lZ8gnFQ== + "@spectrum-css/progresscircle@^1.0.2": version "1.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.22.tgz#80c8fd2ac4ee6855297d98c60c3b36082020a32a" integrity sha512-EGb+q+7RxbbsrEPFpJ1P4XBQ4s6Ra0okjQCDDTTKTp/sUY2WIT2BjPzwxlZTxVmSXWiiuRyzyuSYUrgBw9UgWg== +"@spectrum-css/radio@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.2.tgz#9c1386894920bbed604e4e174fbbd45d9d762152" + integrity sha512-0TDdzC9omNXnpKHEXNuuGeXdNh4x8jvTKVUqMRLb7vY4hY94hAdt6X01NBqka+jzK35HxGzpDdPADAz62yZLPQ== + "@spectrum-css/radio@^3.0.2": version "3.0.23" resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.23.tgz#118a28c407e7b58bec139483d7e23074d840ae77" integrity sha512-x+08GSufmsyrUU4iBOOMRXZrcHxabXMMm/q2vazDJE8CShztvmdjghCxcwtyM74sjiYmXnCW1V3ztr6zaG5xig== +"@spectrum-css/search@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.0.2.tgz#70e93e321032d40b399498b2324e3b70e050551e" + integrity sha512-3UbT8yZmNOwrZxq+CUmumE+26ZySZ8OoKNM6U20SLMPLgdx6MrRugVE88r3Bl0sJ0RZX/5bU8nausdiHeX+Jlw== + "@spectrum-css/search@^3.0.2": version "3.1.2" resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.1.2.tgz#8d43f35f884f7c190e7694c8d26a3f2cfed01ef0" integrity sha512-8cMK1QB07dbReZ/ECyTyoT2dELZ7hK1b3jEDiWSeLBbXcKirR1OI24sZEnewQY/XWFd/62Z1YdNaaA8S6UuXWQ== +"@spectrum-css/sidenav@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.2.tgz#9d70f408d588ee79c69857751010333671f32713" + integrity sha512-YpIdH/F0jEICYmoduGrnkTmxwJq1kfKxEp0wOs+ZkQOsvKMv1an7nyhsfOKCQqcGNfYzJ9mJAk7/u5+vsxHa8g== + "@spectrum-css/sidenav@^3.0.2": version "3.0.23" resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.23.tgz#c218560d472e13a3e0d1499b762df1206dcffbfd" integrity sha512-4IFw2/HMQJRzM0M2c5na/HeY7y5vJoGpMFBkXNpQyhW4TRo7N1rGwYQ5dRD3s4OVEWV4/rjfGV0d/qhfwKUTog== +"@spectrum-css/slider@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49" + integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q== + +"@spectrum-css/statuslight@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5" + integrity sha512-xodB8g8vGJH20XmUj9ZsPlM1jHrGeRbvmVXkz0q7YvQrYAhim8pP3W+XKKZAletPFAuu8cmUOc6SWn6i4X4z6w== + "@spectrum-css/statuslight@^3.0.2": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.8.tgz#3b0ea80712573679870a85d469850230e794a0f7" integrity sha512-zMTHs8lk+I7fLdi9waEEbsCmJ1FxeHcjQ0yltWxuRmGk2vl4MQdQIuHIMI63iblqEaiwnJRjXJoKnWlNvndTJQ== +"@spectrum-css/stepper@3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.3.tgz#ae89846886431e3edeee060207b8f81540f73a34" + integrity sha512-prAD61ImlOTs9b6PfB3cB08x4lAfxtvnW+RZiTYky0E8GgZdrc/MfCkL5/oqQaIQUtyQv/3Lb7ELAf/0K8QTXw== + "@spectrum-css/stepper@^3.0.3": version "3.0.25" resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.25.tgz#a6e77d501a9671c083b6dd9a37c6a3f224ffc961" integrity sha512-nlAZKY4KCYQ4IFuFj/P0LXPsB4Ze36ziuaa3k3iy3+1pBDD4gDcGmNpNcTG1LENu0Bt87KhSj8Ba2NV3wBSY8w== +"@spectrum-css/switch@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.2.tgz#f0b4c69271964573e02b08e90998096e49e1de44" + integrity sha512-zqmHpgWPNg1gEwdUNFYV3CBX5JaeALfIqcJIxE0FLZqr9d1C4+oLE0ItIFzt1bwr4bFAOmkEpvtiY+amluzGxQ== + "@spectrum-css/switch@^1.0.2": version "1.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.22.tgz#8f2fe25a52b4511b9cfde7af45f9bd824b9774d7" integrity sha512-/Q8IxnkSQYo+i3G3BObslSvoKgM0Mm1mS7kmssULOtaQPbaRlRsUNQVaHzcNEX33+fiF/9zKSvs7ypgIvbWp+Q== +"@spectrum-css/table@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.1.tgz#753e0e2498082c0c36b9600828516aff3ac338cd" + integrity sha512-XQ+srMTv9hK1H0nctWUtqyzitmvyb5TNR+7mjAmKRdkBRSTQQSipDhenxZp72ekzMtMoSYZVZ77kgo0Iw3Fpug== + "@spectrum-css/table@^3.0.1": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.3.tgz#7f7f19905ef3275cbf907ce3a5818e63c30b2caf" integrity sha512-nxwzVjLPsXoY/v4sdxOVYLcC+cEbGgJyLcLclT5LT9MGSbngFeUMJzzVR4EvehzuN4dH7hrATG7Mbuq29Mf0Hg== +"@spectrum-css/tabs@3.2.12": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff" + integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA== + "@spectrum-css/tabs@^3.0.1": version "3.2.16" resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.16.tgz#c3f7800d8d6f7c9930c28cd01354816328bf72b1" integrity sha512-JUcMB/fiDG/KoyrVstlUMacFJUY4OHKqhMRuPtu9ggUXWCRbSkY8he92v6u0HwY3DuhDoOxNTK8d/PLjk/fsbg== +"@spectrum-css/tag@^3.1.4": + version "3.3.15" + resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278" + integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q== + +"@spectrum-css/tags@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.2.tgz#5bf35fb79c97cd9344de485bd4626ad5b9f07757" + integrity sha512-HbvMk+QHvCDD1/ScvSErpKROcpAbXuMD4Hl/Gz/1A1lQ0fJ/CJeCq/MMsL7zjK1nlItU/ySu8r8KIuRF+6F8SQ== + "@spectrum-css/tags@^3.0.2": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.3.tgz#fc76d2735cdc442de91b7eb3bee49a928c0767ac" integrity sha512-SL8vPxVDfWcY5VdIuyl0TImEXcOU1I7yCyXkk7MudMwfnYs81FaIyY32hFV9OHj0Tz/36UzRzc7AVMSuRQ53pw== +"@spectrum-css/textfield@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.0.1.tgz#e875b8e37817378ad08fc4af7d53026df38911e5" + integrity sha512-MUV5q87CVxbkNdSNoxGrFbgyKc51ft/WWf3aVEoPdPw5yBnXqFe1w1YmAit5zYDOOhhs58sCLAlUcCMlOpkgrA== + "@spectrum-css/textfield@^3.0.1": version "3.2.3" resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.2.3.tgz#52830498fb3b8957f84bb9bf2cafec7edc55e490" integrity sha512-mtxSQe8VZjQ8PHKlUE03dATAjjxp2Y8XfYmWWFBWWZLeqaojSLv9Q8C/ouK5AenhzCaYpJxTotMjAoivwtmUSw== +"@spectrum-css/toast@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796" + integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg== + "@spectrum-css/toast@^3.0.1": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.3.tgz#97c1527384707600832ecda35643ed304615250f" integrity sha512-CjLeaMs+cjUXojCCRtbj0YkD2BoZW16kjj2o5omkEpUTjA34IJ8xJ1a+CCtDILWekhXvN0MBN4sbumcnwcnx8w== +"@spectrum-css/tooltip@3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281" + integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A== + "@spectrum-css/tooltip@^3.0.3": version "3.1.17" resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.1.17.tgz#1f0822c8b69d16d5f940a2b7eb6514d719e6a0fd" integrity sha512-YDuC+Cc6B8DExjL/7fkPnWb8QwlCkjuMHyuttwP/tq/lryWnrdntojgwK5KvgFRjnZ2WfepZVryIt5LOD3tMdg== +"@spectrum-css/treeview@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.2.tgz#d54d8f17290babb1c885f5d9355e225421beb0d2" + integrity sha512-foO7UBJv1JMFaKgDPVt8jBghZSVbqhXR8TaGaxHSnMubv7ygmKkc1AITrWC2STILCn84ju2vchOohMZfW6sYwg== + "@spectrum-css/treeview@^3.0.2": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.3.tgz#aeda5175158b9f8d7529cb2b394428eb2a428046" integrity sha512-D5gGzZC/KtRArdx86Mesc9+99W9nTbUOeyYGqoJoAfJSOttoT6Tk5CrDvlCmAqjKf5rajemAkGri1ChqvUIwkw== +"@spectrum-css/typography@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.1.tgz#957dafd9b18c314fa37a88b549042ba2175f5b3f" + integrity sha512-XyR68K2rIZX3u4j7HhMLOqLVHDJZcapp3XUqgYMzMWccBFleA0qPxKpfRWqVIA5DzTMSIw0wEcZPYKWFZ2e6dA== + "@spectrum-css/typography@^3.0.1", "@spectrum-css/typography@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38" integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA== +"@spectrum-css/underlay@2.0.9": + version "2.0.9" + resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.9.tgz#fc10f971d1325cc844b727e6260f7217844060e8" + integrity sha512-X86xd0PG4QobmUyXA90BFGnyygaI8kW64dA4ysf4z0cOvUWjNbAAl3a/DB/WRyrnp63Zqv83T/cgNbetagTbWg== + "@spectrum-css/underlay@^2.0.9": version "2.0.30" resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.30.tgz#401cfd68df945692bd6bbe281fee98889c930dd1" integrity sha512-Ssq/KERbDuJu3PUWPkBv9+ZIbKooke3oncRoYMXeyP/Gcw5bmQSXOvnlddU5DIK4PJR+pPGVZ9CUUFaYZot4YQ== -"@spectrum-css/vars@^3.0.1": +"@spectrum-css/vars@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.1.tgz#561fd69098f896a647242dd8d6108af603bfa31e" + integrity sha512-l4oRcCOqInChYXZN6OQhpe3isk6l4OE6Ys8cgdlsiKp53suNoQxyyd9p/eGRbCjZgH3xQ8nK0t4DHa7QYC0S6w== + +"@spectrum-css/vars@^3.0.1", "@spectrum-css/vars@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999" integrity sha512-vzS9KqYXot4J3AEER/u618MXWAS+IoMvYMNrOoscKiLLKYQWenaueakUWulFonToPd/9vIpqtdbwxznqrK5qDw== @@ -3029,6 +3372,13 @@ resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8" integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w== +"@types/codemirror@^5.60.4": + version "5.60.7" + resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.7.tgz#efbb78e5e79f90c6762c2127c02096648e600808" + integrity sha512-QXIC+RPzt/1BGSuD6iFn6UMC9TDp+9hkOANYNPVsjjrDdzKphfRkwQDKGp2YaC54Yhz0g6P5uYTCCibZZEiMAA== + dependencies: + "@types/tern" "*" + "@types/connect@*": version "3.4.35" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" @@ -3237,6 +3587,11 @@ resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== +"@types/marked@^4.0.7": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.8.tgz#b316887ab3499d0a8f4c70b7bd8508f92d477955" + integrity sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw== + "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" @@ -3528,6 +3883,13 @@ "@types/node" "*" minipass "^3.3.5" +"@types/tern@*": + version "0.23.4" + resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb" + integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg== + dependencies: + "@types/estree" "*" + "@types/tough-cookie@*", "@types/tough-cookie@^4.0.2": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" @@ -4133,7 +4495,7 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.7: +argparse@^1.0.10, argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -4180,6 +4542,15 @@ array-equal@^1.0.0: resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" integrity sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA== +array-sort@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" + integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== + dependencies: + default-compare "^1.0.0" + get-value "^2.0.6" + kind-of "^5.0.2" + array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -4323,6 +4694,13 @@ atomic-sleep@^1.0.0: resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== +autolinker@~0.28.0: + version "0.28.1" + resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" + integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ== + dependencies: + gulp-header "^1.7.1" + available-typed-arrays@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" @@ -5243,6 +5621,18 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== +codemirror-spell-checker@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e" + integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ== + dependencies: + typo-js "*" + +codemirror@^5.63.1: + version "5.65.11" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.11.tgz#c818edc3274788c008f636520c5490a1f7009b4f" + integrity sha512-Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A== + collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -5393,6 +5783,13 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +concat-with-sourcemaps@*: + version "1.1.0" + resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" + integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== + dependencies: + source-map "^0.6.1" + condense-newlines@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f" @@ -5474,9 +5871,9 @@ cookie@^0.5.0: integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== cookiejar@^2.1.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc" - integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ== + version "2.1.4" + resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b" + integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw== cookies@~0.8.0: version "0.8.0" @@ -5780,6 +6177,13 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== +default-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" + integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== + dependencies: + kind-of "^5.0.2" + default-shell@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/default-shell/-/default-shell-1.0.1.tgz#752304bddc6174f49eb29cb988feea0b8813c8bc" @@ -5957,11 +6361,25 @@ doctrine@3.0.0, doctrine@^3.0.0: dependencies: esutils "^2.0.2" +dom-serializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" + integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + entities "^4.2.0" + dom-walk@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w== +domelementtype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== + domexception@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90" @@ -5969,6 +6387,22 @@ domexception@^1.0.1: dependencies: webidl-conversions "^4.0.2" +domhandler@^5.0.1, domhandler@^5.0.2: + version "5.0.3" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" + integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== + dependencies: + domelementtype "^2.3.0" + +domutils@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" + integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== + dependencies: + dom-serializer "^2.0.0" + domelementtype "^2.3.0" + domhandler "^5.0.1" + dot-prop@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" @@ -6013,6 +6447,11 @@ download@8.0.0: p-event "^2.1.0" pify "^4.0.1" +downloadjs@1.4.7: + version "1.4.7" + resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c" + integrity sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q== + duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" @@ -6028,6 +6467,17 @@ duplexify@^4.0.0: readable-stream "^3.1.1" stream-shift "^1.0.0" +easymde@^2.16.1: + version "2.18.0" + resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b" + integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA== + dependencies: + "@types/codemirror" "^5.60.4" + "@types/marked" "^4.0.7" + codemirror "^5.63.1" + codemirror-spell-checker "1.1.2" + marked "^4.1.0" + ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -6190,6 +6640,17 @@ end-stream@~0.1.0: dependencies: write-stream "~0.4.3" +engine.io-client@~6.2.3: + version "6.2.3" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz#a8cbdab003162529db85e9de31575097f6d29458" + integrity sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.1" + engine.io-parser "~5.0.3" + ws "~8.2.3" + xmlhttprequest-ssl "~2.0.0" + engine.io-parser@~5.0.3: version "5.0.4" resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0" @@ -6219,6 +6680,16 @@ enhanced-resolve@^5.9.3: graceful-fs "^4.2.4" tapable "^2.2.0" +ent@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" + integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== + +entities@^4.2.0, entities@^4.3.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== + entities@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" @@ -7224,6 +7695,11 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== +fs-exists-sync@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" + integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg== + fs-extra@8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -7372,6 +7848,14 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: has "^1.0.3" has-symbols "^1.0.3" +get-object@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" + integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ== + dependencies: + is-number "^2.0.2" + isobject "^0.2.0" + get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -7434,6 +7918,13 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== +get-value@^3.0.0, get-value@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" + integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== + dependencies: + isobject "^3.0.1" + getopts@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.3.0.tgz#71e5593284807e03e2427449d4f6712a268666f4" @@ -7703,7 +8194,24 @@ gtoken@^5.0.4: google-p12-pem "^3.1.3" jws "^4.0.0" -handlebars@^4.7.7: +gulp-header@^1.7.1: + version "1.8.12" + resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" + integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== + dependencies: + concat-with-sourcemaps "*" + lodash.template "^4.4.0" + through2 "^2.0.0" + +handlebars-utils@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" + integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== + dependencies: + kind-of "^6.0.0" + typeof-article "^0.1.1" + +handlebars@^4.7.6, handlebars@^4.7.7: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== @@ -7797,6 +8305,14 @@ has-value@^1.0.0: has-values "^1.0.0" isobject "^3.0.0" +has-value@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658" + integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA== + dependencies: + get-value "^3.0.0" + has-values "^2.0.1" + has-values@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" @@ -7810,6 +8326,13 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" +has-values@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d" + integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w== + dependencies: + kind-of "^6.0.2" + has-yarn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" @@ -7822,6 +8345,16 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" +helper-md@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" + integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q== + dependencies: + ent "^2.2.0" + extend-shallow "^2.0.1" + fs-exists-sync "^0.1.0" + remarkable "^1.6.2" + homedir-polyfill@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" @@ -7851,6 +8384,29 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== +html-tag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" + integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== + dependencies: + is-self-closing "^1.0.1" + kind-of "^6.0.0" + +html5-qrcode@^2.2.1: + version "2.3.4" + resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.4.tgz#7e2b4575a23b10ff5e26d2bf147c8027c1ece389" + integrity sha512-VPZrOTG8XR9HmIAhSSiGtJVPErZxKy/DuGc9cPQLburCWZEbvxQGJP9y4K4P+8vdalLtYB/vM5YP1BdWQKZ8jQ== + +htmlparser2@^8.0.0: + version "8.0.1" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" + integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + domutils "^3.0.1" + entities "^4.3.0" + http-assert@^1.3.0: version "1.5.0" resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f" @@ -8315,6 +8871,13 @@ is-docker@^2.0.0, is-docker@^2.1.1: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +is-even@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" + integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg== + dependencies: + is-odd "^0.1.2" + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -8421,6 +8984,13 @@ is-number-object@^1.0.4: dependencies: has-tostringtag "^1.0.0" +is-number@^2.0.2: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg== + dependencies: + kind-of "^3.0.2" + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -8443,6 +9013,13 @@ is-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== +is-odd@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" + integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw== + dependencies: + is-number "^3.0.0" + is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -8460,6 +9037,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" +is-plain-object@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== + is-property@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" @@ -8483,6 +9065,13 @@ is-retry-allowed@^2.2.0: resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d" integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg== +is-self-closing@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" + integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== + dependencies: + self-closing-tags "^1.0.1" + is-shared-array-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" @@ -8593,6 +9182,11 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== +isobject@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" + integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ== + isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -9782,7 +10376,7 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== @@ -9796,12 +10390,12 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0: +kind-of@^5.0.0, kind-of@^5.0.2: version "5.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -kind-of@^6.0.0, kind-of@^6.0.2: +kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -10017,6 +10611,11 @@ lcid@^2.0.0: dependencies: invert-kv "^2.0.0" +leaflet@^1.7.1: + version "1.9.3" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414" + integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ== + left-pad@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" @@ -10211,6 +10810,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash._reinterpolate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== + lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -10316,6 +10920,21 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== +lodash.template@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" + integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== + dependencies: + lodash._reinterpolate "^3.0.0" + lodash.templatesettings "^4.0.0" + +lodash.templatesettings@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" + integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== + dependencies: + lodash._reinterpolate "^3.0.0" + lodash.without@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac" @@ -10326,7 +10945,7 @@ lodash.xor@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6" integrity sha512-sVN2zimthq7aZ5sPGXnSz32rZPuqcparVW50chJQe+mzTYV+IsxSsl/2gnkWWE2Of7K3myBQBqtLKOUEHJKRsQ== -lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3: +lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -10473,6 +11092,11 @@ markdown-it@^12.2.0: mdurl "^1.0.1" uc.micro "^1.0.5" +marked@^4.1.0: + version "4.2.12" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5" + integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw== + matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -10568,7 +11192,7 @@ methods@^1.1.1, methods@^1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== -micromatch@^3.1.10, micromatch@^3.1.4: +micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.5: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -10866,6 +11490,16 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== +nanoid@^2.1.0: + version "2.1.11" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" + integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== + +nanoid@^3.3.4: + version "3.3.4" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" + integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -11534,6 +12168,11 @@ parse-passwd@^1.0.0: resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q== +parse-srcset@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1" + integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q== + parse5@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" @@ -11882,6 +12521,15 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== +postcss@^8.3.11: + version "8.4.21" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" + integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== + dependencies: + nanoid "^3.3.4" + picocolors "^1.0.0" + source-map-js "^1.0.2" + postgres-array@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" @@ -12653,6 +13301,16 @@ regexp.prototype.flags@^1.4.3: define-properties "^1.1.3" functions-have-names "^1.2.2" +regexparam@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa" + integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw== + +regexparam@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" + integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== + regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" @@ -12701,6 +13359,21 @@ relative-microtime@^2.0.0: resolved "https://registry.yarnpkg.com/relative-microtime/-/relative-microtime-2.0.0.tgz#cceed2af095ecd72ea32011279c79e5fcc7de29b" integrity sha512-l18ha6HEZc+No/uK4GyAnNxgKW7nvEe35IaeN54sShMojtqik2a6GbTyuiezkjpPaqP874Z3lW5ysBo5irz4NA== +relative@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" + integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA== + dependencies: + isobject "^2.0.0" + +remarkable@^1.6.2: + version "1.7.4" + resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" + integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== + dependencies: + argparse "^1.0.10" + autolinker "~0.28.0" + remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -12988,6 +13661,18 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" +sanitize-html@^2.7.0: + version "2.8.1" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.8.1.tgz#319c4fdba67e1edf35b1fd6d9362210044826d47" + integrity sha512-qK5neD0SaMxGwVv5txOYv05huC3o6ZAA4h5+7nJJgWMNFUNRjcjLO6FpwAtKzfKCZ0jrG6xTk6eVFskbvOGblg== + dependencies: + deepmerge "^4.2.2" + escape-string-regexp "^4.0.0" + htmlparser2 "^8.0.0" + is-plain-object "^5.0.0" + parse-srcset "^1.0.2" + postcss "^8.3.11" + sanitize-s3-objectkey@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e" @@ -13019,6 +13704,11 @@ schema-utils@^3.1.0, schema-utils@^3.1.1: ajv "^6.12.5" ajv-keywords "^3.5.2" +screenfull@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238" + integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw== + search-params@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/search-params/-/search-params-3.0.0.tgz#dbc7c243058e5a33ae1e9870be91f5aced4100d8" @@ -13036,6 +13726,11 @@ seek-bzip@^1.0.5: dependencies: commander "^2.8.1" +self-closing-tags@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" + integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== + semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" @@ -13188,6 +13883,13 @@ shimmer@^1.2.0: resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== +shortid@^2.2.15: + version "2.2.16" + resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" + integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== + dependencies: + nanoid "^2.1.0" + side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -13328,6 +14030,16 @@ socket.io-adapter@~2.4.0: resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6" integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg== +socket.io-client@^4.5.1: + version "4.5.4" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.4.tgz#d3cde8a06a6250041ba7390f08d2468ccebc5ac9" + integrity sha512-ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.2" + engine.io-client "~6.2.3" + socket.io-parser "~4.2.1" + socket.io-parser@~4.2.0: version "4.2.1" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" @@ -13336,6 +14048,14 @@ socket.io-parser@~4.2.0: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" +socket.io-parser@~4.2.1: + version "4.2.2" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206" + integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.1" + socket.io@^4.5.1: version "4.5.2" resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.2.tgz#1eb25fd380ab3d63470aa8279f8e48d922d443ac" @@ -13390,6 +14110,11 @@ source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +source-map-js@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== + source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -13789,6 +14514,11 @@ strip-outer@^1.0.0: dependencies: escape-string-regexp "^1.0.2" +striptags@^3.1.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" + integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== + style-loader@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575" @@ -13888,11 +14618,23 @@ svelte-portal@^1.0.0: resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== +svelte-spa-router@^3.0.5: + version "3.3.0" + resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c" + integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ== + dependencies: + regexparam "2.0.1" + svelte@3.49.0: version "3.49.0" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029" integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA== +svelte@^3.46.2, svelte@^3.49.0: + version "3.55.1" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.55.1.tgz#6f93b153e5248039906ce5fe196efdb9e05dfce8" + integrity sha512-S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ== + svg.draggable.js@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba" @@ -14245,6 +14987,11 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= +to-gfm-code-block@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" + integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg== + to-json-schema@0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/to-json-schema/-/to-json-schema-0.2.5.tgz#ef3c3f11ad64460dcfbdbafd0fd525d69d62a98f" @@ -14513,6 +15260,13 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" +typeof-article@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" + integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw== + dependencies: + kind-of "^3.1.0" + typeof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/typeof/-/typeof-1.0.0.tgz#9c84403f2323ae5399167275497638ea1d2f2440" @@ -14523,6 +15277,11 @@ typescript@4.7.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== +typo-js@*: + version "1.2.2" + resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b" + integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== + uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" @@ -14873,6 +15632,14 @@ vm2@3.9.11: acorn "^8.7.0" acorn-walk "^8.2.0" +vm2@^3.9.4: + version "3.9.13" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.13.tgz#774a1a3d73b9b90b1aa45bcc5f25e349f2eef649" + integrity sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.0" + vuvuzela@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" @@ -15296,6 +16063,11 @@ xmlbuilder@~9.0.1: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= +xmlhttprequest-ssl@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" + integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== + xpath.js@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1" @@ -15434,6 +16206,11 @@ yauzl@^2.4.2: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" +year@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" + integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w== + ylru@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785" From 41847876e4113fd7bb5d7955dd597762c21b491a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 23:29:29 +0000 Subject: [PATCH 190/387] Bump cookiejar from 2.1.3 to 2.1.4 in /packages/sdk (#9415) Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.3 to 2.1.4. - [Release notes](https://github.com/bmeck/node-cookiejar/releases) - [Commits](https://github.com/bmeck/node-cookiejar/commits) --- updated-dependencies: - dependency-name: cookiejar dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/sdk/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sdk/yarn.lock b/packages/sdk/yarn.lock index 4e8d6d718f..c3106e4ed7 100644 --- a/packages/sdk/yarn.lock +++ b/packages/sdk/yarn.lock @@ -225,9 +225,9 @@ concat-map@0.0.1: integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== cookiejar@^2.1.2: - version "2.1.3" - resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc" - integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ== + version "2.1.4" + resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b" + integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw== debug@^4.1.1: version "4.3.4" From 38e729d6cd9a14ee308611dd69ba848fd5a553da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 23:29:42 +0000 Subject: [PATCH 191/387] Bump cookiejar from 2.1.3 to 2.1.4 in /packages/worker (#9416) Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.3 to 2.1.4. - [Release notes](https://github.com/bmeck/node-cookiejar/releases) - [Commits](https://github.com/bmeck/node-cookiejar/commits) --- updated-dependencies: - dependency-name: cookiejar dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- packages/worker/yarn.lock | 912 +++++++++++++++++++++++++++++++++++++- 1 file changed, 898 insertions(+), 14 deletions(-) diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 3e85190c9b..a6dc41315a 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -509,6 +509,31 @@ uuid "8.3.2" zlib "1.0.5" +"@budibase/handlebars-helpers@^0.11.8": + version "0.11.8" + resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" + integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ== + dependencies: + array-sort "^1.0.0" + define-property "^2.0.2" + extend-shallow "^3.0.2" + for-in "^1.0.2" + get-object "^0.2.0" + get-value "^3.0.1" + handlebars "^4.7.7" + handlebars-utils "^1.0.6" + has-value "^2.0.2" + helper-md "^0.2.2" + html-tag "^2.0.0" + is-even "^1.0.0" + is-glob "^4.0.1" + kind-of "^6.0.3" + micromatch "^3.1.5" + relative "^3.0.2" + striptags "^3.1.1" + to-gfm-code-block "^0.1.1" + year "^0.2.1" + "@budibase/nano@10.1.1": version "10.1.1" resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038" @@ -534,6 +559,18 @@ jsonwebtoken "8.5.1" node-fetch "^2.6.1" +"@budibase/string-templates@2.2.12-alpha.34": + version "2.2.12-alpha.34" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.2.12-alpha.34.tgz#47a9842bbe8cf973f5537021a16aa912517c1d02" + integrity sha512-ybGtHnLOAsEXGgNk9h3SlQ3jSDh6UUkrZB07zUEhBoxJ4w2qk+x/HvTsLMYLVmKidQcWx6cfSbhLrIupn+OZRw== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.4" + "@budibase/types@2.2.12-alpha.34": version "2.2.12-alpha.34" resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.34.tgz#1f1b9993221f4f43cb300d08870a5a81736d4bd1" @@ -1788,7 +1825,7 @@ acorn-jsx@^5.2.0: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-walk@^8.1.1: +acorn-walk@^8.1.1, acorn-walk@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== @@ -1808,6 +1845,11 @@ acorn@^8.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== +acorn@^8.7.0: + version "8.8.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" + integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== + after-all-results@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/after-all-results/-/after-all-results-2.0.0.tgz#6ac2fc202b500f88da8f4f5530cfa100f4c6a2d0" @@ -1913,7 +1955,7 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.7: +argparse@^1.0.10, argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -1935,11 +1977,40 @@ argsarray@0.0.1: resolved "https://registry.yarnpkg.com/argsarray/-/argsarray-0.0.1.tgz#6e7207b4ecdb39b0af88303fa5ae22bda8df61cb" integrity sha512-u96dg2GcAKtpTrBdDoFIM7PjcBA+6rSP0OR94MOReNRyUECL6MtQt5XXmRr4qrftYaef9+l5hcpO5te7sML1Cg== +arr-diff@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" + integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA== + +arr-flatten@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" + integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== + +arr-union@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" + integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== + +array-sort@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" + integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== + dependencies: + default-compare "^1.0.0" + get-value "^2.0.6" + kind-of "^5.0.2" + array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== +array-unique@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" + integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== + asap@^2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" @@ -1957,6 +2028,11 @@ assert-plus@1.0.0, assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== +assign-symbols@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" + integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== + ast-types@0.9.6: version "0.9.6" resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9" @@ -1991,11 +2067,23 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== +atob@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" + integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== + atomic-sleep@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== +autolinker@~0.28.0: + version "0.28.1" + resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" + integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ== + dependencies: + gulp-header "^1.7.1" + aws-cloudfront-sign@2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/aws-cloudfront-sign/-/aws-cloudfront-sign-2.2.0.tgz#3910f5a6d0d90fec07f2b4ef8ab07f3eefb5625d" @@ -2132,6 +2220,19 @@ base64url@3.x.x, base64url@^3.0.1: resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d" integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A== +base@^0.11.1: + version "0.11.2" + resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" + integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== + dependencies: + cache-base "^1.0.1" + class-utils "^0.3.5" + component-emitter "^1.2.1" + define-property "^1.0.0" + isobject "^3.0.1" + mixin-deep "^1.2.0" + pascalcase "^0.1.1" + basic-auth@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" @@ -2210,6 +2311,22 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +braces@^2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" + integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== + dependencies: + arr-flatten "^1.1.0" + array-unique "^0.3.2" + extend-shallow "^2.0.1" + fill-range "^4.0.0" + isobject "^3.0.1" + repeat-element "^1.1.2" + snapdragon "^0.8.1" + snapdragon-node "^2.0.1" + split-string "^3.0.2" + to-regex "^3.0.1" + braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -2311,6 +2428,21 @@ bytes@3.1.2, bytes@^3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== +cache-base@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" + integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== + dependencies: + collection-visit "^1.0.0" + component-emitter "^1.2.1" + get-value "^2.0.6" + has-value "^1.0.0" + isobject "^3.0.1" + set-value "^2.0.0" + to-object-path "^0.3.0" + union-value "^1.0.0" + unset-value "^1.0.0" + cache-content-type@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c" @@ -2465,6 +2597,16 @@ cjs-module-lexer@^1.0.0: resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== +class-utils@^0.3.5: + version "0.3.6" + resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" + integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== + dependencies: + arr-union "^3.1.0" + define-property "^0.2.5" + isobject "^3.0.0" + static-extend "^0.1.1" + cli-boxes@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" @@ -2537,6 +2679,14 @@ collect-v8-coverage@^1.0.0: resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== +collection-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" + integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw== + dependencies: + map-visit "^1.0.0" + object-visit "^1.0.0" + color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -2593,7 +2743,7 @@ commoner@^0.10.1: q "^1.1.2" recast "^0.11.17" -component-emitter@^1.3.0: +component-emitter@^1.2.1, component-emitter@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== @@ -2623,6 +2773,13 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +concat-with-sourcemaps@*: + version "1.1.0" + resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" + integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== + dependencies: + source-map "^0.6.1" + configstore@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" @@ -2680,9 +2837,9 @@ cookie@^0.5.0: integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== cookiejar@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc" - integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ== + version "2.1.4" + resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b" + integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw== cookies@~0.8.0: version "0.8.0" @@ -2692,6 +2849,11 @@ cookies@~0.8.0: depd "~2.0.0" keygrip "~1.1.0" +copy-descriptor@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" + integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== + copyfiles@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.1.tgz#d2dcff60aaad1015f09d0b66e7f0f1c5cd3c5da5" @@ -2783,6 +2945,11 @@ dateformat@^4.5.1: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== +dayjs@^1.10.4: + version "1.11.7" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" + integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== + debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -2790,6 +2957,13 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, d dependencies: ms "2.1.2" +debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + debug@^3.1.0, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -2802,6 +2976,11 @@ debuglog@^1.0.0: resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw== +decode-uri-component@^0.2.0: + version "0.2.2" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" + integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== + decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" @@ -2841,6 +3020,13 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== +default-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" + integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== + dependencies: + kind-of "^5.0.2" + defer-to-connect@^1.0.1: version "1.1.3" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" @@ -2867,6 +3053,28 @@ define-properties@^1.1.3, define-properties@^1.1.4: has-property-descriptors "^1.0.0" object-keys "^1.1.1" +define-property@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" + integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA== + dependencies: + is-descriptor "^0.1.0" + +define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" + integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA== + dependencies: + is-descriptor "^1.0.0" + +define-property@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" + integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== + dependencies: + is-descriptor "^1.0.2" + isobject "^3.0.1" + defined@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" @@ -3124,6 +3332,11 @@ end-stream@~0.1.0: dependencies: write-stream "~0.4.3" +ent@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" + integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== + errno@~0.1.1: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" @@ -3388,6 +3601,19 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== +expand-brackets@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" + integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA== + dependencies: + debug "^2.3.3" + define-property "^0.2.5" + extend-shallow "^2.0.1" + posix-character-classes "^0.1.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + expect@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.3.tgz#90a7c1a124f1824133dd4533cce2d2bdcb6603ec" @@ -3399,6 +3625,21 @@ expect@^28.1.3: jest-message-util "^28.1.3" jest-util "^28.1.3" +extend-shallow@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" + integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug== + dependencies: + is-extendable "^0.1.0" + +extend-shallow@^3.0.0, extend-shallow@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" + integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q== + dependencies: + assign-symbols "^1.0.0" + is-extendable "^1.0.1" + extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" @@ -3413,6 +3654,20 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" +extglob@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" + integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== + dependencies: + array-unique "^0.3.2" + define-property "^1.0.0" + expand-brackets "^2.1.4" + extend-shallow "^2.0.1" + fragment-cache "^0.2.1" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -3525,6 +3780,16 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" +fill-range@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" + integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ== + dependencies: + extend-shallow "^2.0.1" + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range "^2.1.0" + fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -3569,6 +3834,11 @@ follow-redirects@^1.15.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== +for-in@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" + integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ== + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -3621,6 +3891,13 @@ forwarded-parse@^2.1.0: resolved "https://registry.yarnpkg.com/forwarded-parse/-/forwarded-parse-2.1.2.tgz#08511eddaaa2ddfd56ba11138eee7df117a09325" integrity sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw== +fragment-cache@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" + integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA== + dependencies: + map-cache "^0.2.2" + fresh@^0.5.2, fresh@~0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" @@ -3631,6 +3908,11 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== +fs-exists-sync@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" + integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg== + fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -3707,6 +3989,14 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: has "^1.0.3" has-symbols "^1.0.3" +get-object@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" + integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ== + dependencies: + is-number "^2.0.2" + isobject "^0.2.0" + get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -3744,6 +4034,18 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" +get-value@^2.0.3, get-value@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" + integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== + +get-value@^3.0.0, get-value@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" + integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== + dependencies: + isobject "^3.0.1" + getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -3870,6 +4172,35 @@ graceful-fs@^4.1.2, graceful-fs@^4.2.9: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== +gulp-header@^1.7.1: + version "1.8.12" + resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" + integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== + dependencies: + concat-with-sourcemaps "*" + lodash.template "^4.4.0" + through2 "^2.0.0" + +handlebars-utils@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" + integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== + dependencies: + kind-of "^6.0.0" + typeof-article "^0.1.1" + +handlebars@^4.7.6, handlebars@^4.7.7: + version "4.7.7" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" + integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== + dependencies: + minimist "^1.2.5" + neo-async "^2.6.0" + source-map "^0.6.1" + wordwrap "^1.0.0" + optionalDependencies: + uglify-js "^3.1.4" + har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -3922,6 +4253,52 @@ has-unicode@^2.0.1: resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== +has-value@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" + integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q== + dependencies: + get-value "^2.0.3" + has-values "^0.1.4" + isobject "^2.0.0" + +has-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" + integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw== + dependencies: + get-value "^2.0.6" + has-values "^1.0.0" + isobject "^3.0.0" + +has-value@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658" + integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA== + dependencies: + get-value "^3.0.0" + has-values "^2.0.1" + +has-values@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" + integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ== + +has-values@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" + integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ== + dependencies: + is-number "^3.0.0" + kind-of "^4.0.0" + +has-values@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d" + integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w== + dependencies: + kind-of "^6.0.2" + has-yarn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" @@ -3934,6 +4311,16 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" +helper-md@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" + integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q== + dependencies: + ent "^2.2.0" + extend-shallow "^2.0.1" + fs-exists-sync "^0.1.0" + remarkable "^1.6.2" + hexoid@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18" @@ -3944,6 +4331,14 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== +html-tag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" + integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== + dependencies: + is-self-closing "^1.0.1" + kind-of "^6.0.0" + http-assert@^1.3.0: version "1.5.0" resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f" @@ -4203,6 +4598,20 @@ ioredis@^4.28.5: redis-parser "^3.0.0" standard-as-callback "^2.1.0" +is-accessor-descriptor@^0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" + integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A== + dependencies: + kind-of "^3.0.2" + +is-accessor-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" + integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== + dependencies: + kind-of "^6.0.0" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -4230,7 +4639,7 @@ is-boolean-object@^1.1.0: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-buffer@~1.1.6: +is-buffer@^1.1.5, is-buffer@~1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== @@ -4266,6 +4675,20 @@ is-core-module@^2.9.0: dependencies: has "^1.0.3" +is-data-descriptor@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" + integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg== + dependencies: + kind-of "^3.0.2" + +is-data-descriptor@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" + integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== + dependencies: + kind-of "^6.0.0" + is-date-object@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" @@ -4273,6 +4696,43 @@ is-date-object@^1.0.1: dependencies: has-tostringtag "^1.0.0" +is-descriptor@^0.1.0: + version "0.1.6" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" + integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== + dependencies: + is-accessor-descriptor "^0.1.6" + is-data-descriptor "^0.1.4" + kind-of "^5.0.0" + +is-descriptor@^1.0.0, is-descriptor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" + integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== + dependencies: + is-accessor-descriptor "^1.0.0" + is-data-descriptor "^1.0.0" + kind-of "^6.0.2" + +is-even@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" + integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg== + dependencies: + is-odd "^0.1.2" + +is-extendable@^0.1.0, is-extendable@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" + integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw== + +is-extendable@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" + integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== + dependencies: + is-plain-object "^2.0.4" + is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -4357,6 +4817,20 @@ is-number-object@^1.0.4: dependencies: has-tostringtag "^1.0.0" +is-number@^2.0.2: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg== + dependencies: + kind-of "^3.0.2" + +is-number@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" + integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg== + dependencies: + kind-of "^3.0.2" + is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -4367,11 +4841,25 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== +is-odd@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" + integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw== + dependencies: + is-number "^3.0.0" + is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== +is-plain-object@^2.0.3, is-plain-object@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" + integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== + dependencies: + isobject "^3.0.1" + is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -4385,6 +4873,13 @@ is-retry-allowed@^2.2.0: resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d" integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg== +is-self-closing@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" + integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== + dependencies: + self-closing-tags "^1.0.1" + is-shared-array-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" @@ -4432,6 +4927,11 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" +is-windows@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" + integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== + is-yarn-global@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" @@ -4442,7 +4942,7 @@ isarray@0.0.1: resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== -isarray@^1.0.0, isarray@~1.0.0: +isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== @@ -4452,6 +4952,23 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== +isobject@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" + integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ== + +isobject@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" + integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA== + dependencies: + isarray "1.0.0" + +isobject@^3.0.0, isobject@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== + isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" @@ -5052,6 +5569,30 @@ keyv@^4.0.0: compress-brotli "^1.3.8" json-buffer "3.0.1" +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: + version "3.2.2" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" + integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== + dependencies: + is-buffer "^1.1.5" + +kind-of@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" + integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw== + dependencies: + is-buffer "^1.1.5" + +kind-of@^5.0.0, kind-of@^5.0.2: + version "5.1.0" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" + integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== + +kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + kleur@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" @@ -5298,6 +5839,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash._reinterpolate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== + lodash.defaults@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" @@ -5363,7 +5909,22 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== -lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21: +lodash.template@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" + integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== + dependencies: + lodash._reinterpolate "^3.0.0" + lodash.templatesettings "^4.0.0" + +lodash.templatesettings@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" + integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== + dependencies: + lodash._reinterpolate "^3.0.0" + +lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5432,6 +5993,18 @@ makeerror@1.0.12: dependencies: tmpl "1.0.5" +map-cache@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" + integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg== + +map-visit@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" + integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w== + dependencies: + object-visit "^1.0.0" + mapcap@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/mapcap/-/mapcap-1.0.0.tgz#e8e29d04a160eaf8c92ec4bcbd2c5d07ed037e5a" @@ -5508,6 +6081,25 @@ methods@^1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== +micromatch@^3.1.5: + version "3.1.10" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" + integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + braces "^2.3.1" + define-property "^2.0.2" + extend-shallow "^3.0.2" + extglob "^2.0.4" + fragment-cache "^0.2.1" + kind-of "^6.0.2" + nanomatch "^1.2.9" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.2" + micromatch@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" @@ -5565,6 +6157,11 @@ minimist@^1.2.0, minimist@^1.2.6: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== +minimist@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== + minipass@^3.0.0: version "3.1.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" @@ -5580,6 +6177,14 @@ minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" +mixin-deep@^1.2.0: + version "1.3.2" + resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" + integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== + dependencies: + for-in "^1.0.2" + is-extendable "^1.0.1" + mkdirp-classic@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" @@ -5612,6 +6217,11 @@ mri@1.1.4: resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.4.tgz#7cb1dd1b9b40905f1fac053abe25b6720f44744a" integrity sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w== +ms@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== + ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -5648,6 +6258,23 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +nanomatch@^1.2.9: + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" + integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== + dependencies: + arr-diff "^4.0.0" + array-unique "^0.3.2" + define-property "^2.0.2" + extend-shallow "^3.0.2" + fragment-cache "^0.2.1" + is-windows "^1.0.2" + kind-of "^6.0.2" + object.pick "^1.3.0" + regex-not "^1.0.0" + snapdragon "^0.8.1" + to-regex "^3.0.1" + napi-macros@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b" @@ -5673,6 +6300,11 @@ negotiator@0.6.3: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== +neo-async@^2.6.0: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== + next-line@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/next-line/-/next-line-1.1.0.tgz#fcae57853052b6a9bae8208e40dd7d3c2d304603" @@ -5841,6 +6473,15 @@ object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== +object-copy@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" + integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ== + dependencies: + copy-descriptor "^0.1.0" + define-property "^0.2.5" + kind-of "^3.0.3" + object-filter-sequence@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/object-filter-sequence/-/object-filter-sequence-1.0.0.tgz#10bb05402fff100082b80d7e83991b10db411692" @@ -5863,6 +6504,13 @@ object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== +object-visit@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" + integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA== + dependencies: + isobject "^3.0.0" + object.assign@^4.1.2: version "4.1.4" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" @@ -5882,6 +6530,13 @@ object.entries@^1.0.4, object.entries@^1.1.0: define-properties "^1.1.3" es-abstract "^1.19.1" +object.pick@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" + integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== + dependencies: + isobject "^3.0.1" + on-finished@^2.3.0: version "2.4.1" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" @@ -6022,6 +6677,11 @@ parseurl@^1.3.2, parseurl@^1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== +pascalcase@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" + integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== + passport-google-oauth1@1.x.x: version "1.0.0" resolved "https://registry.yarnpkg.com/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz#af74a803df51ec646f66a44d82282be6f108e0cc" @@ -6216,6 +6876,11 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" +posix-character-classes@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" + integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== + posthog-node@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/posthog-node/-/posthog-node-1.3.0.tgz#804ed2f213a2f05253f798bf9569d55a9cad94f7" @@ -6748,6 +7413,14 @@ regenerator-runtime@^0.13.4: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== +regex-not@^1.0.0, regex-not@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" + integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== + dependencies: + extend-shallow "^3.0.2" + safe-regex "^1.1.0" + regexp.prototype.flags@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" @@ -6781,11 +7454,36 @@ relative-microtime@^2.0.0: resolved "https://registry.yarnpkg.com/relative-microtime/-/relative-microtime-2.0.0.tgz#cceed2af095ecd72ea32011279c79e5fcc7de29b" integrity sha512-l18ha6HEZc+No/uK4GyAnNxgKW7nvEe35IaeN54sShMojtqik2a6GbTyuiezkjpPaqP874Z3lW5ysBo5irz4NA== +relative@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" + integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA== + dependencies: + isobject "^2.0.0" + +remarkable@^1.6.2: + version "1.7.4" + resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" + integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== + dependencies: + argparse "^1.0.10" + autolinker "~0.28.0" + remove-trailing-slash@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz#be2285a59f39c74d1bce4f825950061915e3780d" integrity sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA== +repeat-element@^1.1.2: + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== + +repeat-string@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== + request@^2.88.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" @@ -6861,6 +7559,11 @@ resolve-path@^1.4.0: http-errors "~1.6.2" path-is-absolute "1.0.1" +resolve-url@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" + integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== + resolve.exports@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" @@ -6906,6 +7609,11 @@ restore-cursor@^3.1.0: onetime "^5.1.0" signal-exit "^3.0.2" +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -6971,6 +7679,13 @@ safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== +safe-regex@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" + integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg== + dependencies: + ret "~0.1.10" + "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -6991,6 +7706,11 @@ sax@>=0.1.1, sax@>=0.6.0: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== +self-closing-tags@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" + integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== + semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" @@ -7049,6 +7769,16 @@ set-cookie-serde@^1.0.0: resolved "https://registry.yarnpkg.com/set-cookie-serde/-/set-cookie-serde-1.0.0.tgz#bcf9c260ed2212ac4005a53eacbaaa37c07ac452" integrity sha512-Vq8e5GsupfJ7okHIvEPcfs5neCo7MZ1ZuWrO3sllYi3DOWt6bSSCpADzqXjz3k0fXehnoFIrmmhty9IN6U6BXQ== +set-value@^2.0.0, set-value@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" + integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== + dependencies: + extend-shallow "^2.0.1" + is-extendable "^0.1.1" + is-plain-object "^2.0.3" + split-string "^3.0.1" + setprototypeof@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" @@ -7126,6 +7856,36 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +snapdragon-node@^2.0.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" + integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== + dependencies: + define-property "^1.0.0" + isobject "^3.0.0" + snapdragon-util "^3.0.1" + +snapdragon-util@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" + integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== + dependencies: + kind-of "^3.2.0" + +snapdragon@^0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" + integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== + dependencies: + base "^0.11.1" + debug "^2.2.0" + define-property "^0.2.5" + extend-shallow "^2.0.1" + map-cache "^0.2.2" + source-map "^0.5.6" + source-map-resolve "^0.5.0" + use "^3.1.0" + sonic-boom@^1.0.2: version "1.4.1" resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-1.4.1.tgz#d35d6a74076624f12e6f917ade7b9d75e918f53e" @@ -7134,6 +7894,17 @@ sonic-boom@^1.0.2: atomic-sleep "^1.0.0" flatstr "^1.0.12" +source-map-resolve@^0.5.0: + version "0.5.3" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" + integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== + dependencies: + atob "^2.1.2" + decode-uri-component "^0.2.0" + resolve-url "^0.2.1" + source-map-url "^0.4.0" + urix "^0.1.0" + source-map-support@0.5.13: version "0.5.13" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" @@ -7142,6 +7913,11 @@ source-map-support@0.5.13: buffer-from "^1.0.0" source-map "^0.6.0" +source-map-url@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" + integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== + source-map@^0.4.2: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" @@ -7149,6 +7925,11 @@ source-map@^0.4.2: dependencies: amdefine ">=0.0.4" +source-map@^0.5.6, source-map@~0.5.0: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== + source-map@^0.6.0, source-map@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" @@ -7161,11 +7942,6 @@ source-map@^0.8.0-beta.0: dependencies: whatwg-url "^7.0.0" -source-map@~0.5.0: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== - spark-md5@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.1.tgz#83a0e255734f2ab4e5c466e5a2cfc9ba2aa2124d" @@ -7176,6 +7952,13 @@ spark-md5@3.0.2: resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== +split-string@^3.0.1, split-string@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" + integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== + dependencies: + extend-shallow "^3.0.0" + split2@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493" @@ -7237,6 +8020,14 @@ standard-as-callback@^2.1.0: resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45" integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A== +static-extend@^0.1.1: + version "0.1.2" + resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" + integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g== + dependencies: + define-property "^0.2.5" + object-copy "^0.1.0" + statuses@2.0.1, statuses@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" @@ -7366,6 +8157,11 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== +striptags@^3.1.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" + integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== + sublevel-pouchdb@7.2.2: version "7.2.2" resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.2.2.tgz#49e46cd37883bf7ff5006d7c5b9bcc7bcc1f422f" @@ -7548,11 +8344,31 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= +to-gfm-code-block@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" + integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg== + +to-object-path@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg== + dependencies: + kind-of "^3.0.2" + to-readable-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== +to-regex-range@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" + integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg== + dependencies: + is-number "^3.0.0" + repeat-string "^1.6.1" + to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -7560,6 +8376,16 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" +to-regex@^3.0.1, to-regex@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" + integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== + dependencies: + define-property "^2.0.2" + extend-shallow "^3.0.2" + regex-not "^1.0.2" + safe-regex "^1.1.0" + to-source-code@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/to-source-code/-/to-source-code-1.0.2.tgz#dd136bdb1e1dbd80bbeacf088992678e9070bfea" @@ -7741,11 +8567,23 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" +typeof-article@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" + integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw== + dependencies: + kind-of "^3.1.0" + typescript@4.7.3: version "4.7.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== +uglify-js@^3.1.4: + version "3.17.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" + integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== + uid2@0.0.x: version "0.0.4" resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz#033f3b1d5d32505f5ce5f888b9f3b667123c0a44" @@ -7779,6 +8617,16 @@ unicode-substring@^0.1.0: resolved "https://registry.yarnpkg.com/unicode-substring/-/unicode-substring-0.1.0.tgz#6120ce3c390385dbcd0f60c32b9065c4181d4b36" integrity sha512-36Xaw9wXi7MB/3/EQZZHkZyyiRNa9i3k9YtPAz2KfqMVH2xutdXyMHn4Igarmnvr+wOrfWa/6njhY+jPpXN2EQ== +union-value@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" + integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== + dependencies: + arr-union "^3.1.0" + get-value "^2.0.6" + is-extendable "^0.1.1" + set-value "^2.0.1" + unique-string@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" @@ -7801,6 +8649,14 @@ unpipe@1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= +unset-value@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" + integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ== + dependencies: + has-value "^0.3.1" + isobject "^3.0.0" + untildify@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" @@ -7851,6 +8707,11 @@ urijs@^1.19.2: resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc" integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ== +urix@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" + integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg== + url-parse-lax@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" @@ -7874,6 +8735,11 @@ url@0.10.3: punycode "1.3.2" querystring "0.2.0" +use@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" + integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== + util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -7937,6 +8803,14 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +vm2@^3.9.4: + version "3.9.13" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.13.tgz#774a1a3d73b9b90b1aa45bcc5f25e349f2eef649" + integrity sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.0" + vuvuzela@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" @@ -8028,6 +8902,11 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +wordwrap@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== + wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -8155,6 +9034,11 @@ yargs@^17.3.1: y18n "^5.0.5" yargs-parser "^21.1.1" +year@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" + integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w== + ylru@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785" From 6b375f8f466df6a5f8ab259e6d13b982cb2d6079 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 23 Jan 2023 23:49:38 +0000 Subject: [PATCH 192/387] v2.2.12-alpha.35 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 7c81df52ba..fa4cea6971 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.34", + "version": "2.2.12-alpha.35", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f0bcbd54cb..2344dc27ae 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.34", + "version": "2.2.12-alpha.35", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.34", + "@budibase/types": "2.2.12-alpha.35", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index ed4f9a93b7..7c6ccfcc38 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.34", + "version": "2.2.12-alpha.35", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.34", + "@budibase/string-templates": "2.2.12-alpha.35", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 69c0c1dc3c..fca2f69bc6 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.34", + "version": "2.2.12-alpha.35", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.34", - "@budibase/client": "2.2.12-alpha.34", - "@budibase/frontend-core": "2.2.12-alpha.34", - "@budibase/string-templates": "2.2.12-alpha.34", + "@budibase/bbui": "2.2.12-alpha.35", + "@budibase/client": "2.2.12-alpha.35", + "@budibase/frontend-core": "2.2.12-alpha.35", + "@budibase/string-templates": "2.2.12-alpha.35", "@sentry/browser": "5.19.1", "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 46064d7a52..408c76a762 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.34", + "version": "2.2.12-alpha.35", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.34", - "@budibase/string-templates": "2.2.12-alpha.34", - "@budibase/types": "2.2.12-alpha.34", + "@budibase/backend-core": "2.2.12-alpha.35", + "@budibase/string-templates": "2.2.12-alpha.35", + "@budibase/types": "2.2.12-alpha.35", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index f1b384e3a6..33b9aa82f4 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.34", + "version": "2.2.12-alpha.35", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.34", - "@budibase/frontend-core": "2.2.12-alpha.34", - "@budibase/string-templates": "2.2.12-alpha.34", + "@budibase/bbui": "2.2.12-alpha.35", + "@budibase/frontend-core": "2.2.12-alpha.35", + "@budibase/string-templates": "2.2.12-alpha.35", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index a612ab26b3..dc45bb9a9a 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.34", + "version": "2.2.12-alpha.35", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.34", + "@budibase/bbui": "2.2.12-alpha.35", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0a1c37690e..0a870d9b0e 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.34", + "version": "2.2.12-alpha.35", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 4440c6bd68..41059ee9bf 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.34", + "version": "2.2.12-alpha.35", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.34", - "@budibase/client": "2.2.12-alpha.34", + "@budibase/backend-core": "2.2.12-alpha.35", + "@budibase/client": "2.2.12-alpha.35", "@budibase/pro": "2.2.12-alpha.34", - "@budibase/string-templates": "2.2.12-alpha.34", - "@budibase/types": "2.2.12-alpha.34", + "@budibase/string-templates": "2.2.12-alpha.35", + "@budibase/types": "2.2.12-alpha.35", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index e0d2f109e2..d0b72e9175 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.34", + "version": "2.2.12-alpha.35", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 657430c8bf..4f296c9e6b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.34", + "version": "2.2.12-alpha.35", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 4f86e6d0e3..64e1dadf78 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.34", + "version": "2.2.12-alpha.35", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.34", + "@budibase/backend-core": "2.2.12-alpha.35", "@budibase/pro": "2.2.12-alpha.34", - "@budibase/string-templates": "2.2.12-alpha.34", - "@budibase/types": "2.2.12-alpha.34", + "@budibase/string-templates": "2.2.12-alpha.35", + "@budibase/types": "2.2.12-alpha.35", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 19dd8f66fab7a3a8ed9a75f690abdf7dd0576cdf Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 23 Jan 2023 23:53:01 +0000 Subject: [PATCH 193/387] Update pro version to 2.2.12-alpha.35 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 827 +------------------------------ packages/worker/package.json | 2 +- packages/worker/yarn.lock | 936 +---------------------------------- 4 files changed, 53 insertions(+), 1714 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 41059ee9bf..db493c2b8a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.35", "@budibase/client": "2.2.12-alpha.35", - "@budibase/pro": "2.2.12-alpha.34", + "@budibase/pro": "2.2.12-alpha.35", "@budibase/string-templates": "2.2.12-alpha.35", "@budibase/types": "2.2.12-alpha.35", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 5093584e46..69a75c4166 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -2,11 +2,6 @@ # yarn lockfile v1 -"@adobe/spectrum-css-workflow-icons@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4" - integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w== - "@adobe/spectrum-css-workflow-icons@^1.2.1": version "1.5.3" resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.5.3.tgz#5e31ce842b7626f4b99f9d5cd0b17599d287b0bf" @@ -1278,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.34": - version "2.2.12-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.34.tgz#0e2042ab8b2e52bf04c672283a50e153a3157e88" - integrity sha512-cViRaNxmi3RmAOZpBlRtFEj7l6umJjgB1k8B3J6KArvdxezZmV0smQrpX4colDLJhRfm1O5vQm6oigxGgZRpXg== +"@budibase/backend-core@2.2.12-alpha.35": + version "2.2.12-alpha.35" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.35.tgz#36045cdccee548d86a5d0951606d41d0de96bd5c" + integrity sha512-CdIioYKH6y8KQRMWJ2esiOeCOOs3RIGGAAY7DYw71ejjxtCcAZ8Fnez+xIgTFqI6Hee64HjMbX2Tc3OO4J/Kxg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.34" + "@budibase/types" "2.2.12-alpha.35" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1317,60 +1312,6 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/bbui@2.2.12-alpha.34": - version "2.2.12-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.2.12-alpha.34.tgz#b8e27b325ffc01f9b392e7c9a908a7f9bd99f3b4" - integrity sha512-URCaj2QwlnX9XWaDBTx1CAB0Rj+fhfZO1Ch+VZycHiVYEOxL+ljKy4Xe1cd8e8nfPXuKpBtdkow6qdfM11KNKA== - dependencies: - "@adobe/spectrum-css-workflow-icons" "1.2.1" - "@budibase/string-templates" "2.2.12-alpha.34" - "@spectrum-css/accordion" "3.0.24" - "@spectrum-css/actionbutton" "1.0.1" - "@spectrum-css/actiongroup" "1.0.1" - "@spectrum-css/avatar" "3.0.2" - "@spectrum-css/button" "3.0.1" - "@spectrum-css/buttongroup" "3.0.2" - "@spectrum-css/checkbox" "3.0.2" - "@spectrum-css/dialog" "3.0.1" - "@spectrum-css/divider" "1.0.3" - "@spectrum-css/dropzone" "3.0.2" - "@spectrum-css/fieldgroup" "3.0.2" - "@spectrum-css/fieldlabel" "3.0.1" - "@spectrum-css/icon" "3.0.1" - "@spectrum-css/illustratedmessage" "3.0.2" - "@spectrum-css/inlinealert" "2.0.1" - "@spectrum-css/inputgroup" "3.0.2" - "@spectrum-css/label" "2.0.10" - "@spectrum-css/link" "3.1.1" - "@spectrum-css/menu" "3.0.1" - "@spectrum-css/modal" "3.0.1" - "@spectrum-css/pagination" "3.0.3" - "@spectrum-css/picker" "1.0.1" - "@spectrum-css/popover" "3.0.1" - "@spectrum-css/progressbar" "1.0.2" - "@spectrum-css/progresscircle" "1.0.2" - "@spectrum-css/radio" "3.0.2" - "@spectrum-css/search" "3.0.2" - "@spectrum-css/sidenav" "3.0.2" - "@spectrum-css/slider" "3.0.1" - "@spectrum-css/statuslight" "3.0.2" - "@spectrum-css/stepper" "3.0.3" - "@spectrum-css/switch" "1.0.2" - "@spectrum-css/table" "3.0.1" - "@spectrum-css/tabs" "3.2.12" - "@spectrum-css/tags" "3.0.2" - "@spectrum-css/textfield" "3.0.1" - "@spectrum-css/toast" "3.0.1" - "@spectrum-css/tooltip" "3.0.3" - "@spectrum-css/treeview" "3.0.2" - "@spectrum-css/typography" "3.0.1" - "@spectrum-css/underlay" "2.0.9" - "@spectrum-css/vars" "3.0.1" - dayjs "^1.10.4" - easymde "^2.16.1" - svelte-flatpickr "^3.2.3" - svelte-portal "^1.0.0" - "@budibase/bbui@^0.9.139": version "0.9.190" resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-0.9.190.tgz#e1ec400ac90f556bfbc80fc23a04506f1585ea81" @@ -1421,71 +1362,6 @@ svelte-flatpickr "^3.2.3" svelte-portal "^1.0.0" -"@budibase/client@2.2.12-alpha.34": - version "2.2.12-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.2.12-alpha.34.tgz#8387fe9367aec3d79d85504d0ad37e9e6d5b476e" - integrity sha512-DEH9LEW6MKmjWS3T7uMffQTUzTvuwSxhknRKuzUqJ/lRvfHC4IAgLA41VCE/99R3NleAEJYpid+RDAWF4fbVgw== - dependencies: - "@budibase/bbui" "2.2.12-alpha.34" - "@budibase/frontend-core" "2.2.12-alpha.34" - "@budibase/string-templates" "2.2.12-alpha.34" - "@spectrum-css/button" "^3.0.3" - "@spectrum-css/card" "^3.0.3" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/link" "^3.1.3" - "@spectrum-css/page" "^3.0.1" - "@spectrum-css/tag" "^3.1.4" - "@spectrum-css/typography" "^3.0.2" - "@spectrum-css/vars" "^3.0.1" - apexcharts "^3.22.1" - dayjs "^1.10.5" - downloadjs "1.4.7" - html5-qrcode "^2.2.1" - leaflet "^1.7.1" - regexparam "^1.3.0" - sanitize-html "^2.7.0" - screenfull "^6.0.1" - shortid "^2.2.15" - socket.io-client "^4.5.1" - svelte "^3.49.0" - svelte-apexcharts "^1.0.2" - svelte-flatpickr "^3.1.0" - svelte-spa-router "^3.0.5" - -"@budibase/frontend-core@2.2.12-alpha.34": - version "2.2.12-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.2.12-alpha.34.tgz#ed8a57944554bad9516a0626b452f76f02a1c32f" - integrity sha512-IMZW5Jyx2U4i99iSt5XCS4KMmOdiSCR9F0o8xcEm935M15WrdEV/9E+7ZBVcY8W2TxpqeyN8r+eyYGkwmEjkqw== - dependencies: - "@budibase/bbui" "2.2.12-alpha.34" - lodash "^4.17.21" - svelte "^3.46.2" - -"@budibase/handlebars-helpers@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" - integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ== - dependencies: - array-sort "^1.0.0" - define-property "^2.0.2" - extend-shallow "^3.0.2" - for-in "^1.0.2" - get-object "^0.2.0" - get-value "^3.0.1" - handlebars "^4.7.7" - handlebars-utils "^1.0.6" - has-value "^2.0.2" - helper-md "^0.2.2" - html-tag "^2.0.0" - is-even "^1.0.0" - is-glob "^4.0.1" - kind-of "^6.0.3" - micromatch "^3.1.5" - relative "^3.0.2" - striptags "^3.1.1" - to-gfm-code-block "^0.1.1" - year "^0.2.1" - "@budibase/nano@10.1.1": version "10.1.1" resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038" @@ -1498,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.34": - version "2.2.12-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.34.tgz#7978fc6b8590990fc262a861e94b5d6f11488e3e" - integrity sha512-A/GYLM/yGQMqPmli+hkOFVyc6gv+BwdnClb2Ajyak72zoyRU4pMrcI5TSGevuYEiBXbebZjOZS8TAxZNYO04Zw== +"@budibase/pro@2.2.12-alpha.35": + version "2.2.12-alpha.35" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.35.tgz#6b0f3c2e616b9603b05292dede50d44d3e2d60fe" + integrity sha512-bFaPfocgEUDT3kZV/BWjui9kGr/hn5mfTlj/pPMGQnA/8E9sToJR5bjKjjFrZUr1YrclFDUkaEsixWBK1hWPaw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.34" - "@budibase/types" "2.2.12-alpha.34" + "@budibase/backend-core" "2.2.12-alpha.35" + "@budibase/types" "2.2.12-alpha.35" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1529,22 +1405,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/string-templates@2.2.12-alpha.34": - version "2.2.12-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.2.12-alpha.34.tgz#47a9842bbe8cf973f5537021a16aa912517c1d02" - integrity sha512-ybGtHnLOAsEXGgNk9h3SlQ3jSDh6UUkrZB07zUEhBoxJ4w2qk+x/HvTsLMYLVmKidQcWx6cfSbhLrIupn+OZRw== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - -"@budibase/types@2.2.12-alpha.34": - version "2.2.12-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.34.tgz#1f1b9993221f4f43cb300d08870a5a81736d4bd1" - integrity sha512-SWjZDUi6e2KBVPVW3ErjGSsr86/mpNrYurWyv9QVbk0leNI6K1Zlokk6CsDaHatcrRTPVdNxQBfgYzsp8gWaCQ== +"@budibase/types@2.2.12-alpha.35": + version "2.2.12-alpha.35" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.35.tgz#35c812289a3ca97c18629c4cf3607bf1aa3539da" + integrity sha512-mkGA/Ago7ckqPeoq70DLN2flbIYpaJgniwd7Tz6zlSrLlBC+fBUSdjzxeXE3FASr3NtC7qHyVS6ZMXEpou6/QQ== "@bull-board/api@3.7.0": version "3.7.0" @@ -2753,51 +2617,26 @@ resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== -"@spectrum-css/accordion@3.0.24": - version "3.0.24" - resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74" - integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA== - -"@spectrum-css/actionbutton@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577" - integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw== - "@spectrum-css/actionbutton@^1.0.1": version "1.1.14" resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.1.14.tgz#4e12eb7f482fb5944c3d97547591964baebeb1d4" integrity sha512-ViBjdWi23J6vIR4t8JTRQ6jY/+KgpZgCALj3otgy495zMNG7jPeN7sKoy6i6JZJcdIRJA4MjOTVvcDOGkYWUZg== -"@spectrum-css/actiongroup@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c" - integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA== - "@spectrum-css/actiongroup@^1.0.1": version "1.0.26" resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.26.tgz#181ee059f28b1342389a128c39d20d2e10566aae" integrity sha512-T1IK9a2Gxix9givm+chGvFtZh5oGBZQc/S2UA9F76JZKu45eCkLkvUH6F670XOrBhDGkVfzvN21QnFymSY43ow== -"@spectrum-css/avatar@3.0.2", "@spectrum-css/avatar@^3.0.2": +"@spectrum-css/avatar@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95" integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ== -"@spectrum-css/button@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.1.tgz#6db8c3e851baecd0f1c2d88fef37d49d01c6e643" - integrity sha512-YXrBtjIYisk4Vaxnp0RiE4gdElQX04P2mc4Pi2GlQ27dJKlHmufYcF+kAqGdtiyK5yjdN/vKRcC8y13aA4rusA== - "@spectrum-css/button@^3.0.1", "@spectrum-css/button@^3.0.3": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84" integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg== -"@spectrum-css/buttongroup@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.2.tgz#fd3387973ca3131609e32112de42a1c0400a48d8" - integrity sha512-Wu7B4GJ/SAeVHz9SUGAkeIH8pLaZh4t+w2ykSKOPQIRuK2jCBoudkEClVxviNVwqekccf5XLFXg9GpYF1a3Uaw== - "@spectrum-css/buttongroup@^3.0.2": version "3.0.10" resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.10.tgz#897ea04b3ffea389fc7fe5bf67a6d1f3454b774d" @@ -2808,33 +2647,16 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b" integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg== -"@spectrum-css/checkbox@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.0.2.tgz#53ca2fba0d9faa1fead10e7206eb1f6cdcfd6ddd" - integrity sha512-hPbGcnm7kJvJS4jp/P/bdaZvbyR1eIE9mteuZqcBgdmyp9m/k6+mW5jmsbtqb3Y4mMPWvOJFfz/sIvWJP0F0Zg== - "@spectrum-css/checkbox@^3.0.2": version "3.1.2" resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.1.2.tgz#88698969091da9b50de781d25839446084b4a5f4" integrity sha512-vIuknIhRF/Xtq6OHjOtlhYt722FPcTLBb7Y7tY0Ho8VEpynj3JrVLP/1YYp/YIrYMpsTugxPmbCrEkikkdL6Mg== -"@spectrum-css/dialog@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.1.tgz#33aae036282159f6aa998848b8c0828640a9620a" - integrity sha512-hUFbRR6RGT63MNuP7wP+k9KU+uRuICsduMihskh700e+jiQ+Gsv53fBFDlB843FoZYlIXzFQXgtjMUC5a4Qibw== - "@spectrum-css/dialog@^3.0.1": version "3.0.12" resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.12.tgz#fc97e002ca768a3d99dd10cb6a135c2b06052004" integrity sha512-50rbFa+9eUKT+3uYBX7CkmI7SbQ0Z3CAFwjyjai+itYZ8kf/FcHVFwcLjgrry9scUnKhexMs94kkr0gfQpPe8Q== -"@spectrum-css/divider@1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385" - integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA== - dependencies: - "@spectrum-css/vars" "^3.0.2" - "@spectrum-css/divider@^1.0.3": version "1.0.26" resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.26.tgz#44b610b1b6c747536fca08b3f09286341e18ab29" @@ -2842,106 +2664,56 @@ dependencies: "@spectrum-css/vars" "^8.0.0" -"@spectrum-css/dropzone@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.2.tgz#34f137851054442b219fed7f32006b93fc5e0bcf" - integrity sha512-BuBBzm5re6lM0AWgd6V+mI5eEGnnmFEtcFiJBEn9jYNEQYgflFhvnERUt89jMX5WmspiecwI2JBWJFrtFsOzug== - "@spectrum-css/dropzone@^3.0.2": version "3.0.24" resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.24.tgz#edefb3ca5a01705a64d0161a599c59199bab6299" integrity sha512-JY60hUZAAuzS+o2xFOKv0o31cc+5/cjLpTyKEy73oGKsdUXEEMiQtW2PQBCuxh7PNyw29wCULeZ1EW1QdNPyxg== -"@spectrum-css/fieldgroup@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.0.2.tgz#1c1afd3c444d8650fefac275dc66a7a913933846" - integrity sha512-Vyw0kQJdLW18J6w4H+YAsoLntvkw5rXmW3CH5H3SDTXkBztxtHSSe3e106Nw5MoZxTfHlom6CxbYXYCTjQfqGw== - "@spectrum-css/fieldgroup@^3.0.2": version "3.1.3" resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.1.3.tgz#945123da56534f1ff6118a9defd18b8a883e34a8" integrity sha512-HIbB3jweNviWXcADoYQW3hanww9RTUIsBUhe0YxSMXUXnQJc/7nlyeLoTRMr2eEVSCREfRnMot/8bZloW7ctnA== -"@spectrum-css/fieldlabel@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.1.tgz#39f7c0f25cc2ff402afeff005341b0832f7c588c" - integrity sha512-LMfwrwIq8wEEvxFLobdLvXRwKrp8o9Fty4iJ9aYl2Rj1uXkfRd8qLz9HGZjLEE1OuJgoTBgamYABl7EvoA5PLw== - "@spectrum-css/fieldlabel@^3.0.1": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.3.tgz#f73c04d20734d4718ffb620dc46458904685b449" integrity sha512-nEvIkEXCD5n4fW67Unq6Iu7VXoauEd/JGpfTY02VsC5p4FJLnwKfPDbJUuUsqClAxqw7nAsmXVKtn4zQFf5yPQ== -"@spectrum-css/icon@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.1.tgz#e300a6fc353c85c6b5d6e7a364408a940c31b177" - integrity sha512-cGFtIrcQ/7tthdkHK1npuEFiCdYVHLqwmLxghUYQw8Tb8KgJaw3OBO1tpjgsUizexNgu26BjVRIbGxNWuBXIHQ== - "@spectrum-css/icon@^3.0.1": version "3.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.22.tgz#1dd77e2460121951c60c583edb470d0ba52e6822" integrity sha512-ilrPlHDRGzn7kXVVAwUhoSaMfS6sGlb21ix2gn8IRLBAjDOV8BBV1wJJtjGNw+kzCXMhnVnVOekTdht17Oe9bw== -"@spectrum-css/illustratedmessage@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.2.tgz#6a480be98b027e050b086e7899e40d87adb0a8c0" - integrity sha512-dqnE8X27bGcO0HN8+dYx8O4o0dNNIAqeivOzDHhe2El+V4dTzMrNIerF6G0NLm3GjVf6XliwmitsZK+K6FmbtA== - "@spectrum-css/illustratedmessage@^3.0.2": version "3.0.17" resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.17.tgz#49cb2549fda97a6812156bfba6ccdd3a18bebd11" integrity sha512-kpDqeq1U+rEjG1XuiXkbGvS71vn6mpFF/hiwCgFJWudVOfypDPQ4KLfYw1ditFSUzMCm5H6U/RqAShAJn8oMWA== -"@spectrum-css/inlinealert@2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.1.tgz#7521f88f6c845806403cc7d925773c7414e204a2" - integrity sha512-Xy5RCOwgurqUXuGQCsEDUduDd5408bmEpmFg+feynG7VFUgLFZWBeylSENB/OqjlFtO76PHXNVdHkhDscPIHTA== - "@spectrum-css/inlinealert@^2.0.1": version "2.0.6" resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.6.tgz#4c5e923a1f56a96cc1adb30ef1f06ae04f2c6376" integrity sha512-OpvvoWP02wWyCnF4IgG8SOPkXymovkC9cGtgMS1FdDubnG3tJZB/JeKTsRR9C9Vt3WBaOmISRdSKlZ4lC9CFzA== -"@spectrum-css/inputgroup@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.2.tgz#f1b13603832cbd22394f3d898af13203961f8691" - integrity sha512-O0G3Lw9gxsh8gTLQWIAKkN1O8cWhjpEUl+oR1PguIKFni72uNr2ikU9piOwy/r0gJG2Q/TVs6hAshoAAkmsSzw== - "@spectrum-css/inputgroup@^3.0.2": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.8.tgz#fc23afc8a73c24d17249c9d2337e8b42085b298b" integrity sha512-cmQWzFp0GU+4IMc8SSeVFdmQDlRUdPelXaQdKUR9mZuO2iYettg37s0lfBCeJyYkUNTagz0zP8O7A0iXfmeE6g== -"@spectrum-css/label@2.0.10", "@spectrum-css/label@^2.0.10": +"@spectrum-css/label@^2.0.10": version "2.0.10" resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001" integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ== -"@spectrum-css/link@3.1.1": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb" - integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA== - "@spectrum-css/link@^3.1.1", "@spectrum-css/link@^3.1.3": version "3.1.22" resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.22.tgz#1e061d674789c5b3be5b0680f9f6eae3e695e1c1" integrity sha512-Zf8bfy+rtq07l4qoR6chNxefmatLZQZjudIm96v+lsCXBkjVbiMpjkW9oOcNwTqKB08koMONHHhOf1wk2Faqiw== -"@spectrum-css/menu@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe" - integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg== - "@spectrum-css/menu@^3.0.1": version "3.0.21" resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.21.tgz#d1f7e6e69d30b5e1edd7ed2c86ea4e08dfd670ab" integrity sha512-G5AIUO26O6IAc6HUGZu4AZgyw0QRyLfSbcKlFGu4oJHzP36cQc1S1uCh8Xp4g5d+n6mU62LxNDLSMpVbwnA00A== -"@spectrum-css/modal@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.1.tgz#613a6b83d0330a4d38db41a98090800751c56d8d" - integrity sha512-F7D99F3cjDGT9DM9sogx/p49jrNYT7a1J6TUoqV73wUf+0gP+dTsskBOo9jB8VbUE+POQPjiDLB+SWLp6iBB+w== - "@spectrum-css/modal@^3.0.1": version "3.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.22.tgz#05593a613e246a7cbef85d08a6945219e1207209" @@ -2954,222 +2726,107 @@ dependencies: "@spectrum-css/vars" "^4.3.1" -"@spectrum-css/pagination@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.3.tgz#b204c3ada384c4af751a354bc428346d82eeea65" - integrity sha512-OJ/v9GeNXJOZ9Yr9LDBYPrR2NCiLOWP9wANT/a5sqFuugRnQbn/HYMnRp9TBxwpDY6ihaPo0T/wi7kLiAJFdDw== - "@spectrum-css/pagination@^3.0.3": version "3.0.11" resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.11.tgz#68d9f34fe8eb36bf922e41b11f49eac62ac2fc41" integrity sha512-wjZr7NAcqHK6fxNIGKTYEVtAOJugJTbcz4d8K7DZuUDgBVwLJJHJBi4uJ4KrIRYliMWOvqWTZzCJLmmTfx4cyw== -"@spectrum-css/picker@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.1.tgz#98991198576d26bd14160824e7b6f3c278ff930b" - integrity sha512-Rv4/UBOdNW1gs7WVBCJnPD5VFly8MqP++psDX6kcugUIcfJy0GC3acvElotmKRlCDk8Qxks2W2A0jKeSgphTmA== - "@spectrum-css/picker@^1.0.1": version "1.2.9" resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.2.9.tgz#854cdca407daaf8e1f821777978690f0804b3c08" integrity sha512-HDUDiqHwM84xfbHJWm4wR67Km3NXcDluhDrkVn8uqOEZrm8y4YiW+esL6FzPgzqLdPIHboQjrdpRq4LiDzGjjA== -"@spectrum-css/popover@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.1.tgz#5863c1efc53f98f9aba2de9186666780041303fc" - integrity sha512-LmOSj/yCwQQ9iGmCYnHiJsJR/HfPiGqI1Jl7pkKxBOCxYBMS/5+ans9vfCN2Qnd0eK7WSbfPg72S6mjye7db2Q== - "@spectrum-css/popover@^3.0.1": version "3.0.11" resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.11.tgz#a7450c01bcf1609264b4a9df58821368b9e224d1" integrity sha512-bzyNQJVw6Mn1EBelTaRlXCdd0ZfykNX9O6SHx3a+jXPYu8VBrRpHm0gsfWzPAz1etd1vj1CxwG/teQt4qvyZ/Q== -"@spectrum-css/progressbar@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.2.tgz#b5a59432517f9ae6dad49d9504691bc5ac42b424" - integrity sha512-+jExeBLtVCqo3BqtFq5WCtZ028Dzk+oUnX6y4z6ZamKPqOyOELOtFnhYnyhyRndQOqYwKUTXx9zsaWA/lpJOHw== - "@spectrum-css/progressbar@^1.0.2": version "1.0.30" resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.30.tgz#1f1e81ab6080fb843831421f736ed2bccc9b18ed" integrity sha512-tUquDN33RQG8gyrWmwPaCu6I2rxRyv5BBGBPii+1sK7L/DTCJrKXe7TAqoxjNEYzdCvTF/HI1NvnSColWNq0Rw== -"@spectrum-css/progresscircle@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.2.tgz#258ea9170fb70f795edda03e38a61d93bef4487c" - integrity sha512-JLULpyzjIY95lzlWR1yE1gv4l1K6p+scQ+edmuZZUHBzwM3pUtkvHJmUlA9TYdResUYW6Uka60VRdY6lZ8gnFQ== - "@spectrum-css/progresscircle@^1.0.2": version "1.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.22.tgz#80c8fd2ac4ee6855297d98c60c3b36082020a32a" integrity sha512-EGb+q+7RxbbsrEPFpJ1P4XBQ4s6Ra0okjQCDDTTKTp/sUY2WIT2BjPzwxlZTxVmSXWiiuRyzyuSYUrgBw9UgWg== -"@spectrum-css/radio@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.2.tgz#9c1386894920bbed604e4e174fbbd45d9d762152" - integrity sha512-0TDdzC9omNXnpKHEXNuuGeXdNh4x8jvTKVUqMRLb7vY4hY94hAdt6X01NBqka+jzK35HxGzpDdPADAz62yZLPQ== - "@spectrum-css/radio@^3.0.2": version "3.0.23" resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.23.tgz#118a28c407e7b58bec139483d7e23074d840ae77" integrity sha512-x+08GSufmsyrUU4iBOOMRXZrcHxabXMMm/q2vazDJE8CShztvmdjghCxcwtyM74sjiYmXnCW1V3ztr6zaG5xig== -"@spectrum-css/search@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.0.2.tgz#70e93e321032d40b399498b2324e3b70e050551e" - integrity sha512-3UbT8yZmNOwrZxq+CUmumE+26ZySZ8OoKNM6U20SLMPLgdx6MrRugVE88r3Bl0sJ0RZX/5bU8nausdiHeX+Jlw== - "@spectrum-css/search@^3.0.2": version "3.1.2" resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.1.2.tgz#8d43f35f884f7c190e7694c8d26a3f2cfed01ef0" integrity sha512-8cMK1QB07dbReZ/ECyTyoT2dELZ7hK1b3jEDiWSeLBbXcKirR1OI24sZEnewQY/XWFd/62Z1YdNaaA8S6UuXWQ== -"@spectrum-css/sidenav@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.2.tgz#9d70f408d588ee79c69857751010333671f32713" - integrity sha512-YpIdH/F0jEICYmoduGrnkTmxwJq1kfKxEp0wOs+ZkQOsvKMv1an7nyhsfOKCQqcGNfYzJ9mJAk7/u5+vsxHa8g== - "@spectrum-css/sidenav@^3.0.2": version "3.0.23" resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.23.tgz#c218560d472e13a3e0d1499b762df1206dcffbfd" integrity sha512-4IFw2/HMQJRzM0M2c5na/HeY7y5vJoGpMFBkXNpQyhW4TRo7N1rGwYQ5dRD3s4OVEWV4/rjfGV0d/qhfwKUTog== -"@spectrum-css/slider@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49" - integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q== - -"@spectrum-css/statuslight@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5" - integrity sha512-xodB8g8vGJH20XmUj9ZsPlM1jHrGeRbvmVXkz0q7YvQrYAhim8pP3W+XKKZAletPFAuu8cmUOc6SWn6i4X4z6w== - "@spectrum-css/statuslight@^3.0.2": version "3.0.8" resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.8.tgz#3b0ea80712573679870a85d469850230e794a0f7" integrity sha512-zMTHs8lk+I7fLdi9waEEbsCmJ1FxeHcjQ0yltWxuRmGk2vl4MQdQIuHIMI63iblqEaiwnJRjXJoKnWlNvndTJQ== -"@spectrum-css/stepper@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.3.tgz#ae89846886431e3edeee060207b8f81540f73a34" - integrity sha512-prAD61ImlOTs9b6PfB3cB08x4lAfxtvnW+RZiTYky0E8GgZdrc/MfCkL5/oqQaIQUtyQv/3Lb7ELAf/0K8QTXw== - "@spectrum-css/stepper@^3.0.3": version "3.0.25" resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.25.tgz#a6e77d501a9671c083b6dd9a37c6a3f224ffc961" integrity sha512-nlAZKY4KCYQ4IFuFj/P0LXPsB4Ze36ziuaa3k3iy3+1pBDD4gDcGmNpNcTG1LENu0Bt87KhSj8Ba2NV3wBSY8w== -"@spectrum-css/switch@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.2.tgz#f0b4c69271964573e02b08e90998096e49e1de44" - integrity sha512-zqmHpgWPNg1gEwdUNFYV3CBX5JaeALfIqcJIxE0FLZqr9d1C4+oLE0ItIFzt1bwr4bFAOmkEpvtiY+amluzGxQ== - "@spectrum-css/switch@^1.0.2": version "1.0.22" resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.22.tgz#8f2fe25a52b4511b9cfde7af45f9bd824b9774d7" integrity sha512-/Q8IxnkSQYo+i3G3BObslSvoKgM0Mm1mS7kmssULOtaQPbaRlRsUNQVaHzcNEX33+fiF/9zKSvs7ypgIvbWp+Q== -"@spectrum-css/table@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.1.tgz#753e0e2498082c0c36b9600828516aff3ac338cd" - integrity sha512-XQ+srMTv9hK1H0nctWUtqyzitmvyb5TNR+7mjAmKRdkBRSTQQSipDhenxZp72ekzMtMoSYZVZ77kgo0Iw3Fpug== - "@spectrum-css/table@^3.0.1": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.3.tgz#7f7f19905ef3275cbf907ce3a5818e63c30b2caf" integrity sha512-nxwzVjLPsXoY/v4sdxOVYLcC+cEbGgJyLcLclT5LT9MGSbngFeUMJzzVR4EvehzuN4dH7hrATG7Mbuq29Mf0Hg== -"@spectrum-css/tabs@3.2.12": - version "3.2.12" - resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff" - integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA== - "@spectrum-css/tabs@^3.0.1": version "3.2.16" resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.16.tgz#c3f7800d8d6f7c9930c28cd01354816328bf72b1" integrity sha512-JUcMB/fiDG/KoyrVstlUMacFJUY4OHKqhMRuPtu9ggUXWCRbSkY8he92v6u0HwY3DuhDoOxNTK8d/PLjk/fsbg== -"@spectrum-css/tag@^3.1.4": - version "3.3.15" - resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278" - integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q== - -"@spectrum-css/tags@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.2.tgz#5bf35fb79c97cd9344de485bd4626ad5b9f07757" - integrity sha512-HbvMk+QHvCDD1/ScvSErpKROcpAbXuMD4Hl/Gz/1A1lQ0fJ/CJeCq/MMsL7zjK1nlItU/ySu8r8KIuRF+6F8SQ== - "@spectrum-css/tags@^3.0.2": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.3.tgz#fc76d2735cdc442de91b7eb3bee49a928c0767ac" integrity sha512-SL8vPxVDfWcY5VdIuyl0TImEXcOU1I7yCyXkk7MudMwfnYs81FaIyY32hFV9OHj0Tz/36UzRzc7AVMSuRQ53pw== -"@spectrum-css/textfield@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.0.1.tgz#e875b8e37817378ad08fc4af7d53026df38911e5" - integrity sha512-MUV5q87CVxbkNdSNoxGrFbgyKc51ft/WWf3aVEoPdPw5yBnXqFe1w1YmAit5zYDOOhhs58sCLAlUcCMlOpkgrA== - "@spectrum-css/textfield@^3.0.1": version "3.2.3" resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.2.3.tgz#52830498fb3b8957f84bb9bf2cafec7edc55e490" integrity sha512-mtxSQe8VZjQ8PHKlUE03dATAjjxp2Y8XfYmWWFBWWZLeqaojSLv9Q8C/ouK5AenhzCaYpJxTotMjAoivwtmUSw== -"@spectrum-css/toast@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796" - integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg== - "@spectrum-css/toast@^3.0.1": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.3.tgz#97c1527384707600832ecda35643ed304615250f" integrity sha512-CjLeaMs+cjUXojCCRtbj0YkD2BoZW16kjj2o5omkEpUTjA34IJ8xJ1a+CCtDILWekhXvN0MBN4sbumcnwcnx8w== -"@spectrum-css/tooltip@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281" - integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A== - "@spectrum-css/tooltip@^3.0.3": version "3.1.17" resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.1.17.tgz#1f0822c8b69d16d5f940a2b7eb6514d719e6a0fd" integrity sha512-YDuC+Cc6B8DExjL/7fkPnWb8QwlCkjuMHyuttwP/tq/lryWnrdntojgwK5KvgFRjnZ2WfepZVryIt5LOD3tMdg== -"@spectrum-css/treeview@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.2.tgz#d54d8f17290babb1c885f5d9355e225421beb0d2" - integrity sha512-foO7UBJv1JMFaKgDPVt8jBghZSVbqhXR8TaGaxHSnMubv7ygmKkc1AITrWC2STILCn84ju2vchOohMZfW6sYwg== - "@spectrum-css/treeview@^3.0.2": version "3.0.3" resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.3.tgz#aeda5175158b9f8d7529cb2b394428eb2a428046" integrity sha512-D5gGzZC/KtRArdx86Mesc9+99W9nTbUOeyYGqoJoAfJSOttoT6Tk5CrDvlCmAqjKf5rajemAkGri1ChqvUIwkw== -"@spectrum-css/typography@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.1.tgz#957dafd9b18c314fa37a88b549042ba2175f5b3f" - integrity sha512-XyR68K2rIZX3u4j7HhMLOqLVHDJZcapp3XUqgYMzMWccBFleA0qPxKpfRWqVIA5DzTMSIw0wEcZPYKWFZ2e6dA== - "@spectrum-css/typography@^3.0.1", "@spectrum-css/typography@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38" integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA== -"@spectrum-css/underlay@2.0.9": - version "2.0.9" - resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.9.tgz#fc10f971d1325cc844b727e6260f7217844060e8" - integrity sha512-X86xd0PG4QobmUyXA90BFGnyygaI8kW64dA4ysf4z0cOvUWjNbAAl3a/DB/WRyrnp63Zqv83T/cgNbetagTbWg== - "@spectrum-css/underlay@^2.0.9": version "2.0.30" resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.30.tgz#401cfd68df945692bd6bbe281fee98889c930dd1" integrity sha512-Ssq/KERbDuJu3PUWPkBv9+ZIbKooke3oncRoYMXeyP/Gcw5bmQSXOvnlddU5DIK4PJR+pPGVZ9CUUFaYZot4YQ== -"@spectrum-css/vars@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.1.tgz#561fd69098f896a647242dd8d6108af603bfa31e" - integrity sha512-l4oRcCOqInChYXZN6OQhpe3isk6l4OE6Ys8cgdlsiKp53suNoQxyyd9p/eGRbCjZgH3xQ8nK0t4DHa7QYC0S6w== - -"@spectrum-css/vars@^3.0.1", "@spectrum-css/vars@^3.0.2": +"@spectrum-css/vars@^3.0.1": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999" integrity sha512-vzS9KqYXot4J3AEER/u618MXWAS+IoMvYMNrOoscKiLLKYQWenaueakUWulFonToPd/9vIpqtdbwxznqrK5qDw== @@ -3372,13 +3029,6 @@ resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8" integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w== -"@types/codemirror@^5.60.4": - version "5.60.7" - resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.7.tgz#efbb78e5e79f90c6762c2127c02096648e600808" - integrity sha512-QXIC+RPzt/1BGSuD6iFn6UMC9TDp+9hkOANYNPVsjjrDdzKphfRkwQDKGp2YaC54Yhz0g6P5uYTCCibZZEiMAA== - dependencies: - "@types/tern" "*" - "@types/connect@*": version "3.4.35" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" @@ -3587,11 +3237,6 @@ resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a" integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA== -"@types/marked@^4.0.7": - version "4.0.8" - resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.8.tgz#b316887ab3499d0a8f4c70b7bd8508f92d477955" - integrity sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw== - "@types/mime@^1": version "1.3.2" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" @@ -3883,13 +3528,6 @@ "@types/node" "*" minipass "^3.3.5" -"@types/tern@*": - version "0.23.4" - resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb" - integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg== - dependencies: - "@types/estree" "*" - "@types/tough-cookie@*", "@types/tough-cookie@^4.0.2": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" @@ -4495,7 +4133,7 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.10, argparse@^1.0.7: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -4542,15 +4180,6 @@ array-equal@^1.0.0: resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" integrity sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA== -array-sort@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" - integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== - dependencies: - default-compare "^1.0.0" - get-value "^2.0.6" - kind-of "^5.0.2" - array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -4694,13 +4323,6 @@ atomic-sleep@^1.0.0: resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== -autolinker@~0.28.0: - version "0.28.1" - resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" - integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ== - dependencies: - gulp-header "^1.7.1" - available-typed-arrays@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" @@ -5621,18 +5243,6 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -codemirror-spell-checker@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e" - integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ== - dependencies: - typo-js "*" - -codemirror@^5.63.1: - version "5.65.11" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.11.tgz#c818edc3274788c008f636520c5490a1f7009b4f" - integrity sha512-Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A== - collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -5783,13 +5393,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concat-with-sourcemaps@*: - version "1.1.0" - resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" - integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== - dependencies: - source-map "^0.6.1" - condense-newlines@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f" @@ -6177,13 +5780,6 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -default-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" - integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== - dependencies: - kind-of "^5.0.2" - default-shell@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/default-shell/-/default-shell-1.0.1.tgz#752304bddc6174f49eb29cb988feea0b8813c8bc" @@ -6361,25 +5957,11 @@ doctrine@3.0.0, doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dom-serializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" - integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.2" - entities "^4.2.0" - dom-walk@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w== -domelementtype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== - domexception@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90" @@ -6387,22 +5969,6 @@ domexception@^1.0.1: dependencies: webidl-conversions "^4.0.2" -domhandler@^5.0.1, domhandler@^5.0.2: - version "5.0.3" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" - integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== - dependencies: - domelementtype "^2.3.0" - -domutils@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" - integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== - dependencies: - dom-serializer "^2.0.0" - domelementtype "^2.3.0" - domhandler "^5.0.1" - dot-prop@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" @@ -6447,11 +6013,6 @@ download@8.0.0: p-event "^2.1.0" pify "^4.0.1" -downloadjs@1.4.7: - version "1.4.7" - resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c" - integrity sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q== - duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" @@ -6467,17 +6028,6 @@ duplexify@^4.0.0: readable-stream "^3.1.1" stream-shift "^1.0.0" -easymde@^2.16.1: - version "2.18.0" - resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b" - integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA== - dependencies: - "@types/codemirror" "^5.60.4" - "@types/marked" "^4.0.7" - codemirror "^5.63.1" - codemirror-spell-checker "1.1.2" - marked "^4.1.0" - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -6640,17 +6190,6 @@ end-stream@~0.1.0: dependencies: write-stream "~0.4.3" -engine.io-client@~6.2.3: - version "6.2.3" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz#a8cbdab003162529db85e9de31575097f6d29458" - integrity sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - engine.io-parser "~5.0.3" - ws "~8.2.3" - xmlhttprequest-ssl "~2.0.0" - engine.io-parser@~5.0.3: version "5.0.4" resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0" @@ -6680,16 +6219,6 @@ enhanced-resolve@^5.9.3: graceful-fs "^4.2.4" tapable "^2.2.0" -ent@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== - -entities@^4.2.0, entities@^4.3.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" - integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== - entities@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" @@ -7695,11 +7224,6 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-exists-sync@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" - integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg== - fs-extra@8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -7848,14 +7372,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: has "^1.0.3" has-symbols "^1.0.3" -get-object@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" - integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ== - dependencies: - is-number "^2.0.2" - isobject "^0.2.0" - get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -7918,13 +7434,6 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== -get-value@^3.0.0, get-value@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" - integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== - dependencies: - isobject "^3.0.1" - getopts@2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.3.0.tgz#71e5593284807e03e2427449d4f6712a268666f4" @@ -8194,24 +7703,7 @@ gtoken@^5.0.4: google-p12-pem "^3.1.3" jws "^4.0.0" -gulp-header@^1.7.1: - version "1.8.12" - resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" - integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== - dependencies: - concat-with-sourcemaps "*" - lodash.template "^4.4.0" - through2 "^2.0.0" - -handlebars-utils@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" - integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== - dependencies: - kind-of "^6.0.0" - typeof-article "^0.1.1" - -handlebars@^4.7.6, handlebars@^4.7.7: +handlebars@^4.7.7: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== @@ -8305,14 +7797,6 @@ has-value@^1.0.0: has-values "^1.0.0" isobject "^3.0.0" -has-value@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658" - integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA== - dependencies: - get-value "^3.0.0" - has-values "^2.0.1" - has-values@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" @@ -8326,13 +7810,6 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has-values@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d" - integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w== - dependencies: - kind-of "^6.0.2" - has-yarn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" @@ -8345,16 +7822,6 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -helper-md@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" - integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q== - dependencies: - ent "^2.2.0" - extend-shallow "^2.0.1" - fs-exists-sync "^0.1.0" - remarkable "^1.6.2" - homedir-polyfill@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" @@ -8384,29 +7851,6 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-tag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" - integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== - dependencies: - is-self-closing "^1.0.1" - kind-of "^6.0.0" - -html5-qrcode@^2.2.1: - version "2.3.4" - resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.4.tgz#7e2b4575a23b10ff5e26d2bf147c8027c1ece389" - integrity sha512-VPZrOTG8XR9HmIAhSSiGtJVPErZxKy/DuGc9cPQLburCWZEbvxQGJP9y4K4P+8vdalLtYB/vM5YP1BdWQKZ8jQ== - -htmlparser2@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" - integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.2" - domutils "^3.0.1" - entities "^4.3.0" - http-assert@^1.3.0: version "1.5.0" resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f" @@ -8871,13 +8315,6 @@ is-docker@^2.0.0, is-docker@^2.1.1: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== -is-even@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" - integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg== - dependencies: - is-odd "^0.1.2" - is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -8984,13 +8421,6 @@ is-number-object@^1.0.4: dependencies: has-tostringtag "^1.0.0" -is-number@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg== - dependencies: - kind-of "^3.0.2" - is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -9013,13 +8443,6 @@ is-object@^1.0.1: resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf" integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA== -is-odd@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" - integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw== - dependencies: - is-number "^3.0.0" - is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -9037,11 +8460,6 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-plain-object@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" - integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== - is-property@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" @@ -9065,13 +8483,6 @@ is-retry-allowed@^2.2.0: resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d" integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg== -is-self-closing@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" - integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== - dependencies: - self-closing-tags "^1.0.1" - is-shared-array-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" @@ -9182,11 +8593,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -isobject@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" - integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ== - isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -10376,7 +9782,7 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== @@ -10390,12 +9796,12 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0, kind-of@^5.0.2: +kind-of@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: +kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -10611,11 +10017,6 @@ lcid@^2.0.0: dependencies: invert-kv "^2.0.0" -leaflet@^1.7.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414" - integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ== - left-pad@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" @@ -10810,11 +10211,6 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" @@ -10920,21 +10316,6 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== -lodash.template@^4.4.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" - integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.templatesettings "^4.0.0" - -lodash.templatesettings@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" - integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.without@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac" @@ -10945,7 +10326,7 @@ lodash.xor@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6" integrity sha512-sVN2zimthq7aZ5sPGXnSz32rZPuqcparVW50chJQe+mzTYV+IsxSsl/2gnkWWE2Of7K3myBQBqtLKOUEHJKRsQ== -lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3: +lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -11092,11 +10473,6 @@ markdown-it@^12.2.0: mdurl "^1.0.1" uc.micro "^1.0.5" -marked@^4.1.0: - version "4.2.12" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5" - integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw== - matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -11192,7 +10568,7 @@ methods@^1.1.1, methods@^1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== -micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.5: +micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -11490,16 +10866,6 @@ nan@^2.12.1: resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== -nanoid@^2.1.0: - version "2.1.11" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" - integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== - -nanoid@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" - integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== - nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -12168,11 +11534,6 @@ parse-passwd@^1.0.0: resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q== -parse-srcset@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1" - integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q== - parse5@4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608" @@ -12521,15 +11882,6 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== -postcss@^8.3.11: - version "8.4.21" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" - integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== - dependencies: - nanoid "^3.3.4" - picocolors "^1.0.0" - source-map-js "^1.0.2" - postgres-array@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" @@ -13301,16 +12653,6 @@ regexp.prototype.flags@^1.4.3: define-properties "^1.1.3" functions-have-names "^1.2.2" -regexparam@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa" - integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw== - -regexparam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" - integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== - regexpp@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" @@ -13359,21 +12701,6 @@ relative-microtime@^2.0.0: resolved "https://registry.yarnpkg.com/relative-microtime/-/relative-microtime-2.0.0.tgz#cceed2af095ecd72ea32011279c79e5fcc7de29b" integrity sha512-l18ha6HEZc+No/uK4GyAnNxgKW7nvEe35IaeN54sShMojtqik2a6GbTyuiezkjpPaqP874Z3lW5ysBo5irz4NA== -relative@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" - integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA== - dependencies: - isobject "^2.0.0" - -remarkable@^1.6.2: - version "1.7.4" - resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" - integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== - dependencies: - argparse "^1.0.10" - autolinker "~0.28.0" - remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" @@ -13661,18 +12988,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sanitize-html@^2.7.0: - version "2.8.1" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.8.1.tgz#319c4fdba67e1edf35b1fd6d9362210044826d47" - integrity sha512-qK5neD0SaMxGwVv5txOYv05huC3o6ZAA4h5+7nJJgWMNFUNRjcjLO6FpwAtKzfKCZ0jrG6xTk6eVFskbvOGblg== - dependencies: - deepmerge "^4.2.2" - escape-string-regexp "^4.0.0" - htmlparser2 "^8.0.0" - is-plain-object "^5.0.0" - parse-srcset "^1.0.2" - postcss "^8.3.11" - sanitize-s3-objectkey@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e" @@ -13704,11 +13019,6 @@ schema-utils@^3.1.0, schema-utils@^3.1.1: ajv "^6.12.5" ajv-keywords "^3.5.2" -screenfull@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238" - integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw== - search-params@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/search-params/-/search-params-3.0.0.tgz#dbc7c243058e5a33ae1e9870be91f5aced4100d8" @@ -13726,11 +13036,6 @@ seek-bzip@^1.0.5: dependencies: commander "^2.8.1" -self-closing-tags@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" - integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== - semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" @@ -13883,13 +13188,6 @@ shimmer@^1.2.0: resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== -shortid@^2.2.15: - version "2.2.16" - resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" - integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== - dependencies: - nanoid "^2.1.0" - side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -14030,16 +13328,6 @@ socket.io-adapter@~2.4.0: resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6" integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg== -socket.io-client@^4.5.1: - version "4.5.4" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.4.tgz#d3cde8a06a6250041ba7390f08d2468ccebc5ac9" - integrity sha512-ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.2" - engine.io-client "~6.2.3" - socket.io-parser "~4.2.1" - socket.io-parser@~4.2.0: version "4.2.1" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" @@ -14048,14 +13336,6 @@ socket.io-parser@~4.2.0: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" -socket.io-parser@~4.2.1: - version "4.2.2" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206" - integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - socket.io@^4.5.1: version "4.5.2" resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.2.tgz#1eb25fd380ab3d63470aa8279f8e48d922d443ac" @@ -14110,11 +13390,6 @@ source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== -source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -14514,11 +13789,6 @@ strip-outer@^1.0.0: dependencies: escape-string-regexp "^1.0.2" -striptags@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" - integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== - style-loader@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575" @@ -14618,23 +13888,11 @@ svelte-portal@^1.0.0: resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== -svelte-spa-router@^3.0.5: - version "3.3.0" - resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c" - integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ== - dependencies: - regexparam "2.0.1" - svelte@3.49.0: version "3.49.0" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029" integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA== -svelte@^3.46.2, svelte@^3.49.0: - version "3.55.1" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.55.1.tgz#6f93b153e5248039906ce5fe196efdb9e05dfce8" - integrity sha512-S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ== - svg.draggable.js@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba" @@ -14987,11 +14245,6 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= -to-gfm-code-block@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" - integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg== - to-json-schema@0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/to-json-schema/-/to-json-schema-0.2.5.tgz#ef3c3f11ad64460dcfbdbafd0fd525d69d62a98f" @@ -15260,13 +14513,6 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typeof-article@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" - integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw== - dependencies: - kind-of "^3.1.0" - typeof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/typeof/-/typeof-1.0.0.tgz#9c84403f2323ae5399167275497638ea1d2f2440" @@ -15277,11 +14523,6 @@ typescript@4.7.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== -typo-js@*: - version "1.2.2" - resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b" - integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== - uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" @@ -15632,14 +14873,6 @@ vm2@3.9.11: acorn "^8.7.0" acorn-walk "^8.2.0" -vm2@^3.9.4: - version "3.9.13" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.13.tgz#774a1a3d73b9b90b1aa45bcc5f25e349f2eef649" - integrity sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q== - dependencies: - acorn "^8.7.0" - acorn-walk "^8.2.0" - vuvuzela@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" @@ -16063,11 +15296,6 @@ xmlbuilder@~9.0.1: resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= -xmlhttprequest-ssl@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" - integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== - xpath.js@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1" @@ -16206,11 +15434,6 @@ yauzl@^2.4.2: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -year@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" - integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w== - ylru@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785" diff --git a/packages/worker/package.json b/packages/worker/package.json index 64e1dadf78..f7702128b6 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.35", - "@budibase/pro": "2.2.12-alpha.34", + "@budibase/pro": "2.2.12-alpha.35", "@budibase/string-templates": "2.2.12-alpha.35", "@budibase/types": "2.2.12-alpha.35", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index a6dc41315a..30ab4d4d0a 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.34": - version "2.2.12-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.34.tgz#0e2042ab8b2e52bf04c672283a50e153a3157e88" - integrity sha512-cViRaNxmi3RmAOZpBlRtFEj7l6umJjgB1k8B3J6KArvdxezZmV0smQrpX4colDLJhRfm1O5vQm6oigxGgZRpXg== +"@budibase/backend-core@2.2.12-alpha.35": + version "2.2.12-alpha.35" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.35.tgz#36045cdccee548d86a5d0951606d41d0de96bd5c" + integrity sha512-CdIioYKH6y8KQRMWJ2esiOeCOOs3RIGGAAY7DYw71ejjxtCcAZ8Fnez+xIgTFqI6Hee64HjMbX2Tc3OO4J/Kxg== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.34" + "@budibase/types" "2.2.12-alpha.35" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -509,31 +509,6 @@ uuid "8.3.2" zlib "1.0.5" -"@budibase/handlebars-helpers@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" - integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ== - dependencies: - array-sort "^1.0.0" - define-property "^2.0.2" - extend-shallow "^3.0.2" - for-in "^1.0.2" - get-object "^0.2.0" - get-value "^3.0.1" - handlebars "^4.7.7" - handlebars-utils "^1.0.6" - has-value "^2.0.2" - helper-md "^0.2.2" - html-tag "^2.0.0" - is-even "^1.0.0" - is-glob "^4.0.1" - kind-of "^6.0.3" - micromatch "^3.1.5" - relative "^3.0.2" - striptags "^3.1.1" - to-gfm-code-block "^0.1.1" - year "^0.2.1" - "@budibase/nano@10.1.1": version "10.1.1" resolved "https://registry.yarnpkg.com/@budibase/nano/-/nano-10.1.1.tgz#36ccda4d9bb64b5ee14dd2b27a295b40739b1038" @@ -546,35 +521,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.34": - version "2.2.12-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.34.tgz#7978fc6b8590990fc262a861e94b5d6f11488e3e" - integrity sha512-A/GYLM/yGQMqPmli+hkOFVyc6gv+BwdnClb2Ajyak72zoyRU4pMrcI5TSGevuYEiBXbebZjOZS8TAxZNYO04Zw== +"@budibase/pro@2.2.12-alpha.35": + version "2.2.12-alpha.35" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.35.tgz#6b0f3c2e616b9603b05292dede50d44d3e2d60fe" + integrity sha512-bFaPfocgEUDT3kZV/BWjui9kGr/hn5mfTlj/pPMGQnA/8E9sToJR5bjKjjFrZUr1YrclFDUkaEsixWBK1hWPaw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.34" - "@budibase/types" "2.2.12-alpha.34" + "@budibase/backend-core" "2.2.12-alpha.35" + "@budibase/types" "2.2.12-alpha.35" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/string-templates@2.2.12-alpha.34": - version "2.2.12-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.2.12-alpha.34.tgz#47a9842bbe8cf973f5537021a16aa912517c1d02" - integrity sha512-ybGtHnLOAsEXGgNk9h3SlQ3jSDh6UUkrZB07zUEhBoxJ4w2qk+x/HvTsLMYLVmKidQcWx6cfSbhLrIupn+OZRw== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - -"@budibase/types@2.2.12-alpha.34": - version "2.2.12-alpha.34" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.34.tgz#1f1b9993221f4f43cb300d08870a5a81736d4bd1" - integrity sha512-SWjZDUi6e2KBVPVW3ErjGSsr86/mpNrYurWyv9QVbk0leNI6K1Zlokk6CsDaHatcrRTPVdNxQBfgYzsp8gWaCQ== +"@budibase/types@2.2.12-alpha.35": + version "2.2.12-alpha.35" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.35.tgz#35c812289a3ca97c18629c4cf3607bf1aa3539da" + integrity sha512-mkGA/Ago7ckqPeoq70DLN2flbIYpaJgniwd7Tz6zlSrLlBC+fBUSdjzxeXE3FASr3NtC7qHyVS6ZMXEpou6/QQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" @@ -1825,7 +1788,7 @@ acorn-jsx@^5.2.0: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-walk@^8.1.1, acorn-walk@^8.2.0: +acorn-walk@^8.1.1: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== @@ -1845,11 +1808,6 @@ acorn@^8.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== -acorn@^8.7.0: - version "8.8.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" - integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== - after-all-results@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/after-all-results/-/after-all-results-2.0.0.tgz#6ac2fc202b500f88da8f4f5530cfa100f4c6a2d0" @@ -1955,7 +1913,7 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.10, argparse@^1.0.7: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -1977,40 +1935,11 @@ argsarray@0.0.1: resolved "https://registry.yarnpkg.com/argsarray/-/argsarray-0.0.1.tgz#6e7207b4ecdb39b0af88303fa5ae22bda8df61cb" integrity sha512-u96dg2GcAKtpTrBdDoFIM7PjcBA+6rSP0OR94MOReNRyUECL6MtQt5XXmRr4qrftYaef9+l5hcpO5te7sML1Cg== -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA== - -arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== - -array-sort@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" - integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== - dependencies: - default-compare "^1.0.0" - get-value "^2.0.6" - kind-of "^5.0.2" - array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== - asap@^2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" @@ -2028,11 +1957,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== - ast-types@0.9.6: version "0.9.6" resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9" @@ -2067,23 +1991,11 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -atob@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - atomic-sleep@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b" integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ== -autolinker@~0.28.0: - version "0.28.1" - resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" - integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ== - dependencies: - gulp-header "^1.7.1" - aws-cloudfront-sign@2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/aws-cloudfront-sign/-/aws-cloudfront-sign-2.2.0.tgz#3910f5a6d0d90fec07f2b4ef8ab07f3eefb5625d" @@ -2220,19 +2132,6 @@ base64url@3.x.x, base64url@^3.0.1: resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d" integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A== -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - basic-auth@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" @@ -2311,22 +2210,6 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" @@ -2428,21 +2311,6 @@ bytes@3.1.2, bytes@^3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - cache-content-type@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/cache-content-type/-/cache-content-type-1.0.1.tgz#035cde2b08ee2129f4a8315ea8f00a00dba1453c" @@ -2597,16 +2465,6 @@ cjs-module-lexer@^1.0.0: resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - cli-boxes@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" @@ -2679,14 +2537,6 @@ collect-v8-coverage@^1.0.0: resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg== -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw== - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -2743,7 +2593,7 @@ commoner@^0.10.1: q "^1.1.2" recast "^0.11.17" -component-emitter@^1.2.1, component-emitter@^1.3.0: +component-emitter@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== @@ -2773,13 +2623,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concat-with-sourcemaps@*: - version "1.1.0" - resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" - integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== - dependencies: - source-map "^0.6.1" - configstore@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" @@ -2849,11 +2692,6 @@ cookies@~0.8.0: depd "~2.0.0" keygrip "~1.1.0" -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== - copyfiles@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.4.1.tgz#d2dcff60aaad1015f09d0b66e7f0f1c5cd3c5da5" @@ -2945,11 +2783,6 @@ dateformat@^4.5.1: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== -dayjs@^1.10.4: - version "1.11.7" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" - integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== - debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -2957,13 +2790,6 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, d dependencies: ms "2.1.2" -debug@^2.2.0, debug@^2.3.3: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - debug@^3.1.0, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -2976,11 +2802,6 @@ debuglog@^1.0.0: resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha512-syBZ+rnAK3EgMsH2aYEOLUW7mZSY9Gb+0wUMCFsZvcmiz+HigA0LOcq/HoQqVuGG+EKykunc7QG2bzrponfaSw== -decode-uri-component@^0.2.0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" - integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== - decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" @@ -3020,13 +2841,6 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== -default-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" - integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== - dependencies: - kind-of "^5.0.2" - defer-to-connect@^1.0.1: version "1.1.3" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" @@ -3053,28 +2867,6 @@ define-properties@^1.1.3, define-properties@^1.1.4: has-property-descriptors "^1.0.0" object-keys "^1.1.1" -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA== - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA== - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - defined@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" @@ -3332,11 +3124,6 @@ end-stream@~0.1.0: dependencies: write-stream "~0.4.3" -ent@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== - errno@~0.1.1: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" @@ -3601,19 +3388,6 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA== - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - expect@^28.1.3: version "28.1.3" resolved "https://registry.yarnpkg.com/expect/-/expect-28.1.3.tgz#90a7c1a124f1824133dd4533cce2d2bdcb6603ec" @@ -3625,21 +3399,6 @@ expect@^28.1.3: jest-message-util "^28.1.3" jest-util "^28.1.3" -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug== - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q== - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - extend@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" @@ -3654,20 +3413,6 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -3780,16 +3525,6 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ== - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -3834,11 +3569,6 @@ follow-redirects@^1.15.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== -for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ== - forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -3891,13 +3621,6 @@ forwarded-parse@^2.1.0: resolved "https://registry.yarnpkg.com/forwarded-parse/-/forwarded-parse-2.1.2.tgz#08511eddaaa2ddfd56ba11138eee7df117a09325" integrity sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw== -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA== - dependencies: - map-cache "^0.2.2" - fresh@^0.5.2, fresh@~0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" @@ -3908,11 +3631,6 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-exists-sync@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" - integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg== - fs-minipass@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" @@ -3989,14 +3707,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: has "^1.0.3" has-symbols "^1.0.3" -get-object@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" - integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ== - dependencies: - is-number "^2.0.2" - isobject "^0.2.0" - get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -4034,18 +3744,6 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== - -get-value@^3.0.0, get-value@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" - integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== - dependencies: - isobject "^3.0.1" - getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -4172,35 +3870,6 @@ graceful-fs@^4.1.2, graceful-fs@^4.2.9: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -gulp-header@^1.7.1: - version "1.8.12" - resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" - integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== - dependencies: - concat-with-sourcemaps "*" - lodash.template "^4.4.0" - through2 "^2.0.0" - -handlebars-utils@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" - integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== - dependencies: - kind-of "^6.0.0" - typeof-article "^0.1.1" - -handlebars@^4.7.6, handlebars@^4.7.7: - version "4.7.7" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" - integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== - dependencies: - minimist "^1.2.5" - neo-async "^2.6.0" - source-map "^0.6.1" - wordwrap "^1.0.0" - optionalDependencies: - uglify-js "^3.1.4" - har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -4253,52 +3922,6 @@ has-unicode@^2.0.1: resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q== - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw== - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-value@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658" - integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA== - dependencies: - get-value "^3.0.0" - has-values "^2.0.1" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ== - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ== - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -has-values@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d" - integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w== - dependencies: - kind-of "^6.0.2" - has-yarn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" @@ -4311,16 +3934,6 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -helper-md@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" - integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q== - dependencies: - ent "^2.2.0" - extend-shallow "^2.0.1" - fs-exists-sync "^0.1.0" - remarkable "^1.6.2" - hexoid@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18" @@ -4331,14 +3944,6 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-tag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" - integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== - dependencies: - is-self-closing "^1.0.1" - kind-of "^6.0.0" - http-assert@^1.3.0: version "1.5.0" resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.5.0.tgz#c389ccd87ac16ed2dfa6246fd73b926aa00e6b8f" @@ -4598,20 +4203,6 @@ ioredis@^4.28.5: redis-parser "^3.0.0" standard-as-callback "^2.1.0" -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A== - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== - dependencies: - kind-of "^6.0.0" - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -4639,7 +4230,7 @@ is-boolean-object@^1.1.0: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-buffer@^1.1.5, is-buffer@~1.1.6: +is-buffer@~1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== @@ -4675,20 +4266,6 @@ is-core-module@^2.9.0: dependencies: has "^1.0.3" -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg== - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== - dependencies: - kind-of "^6.0.0" - is-date-object@^1.0.1: version "1.0.5" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" @@ -4696,43 +4273,6 @@ is-date-object@^1.0.1: dependencies: has-tostringtag "^1.0.0" -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-even@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" - integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg== - dependencies: - is-odd "^0.1.2" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw== - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -4817,20 +4357,6 @@ is-number-object@^1.0.4: dependencies: has-tostringtag "^1.0.0" -is-number@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg== - dependencies: - kind-of "^3.0.2" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg== - dependencies: - kind-of "^3.0.2" - is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -4841,25 +4367,11 @@ is-obj@^2.0.0: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== -is-odd@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" - integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw== - dependencies: - is-number "^3.0.0" - is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== -is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -4873,13 +4385,6 @@ is-retry-allowed@^2.2.0: resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d" integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg== -is-self-closing@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" - integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== - dependencies: - self-closing-tags "^1.0.1" - is-shared-array-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" @@ -4927,11 +4432,6 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - is-yarn-global@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" @@ -4942,7 +4442,7 @@ isarray@0.0.1: resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== -isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: +isarray@^1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== @@ -4952,23 +4452,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -isobject@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" - integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ== - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA== - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== - isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" @@ -5569,30 +5052,6 @@ keyv@^4.0.0: compress-brotli "^1.3.8" json-buffer "3.0.1" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw== - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0, kind-of@^5.0.2: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - kleur@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" @@ -5839,11 +5298,6 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== - lodash.defaults@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" @@ -5909,22 +5363,7 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== -lodash.template@^4.4.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" - integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.templatesettings "^4.0.0" - -lodash.templatesettings@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" - integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== - dependencies: - lodash._reinterpolate "^3.0.0" - -lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21: +lodash@4.17.21, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5993,18 +5432,6 @@ makeerror@1.0.12: dependencies: tmpl "1.0.5" -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg== - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w== - dependencies: - object-visit "^1.0.0" - mapcap@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/mapcap/-/mapcap-1.0.0.tgz#e8e29d04a160eaf8c92ec4bcbd2c5d07ed037e5a" @@ -6081,25 +5508,6 @@ methods@^1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== -micromatch@^3.1.5: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - micromatch@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" @@ -6157,11 +5565,6 @@ minimist@^1.2.0, minimist@^1.2.6: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== -minimist@^1.2.5: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== - minipass@^3.0.0: version "3.1.6" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee" @@ -6177,14 +5580,6 @@ minizlib@^2.1.1: minipass "^3.0.0" yallist "^4.0.0" -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - mkdirp-classic@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" @@ -6217,11 +5612,6 @@ mri@1.1.4: resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.4.tgz#7cb1dd1b9b40905f1fac053abe25b6720f44744a" integrity sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w== -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -6258,23 +5648,6 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - napi-macros@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b" @@ -6300,11 +5673,6 @@ negotiator@0.6.3: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -neo-async@^2.6.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - next-line@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/next-line/-/next-line-1.1.0.tgz#fcae57853052b6a9bae8208e40dd7d3c2d304603" @@ -6473,15 +5841,6 @@ object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ== - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - object-filter-sequence@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/object-filter-sequence/-/object-filter-sequence-1.0.0.tgz#10bb05402fff100082b80d7e83991b10db411692" @@ -6504,13 +5863,6 @@ object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA== - dependencies: - isobject "^3.0.0" - object.assign@^4.1.2: version "4.1.4" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" @@ -6530,13 +5882,6 @@ object.entries@^1.0.4, object.entries@^1.1.0: define-properties "^1.1.3" es-abstract "^1.19.1" -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== - dependencies: - isobject "^3.0.1" - on-finished@^2.3.0: version "2.4.1" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" @@ -6677,11 +6022,6 @@ parseurl@^1.3.2, parseurl@^1.3.3: resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== - passport-google-oauth1@1.x.x: version "1.0.0" resolved "https://registry.yarnpkg.com/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz#af74a803df51ec646f66a44d82282be6f108e0cc" @@ -6876,11 +6216,6 @@ pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== - posthog-node@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/posthog-node/-/posthog-node-1.3.0.tgz#804ed2f213a2f05253f798bf9569d55a9cad94f7" @@ -7413,14 +6748,6 @@ regenerator-runtime@^0.13.4: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - regexp.prototype.flags@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" @@ -7454,36 +6781,11 @@ relative-microtime@^2.0.0: resolved "https://registry.yarnpkg.com/relative-microtime/-/relative-microtime-2.0.0.tgz#cceed2af095ecd72ea32011279c79e5fcc7de29b" integrity sha512-l18ha6HEZc+No/uK4GyAnNxgKW7nvEe35IaeN54sShMojtqik2a6GbTyuiezkjpPaqP874Z3lW5ysBo5irz4NA== -relative@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" - integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA== - dependencies: - isobject "^2.0.0" - -remarkable@^1.6.2: - version "1.7.4" - resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" - integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== - dependencies: - argparse "^1.0.10" - autolinker "~0.28.0" - remove-trailing-slash@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz#be2285a59f39c74d1bce4f825950061915e3780d" integrity sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA== -repeat-element@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" - integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== - -repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== - request@^2.88.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" @@ -7559,11 +6861,6 @@ resolve-path@^1.4.0: http-errors "~1.6.2" path-is-absolute "1.0.1" -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== - resolve.exports@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" @@ -7609,11 +6906,6 @@ restore-cursor@^3.1.0: onetime "^5.1.0" signal-exit "^3.0.2" -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== - reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -7679,13 +6971,6 @@ safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg== - dependencies: - ret "~0.1.10" - "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -7706,11 +6991,6 @@ sax@>=0.1.1, sax@>=0.6.0: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -self-closing-tags@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" - integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== - semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" @@ -7769,16 +7049,6 @@ set-cookie-serde@^1.0.0: resolved "https://registry.yarnpkg.com/set-cookie-serde/-/set-cookie-serde-1.0.0.tgz#bcf9c260ed2212ac4005a53eacbaaa37c07ac452" integrity sha512-Vq8e5GsupfJ7okHIvEPcfs5neCo7MZ1ZuWrO3sllYi3DOWt6bSSCpADzqXjz3k0fXehnoFIrmmhty9IN6U6BXQ== -set-value@^2.0.0, set-value@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" - integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - setprototypeof@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" @@ -7856,36 +7126,6 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - sonic-boom@^1.0.2: version "1.4.1" resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-1.4.1.tgz#d35d6a74076624f12e6f917ade7b9d75e918f53e" @@ -7894,17 +7134,6 @@ sonic-boom@^1.0.2: atomic-sleep "^1.0.0" flatstr "^1.0.12" -source-map-resolve@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" - integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - source-map-support@0.5.13: version "0.5.13" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932" @@ -7913,11 +7142,6 @@ source-map-support@0.5.13: buffer-from "^1.0.0" source-map "^0.6.0" -source-map-url@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" - integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== - source-map@^0.4.2: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" @@ -7925,11 +7149,6 @@ source-map@^0.4.2: dependencies: amdefine ">=0.0.4" -source-map@^0.5.6, source-map@~0.5.0: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== - source-map@^0.6.0, source-map@^0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" @@ -7942,6 +7161,11 @@ source-map@^0.8.0-beta.0: dependencies: whatwg-url "^7.0.0" +source-map@~0.5.0: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== + spark-md5@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.1.tgz#83a0e255734f2ab4e5c466e5a2cfc9ba2aa2124d" @@ -7952,13 +7176,6 @@ spark-md5@3.0.2: resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.2.tgz#7952c4a30784347abcee73268e473b9c0167e3fc" integrity sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw== -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== - dependencies: - extend-shallow "^3.0.0" - split2@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493" @@ -8020,14 +7237,6 @@ standard-as-callback@^2.1.0: resolved "https://registry.yarnpkg.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz#8953fc05359868a77b5b9739a665c5977bb7df45" integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A== -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g== - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - statuses@2.0.1, statuses@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" @@ -8157,11 +7366,6 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== -striptags@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" - integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== - sublevel-pouchdb@7.2.2: version "7.2.2" resolved "https://registry.yarnpkg.com/sublevel-pouchdb/-/sublevel-pouchdb-7.2.2.tgz#49e46cd37883bf7ff5006d7c5b9bcc7bcc1f422f" @@ -8344,31 +7548,11 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= -to-gfm-code-block@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" - integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg== - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg== - dependencies: - kind-of "^3.0.2" - to-readable-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg== - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" @@ -8376,16 +7560,6 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - to-source-code@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/to-source-code/-/to-source-code-1.0.2.tgz#dd136bdb1e1dbd80bbeacf088992678e9070bfea" @@ -8567,23 +7741,11 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typeof-article@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" - integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw== - dependencies: - kind-of "^3.1.0" - typescript@4.7.3: version "4.7.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== -uglify-js@^3.1.4: - version "3.17.4" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" - integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== - uid2@0.0.x: version "0.0.4" resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz#033f3b1d5d32505f5ce5f888b9f3b667123c0a44" @@ -8617,16 +7779,6 @@ unicode-substring@^0.1.0: resolved "https://registry.yarnpkg.com/unicode-substring/-/unicode-substring-0.1.0.tgz#6120ce3c390385dbcd0f60c32b9065c4181d4b36" integrity sha512-36Xaw9wXi7MB/3/EQZZHkZyyiRNa9i3k9YtPAz2KfqMVH2xutdXyMHn4Igarmnvr+wOrfWa/6njhY+jPpXN2EQ== -union-value@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" - integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^2.0.1" - unique-string@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" @@ -8649,14 +7801,6 @@ unpipe@1.0.0: resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ== - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - untildify@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" @@ -8707,11 +7851,6 @@ urijs@^1.19.2: resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc" integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ== -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg== - url-parse-lax@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" @@ -8735,11 +7874,6 @@ url@0.10.3: punycode "1.3.2" querystring "0.2.0" -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== - util-deprecate@^1.0.1, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -8803,14 +7937,6 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vm2@^3.9.4: - version "3.9.13" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.13.tgz#774a1a3d73b9b90b1aa45bcc5f25e349f2eef649" - integrity sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q== - dependencies: - acorn "^8.7.0" - acorn-walk "^8.2.0" - vuvuzela@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b" @@ -8902,11 +8028,6 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== - wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -9034,11 +8155,6 @@ yargs@^17.3.1: y18n "^5.0.5" yargs-parser "^21.1.1" -year@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" - integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w== - ylru@^1.2.0: version "1.3.2" resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.3.2.tgz#0de48017473275a4cbdfc83a1eaf67c01af8a785" From 53fa5d99b261408724895832f762da3019553412 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 24 Jan 2023 11:02:58 +0000 Subject: [PATCH 194/387] Use docker-compose dev for dev testing --- jestTestcontainersConfigGenerator.js | 38 +++++++++++++------ packages/server/.env.test | 7 ---- packages/server/jest-testcontainers-config.js | 2 +- 3 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 packages/server/.env.test diff --git a/jestTestcontainersConfigGenerator.js b/jestTestcontainersConfigGenerator.js index 6e01efea32..c74bcea1bc 100644 --- a/jestTestcontainersConfigGenerator.js +++ b/jestTestcontainersConfigGenerator.js @@ -1,12 +1,26 @@ -module.exports = env => ({ - devEnv: { - image: "budibase/dependencies", - tag: "latest", - ports: [6379, 5984, 9000], - env, - wait: { - type: "text", - text: "Test environment started...", - }, - }, -}) + + +module.exports = dependenciesEnv => { + if (process.env.DEV_TOOLS) { + return { + dockerCompose: { + composeFilePath: `${__dirname}/hosting`, + composeFile: 'docker-compose.dev.yaml', + startupTimeout: 10000, + } + } + } + + return { + devEnv: { + image: "budibase/dependencies", + tag: "latest", + ports: [6379, 5984, 9000], + env: dependenciesEnv, + wait: { + type: "text", + text: "Test environment started...", + }, + } + } +} diff --git a/packages/server/.env.test b/packages/server/.env.test deleted file mode 100644 index 07f6afa889..0000000000 --- a/packages/server/.env.test +++ /dev/null @@ -1,7 +0,0 @@ -JWT_SECRET=testsecret -COUCHDB_USER=test_couchdb_user -COUCH_DB_USER=test_couchdb_user -COUCHDB_PASSWORD=test_couchdb_password -COUCH_DB_PASSWORD=test_couchdb_password -MINIO_ACCESS_KEY=budibase -MINIO_SECRET_KEY=budibase \ No newline at end of file diff --git a/packages/server/jest-testcontainers-config.js b/packages/server/jest-testcontainers-config.js index 30ed1503d8..8a19389492 100644 --- a/packages/server/jest-testcontainers-config.js +++ b/packages/server/jest-testcontainers-config.js @@ -1,6 +1,6 @@ const { join } = require("path") const { parsed: env } = require("dotenv").config({ - path: join(__dirname, ".env.test"), + path: join(__dirname, "..", "..", "hosting", ".env"), }) const jestTestcontainersConfigGenerator = require("../../jestTestcontainersConfigGenerator") From 792f4cf7725c129802c0460567887bf2f8caa055 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 24 Jan 2023 12:38:22 +0000 Subject: [PATCH 195/387] Fix nginx.dev --- hosting/nginx.dev.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hosting/nginx.dev.conf b/hosting/nginx.dev.conf index 5e37ba42a1..1ecee422cd 100644 --- a/hosting/nginx.dev.conf +++ b/hosting/nginx.dev.conf @@ -53,7 +53,7 @@ http { } location /db/ { - proxy_pass http://dev-service:5984; + proxy_pass http://couchdb-service:5984; rewrite ^/db/(.*)$ /$1 break; } @@ -183,7 +183,7 @@ http { proxy_set_header Connection ""; chunked_transfer_encoding off; - proxy_pass http://dev-service:9000; + proxy_pass http://minio-service:9000; } location /files/signed/ { @@ -194,7 +194,7 @@ http { # IMPORTANT: Signed urls will inspect the host header of the request. # Normally a signed url will need to be generated with a specified client host in mind. # To support dynamic hosts, e.g. some unknown self-hosted installation url, - # use a predefined host header. The host 'dev-service' is also used at the time of url signing. + # use a predefined host header. The host 'minio-service' is also used at the time of url signing. proxy_set_header Host minio-service; proxy_connect_timeout 300; @@ -202,7 +202,7 @@ http { proxy_set_header Connection ""; chunked_transfer_encoding off; - proxy_pass http://dev-service:9000; + proxy_pass http://minio-service:9000; rewrite ^/files/signed/(.*)$ /$1 break; } From fc6c4d52903a3a62684fe50766eb83c89ac744e0 Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 24 Jan 2023 14:06:28 +0000 Subject: [PATCH 196/387] Remove test logic from getAllDbs --- hosting/.env | 2 ++ packages/backend-core/src/db/utils.ts | 7 ++----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hosting/.env b/hosting/.env index c5638a266f..7616487c40 100644 --- a/hosting/.env +++ b/hosting/.env @@ -8,6 +8,8 @@ MINIO_ACCESS_KEY=budibase MINIO_SECRET_KEY=budibase COUCH_DB_PASSWORD=budibase COUCH_DB_USER=budibase +COUCHDB_PASSWORD=budibase +COUCHDB_USER=budibase REDIS_PASSWORD=budibase INTERNAL_API_KEY=budibase diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts index 5e501c8d22..233d044eaa 100644 --- a/packages/backend-core/src/db/utils.ts +++ b/packages/backend-core/src/db/utils.ts @@ -10,7 +10,7 @@ import { APP_PREFIX, } from "../constants" import { getTenantId, getGlobalDB, getGlobalDBName } from "../context" -import { doWithDB, allDbs, directCouchAllDbs } from "./db" +import { doWithDB, directCouchAllDbs } from "./db" import { getAppMetadata } from "../cache/appMetadata" import { isDevApp, isDevAppID, getProdAppID } from "./conversions" import * as events from "../events" @@ -262,10 +262,7 @@ export function getStartEndKeyURL(baseKey: any, tenantId?: string) { */ export async function getAllDbs(opts = { efficient: false }) { const efficient = opts && opts.efficient - // specifically for testing we use the pouch package for this - if (env.isTest()) { - return allDbs() - } + let dbs: any[] = [] async function addDbs(queryString?: string) { const json = await directCouchAllDbs(queryString) From 0ca1521a5813ebad8434546c98f2d799c2f96925 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 24 Jan 2023 15:24:29 +0000 Subject: [PATCH 197/387] css updates to dropdown component --- .../bbui/src/Form/Core/EnvDropdown.svelte | 69 ++++++++++--------- .../IntegrationConfigForm.svelte | 1 - .../CreateEditVariableModal.svelte | 4 ++ 3 files changed, 42 insertions(+), 32 deletions(-) diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte index 9b6346a8e1..e3cb33f555 100644 --- a/packages/bbui/src/Form/Core/EnvDropdown.svelte +++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte @@ -3,7 +3,6 @@ import { createEventDispatcher, onMount } from "svelte" import clickOutside from "../../Actions/click_outside" import Divider from "../../Divider/Divider.svelte" - import Body from "../../Typography/Body.svelte" export let value = null export let placeholder = null export let type = "text" @@ -16,11 +15,12 @@ export let autofocus = false export let variables export let showModal - $: console.log(showModal) + const dispatch = createEventDispatcher() let field let focus = false + let iconFocused = false let open = false const updateValue = newValue => { @@ -69,14 +69,15 @@ if (open) { event.stopPropagation() open = false + focus = false + iconFocused = false dispatch("closed") } } const handleVarSelect = variable => { - console.log(variable) open = false - updateValue(`{{ ${variable} }}`) + updateValue(`{{ env.${variable} }}`) } onMount(() => { @@ -86,15 +87,17 @@
-
+
@@ -127,7 +130,11 @@ use:clickOutside={handleOutsideClick} class="spectrum-Popover spectrum-Popover--bottom spectrum-Picker-popover is-open" > -
    +
      {#if variables.length} {#each variables as variable, idx}
    • {/each} {:else} -
    • - -
      - You don't have any environment variables yet -
      -       -
      • +
      + You don't have any environment variables yet +
      {/if}
    -
    +
    showModal()} class="add-variable"> -
    showModal()} class="primary-text"> - Add Variable -
    +
    Add Variable
    {/if} @@ -209,12 +210,6 @@ min-width: 0; width: 100%; } - .spectrum-InputGroup :global(.spectrum-Search-input) { - border: none; - border-bottom: 1px solid var(--spectrum-global-color-gray-300); - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - } .spectrum-Popover { max-height: 240px; @@ -226,10 +221,13 @@ width: 100%; } - /* Fix focus borders to show only when opened */ - .spectrum-Textfield-input { - border-color: var(--spectrum-global-color-gray-400) !important; - border-right-width: 1px; + .no-variables-height { + height: 100px; + } + + .no-variables-text { + padding: var(--spacing-m); + color: var(--spectrum-global-color-gray-600); } .add-variable { @@ -237,5 +235,14 @@ padding: var(--spacing-m) 0 var(--spacing-m) var(--spacing-m); align-items: center; gap: var(--spacing-s); + cursor: pointer; + } + + .focused { + color: var(--spectrum-global-color-blue-400); + } + + .add-variable:hover { + background: var(--grey-1); } diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte index fab633ffa2..f960c63c08 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte @@ -124,7 +124,6 @@ { try { environment.deleteVariable(name) + modalContext.hide() notifications.success("Environment variable deleted") } catch (err) { notifications.error(err.message) From 22e1c1cccf6119937815d1a357a930db68f40ead Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 24 Jan 2023 15:44:34 +0000 Subject: [PATCH 198/387] ensure object is passed to processObjectSync --- packages/server/src/sdk/app/datasources/datasources.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/sdk/app/datasources/datasources.ts b/packages/server/src/sdk/app/datasources/datasources.ts index 60ee2e8906..302b340600 100644 --- a/packages/server/src/sdk/app/datasources/datasources.ts +++ b/packages/server/src/sdk/app/datasources/datasources.ts @@ -15,7 +15,7 @@ const ENV_VAR_PREFIX = "env." async function enrichDatasourceWithValues(datasource: Datasource) { const cloned = cloneDeep(datasource) const env = await getEnvironmentVariables() - const processed = processObjectSync(cloned, env) + const processed = processObjectSync(cloned, { env }) return { datasource: processed as Datasource, envVars: env as Record, From 26fa3bd4841bd9a9fce60eae0d4b1453a1a8eb4e Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 24 Jan 2023 15:46:50 +0000 Subject: [PATCH 199/387] tweak tests --- packages/backend-core/src/db/db.ts | 6 ------ packages/server/src/api/controllers/application.ts | 9 ++------- packages/server/src/tests/jestEnv.ts | 5 ----- packages/server/src/tests/jestSetup.ts | 6 ------ 4 files changed, 2 insertions(+), 24 deletions(-) diff --git a/packages/backend-core/src/db/db.ts b/packages/backend-core/src/db/db.ts index c54a4faea4..bd6b5e13c1 100644 --- a/packages/backend-core/src/db/db.ts +++ b/packages/backend-core/src/db/db.ts @@ -6,12 +6,6 @@ import { DatabaseImpl } from "../db" const dbList = new Set() export function getDB(dbName?: string, opts?: any): Database { - // TODO: once using the test image, need to remove this - // if (env.isTest()) { - // dbList.add(dbName) - // // @ts-ignore - // return getPouchDB(dbName, opts) - // } return new DatabaseImpl(dbName, opts) } diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index 06e7dc8a57..08482dbfca 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -319,10 +319,7 @@ async function performAppCreate(ctx: BBContext) { const response = await db.put(newApplication, { force: true }) newApplication._rev = response.rev - /* istanbul ignore next */ - if (!env.isTest()) { - await createApp(appId) - } + await createApp(appId) await cache.app.invalidateAppMetadata(appId, newApplication) return newApplication @@ -499,9 +496,7 @@ async function destroyApp(ctx: BBContext) { await quotas.removeApp() await events.app.deleted(app) - if (!env.isTest()) { - await deleteApp(appId) - } + await deleteApp(appId) await removeAppFromUserRoles(ctx, appId) await cache.app.invalidateAppMetadata(devAppId) diff --git a/packages/server/src/tests/jestEnv.ts b/packages/server/src/tests/jestEnv.ts index 26f73e3119..9b60282897 100644 --- a/packages/server/src/tests/jestEnv.ts +++ b/packages/server/src/tests/jestEnv.ts @@ -3,11 +3,6 @@ import { tmpdir } from "os" env._set("SELF_HOSTED", "1") env._set("NODE_ENV", "jest") -env._set("CLIENT_ID", "test-client-id") // @ts-ignore env._set("BUDIBASE_DIR", tmpdir("budibase-unittests")) env._set("LOG_LEVEL", "silent") -env._set("PORT", 0) -env._set("MINIO_URL", "http://localhost") -env._set("MINIO_ACCESS_KEY", "test") -env._set("MINIO_SECRET_KEY", "test") diff --git a/packages/server/src/tests/jestSetup.ts b/packages/server/src/tests/jestSetup.ts index 8ca0667fc3..c97d2ae69d 100644 --- a/packages/server/src/tests/jestSetup.ts +++ b/packages/server/src/tests/jestSetup.ts @@ -1,11 +1,5 @@ import env from "../environment" import { env as coreEnv } from "@budibase/backend-core" -import { mocks } from "@budibase/backend-core/tests" - -// mock all dates to 2020-01-01T00:00:00.000Z -// use tk.reset() to use real dates in individual tests -const tk = require("timekeeper") -tk.freeze(mocks.date.MOCK_DATE) if (!process.env.DEBUG) { global.console.log = jest.fn() // console.log are ignored in tests From 9371f19419ae109696b07e82d17860fadfa9ee2a Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 24 Jan 2023 17:48:49 +0000 Subject: [PATCH 200/387] Remove mocks --- packages/server/__mocks__/aws-sdk.ts | 80 ------------------- .../src/api/routes/tests/backup.spec.ts | 10 --- .../src/tests/utilities/TestConfiguration.ts | 15 +++- 3 files changed, 11 insertions(+), 94 deletions(-) delete mode 100644 packages/server/__mocks__/aws-sdk.ts diff --git a/packages/server/__mocks__/aws-sdk.ts b/packages/server/__mocks__/aws-sdk.ts deleted file mode 100644 index 2efbd303f2..0000000000 --- a/packages/server/__mocks__/aws-sdk.ts +++ /dev/null @@ -1,80 +0,0 @@ -module AwsMock { - const aws: any = {} - - const response = (body: any) => () => ({ promise: () => body }) - - function DocumentClient() { - // @ts-ignore - this.put = jest.fn(response({})) - // @ts-ignore - this.query = jest.fn( - response({ - Items: [], - }) - ) - // @ts-ignore - this.scan = jest.fn( - response({ - Items: [ - { - Name: "test", - }, - ], - }) - ) - // @ts-ignore - this.get = jest.fn(response({})) - // @ts-ignore - this.update = jest.fn(response({})) - // @ts-ignore - this.delete = jest.fn(response({})) - } - - function S3() { - // @ts-ignore - this.listObjects = jest.fn( - response({ - Contents: {}, - }) - ) - - // @ts-ignore - this.createBucket = jest.fn( - response({ - Contents: {}, - }) - ) - - // @ts-ignore - this.deleteObjects = jest.fn( - response({ - Contents: {}, - }) - ) - - // @ts-ignore - this.getSignedUrl = (operation, params) => { - return `http://test.com/${params.Bucket}/${params.Key}` - } - - // @ts-ignore - this.headBucket = jest.fn( - response({ - Contents: {}, - }) - ) - - // @ts-ignore - this.upload = jest.fn( - response({ - Contents: {}, - }) - ) - } - - aws.DynamoDB = { DocumentClient } - aws.S3 = S3 - aws.config = { update: jest.fn() } - - module.exports = aws -} diff --git a/packages/server/src/api/routes/tests/backup.spec.ts b/packages/server/src/api/routes/tests/backup.spec.ts index 72ccb41598..7ab4f2b531 100644 --- a/packages/server/src/api/routes/tests/backup.spec.ts +++ b/packages/server/src/api/routes/tests/backup.spec.ts @@ -1,13 +1,3 @@ -jest.mock("@budibase/backend-core", () => { - const core = jest.requireActual("@budibase/backend-core") - return { - ...core, - objectStore: { - budibaseTempDir: core.objectStore.budibaseTempDir, - }, - } -}) - import * as setup from "./utilities" import { events } from "@budibase/backend-core" import sdk from "../../../sdk" diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index 7ac20e14ef..35535d5aaa 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -137,15 +137,22 @@ class TestConfiguration { return this.createApp(appName) } - end() { + async end() { if (!this) { return } - if (this.server) { - this.server.close() - } if (this.allApps) { cleanup(this.allApps.map(app => app.appId)) + + await this._req( + null, + { appId: this.prodApp.appId }, + controllers.app.destroy + ) + } + + if (this.server) { + this.server.close() } } From 6259ffad3bc363999eedc9daad615a1e4d9becda Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Tue, 24 Jan 2023 18:51:15 +0000 Subject: [PATCH 201/387] Wipe db before tests --- .../src/tests/utilities/TestConfiguration.ts | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index 35535d5aaa..b59e3591fc 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -38,6 +38,8 @@ import { cleanup } from "../../utilities/fileSystem" import newid from "../../db/newid" import { generateUserMetadataID } from "../../db/utils" import { startup } from "../../startup" +import { db } from "@budibase/backend-core" +import Nano from "@budibase/nano" const supertest = require("supertest") const GLOBAL_USER_ID = "us_uuid1" @@ -127,6 +129,7 @@ class TestConfiguration { // use a new id as the name to avoid name collisions async init(appName = newid()) { + await this.cleanAllDbs() if (!this.started) { await startup() } @@ -137,23 +140,34 @@ class TestConfiguration { return this.createApp(appName) } - async end() { + async cleanAllDbs() { + const couchInfo = db.getCouchInfo() + const nano = Nano({ + url: couchInfo.url, + requestDefaults: { + headers: { + Authorization: couchInfo.cookie, + }, + }, + parseUrl: false, + }) + let dbs + do { + dbs = await nano.db.list() + await Promise.all(dbs.map(x => nano.db.destroy(x))) + } while (dbs.length) + } + + end() { if (!this) { return } - if (this.allApps) { - cleanup(this.allApps.map(app => app.appId)) - - await this._req( - null, - { appId: this.prodApp.appId }, - controllers.app.destroy - ) - } - if (this.server) { this.server.close() } + if (this.allApps) { + cleanup(this.allApps.map(app => app.appId)) + } } // UTILS From 6349b0888830b02b9e41224eb0befffdc2b48c1b Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 24 Jan 2023 18:56:19 +0000 Subject: [PATCH 202/387] Don't check whether or not a datasource uses env vars when the function specifically includes the env vars, always fetch them so that they can be returned and put into context for queries to use. --- packages/server/src/sdk/app/datasources/datasources.ts | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packages/server/src/sdk/app/datasources/datasources.ts b/packages/server/src/sdk/app/datasources/datasources.ts index 302b340600..ed18e43928 100644 --- a/packages/server/src/sdk/app/datasources/datasources.ts +++ b/packages/server/src/sdk/app/datasources/datasources.ts @@ -43,14 +43,7 @@ export async function get( export async function getWithEnvVars(datasourceId: string) { const appDb = context.getAppDB() const datasource = await appDb.get(datasourceId) - const blocks = findHBSBlocks(JSON.stringify(datasource)) - const usesEnvVars = - blocks.find(block => block.includes(ENV_VAR_PREFIX)) != null - if (usesEnvVars) { - return enrichDatasourceWithValues(datasource) - } else { - return datasource - } + return enrichDatasourceWithValues(datasource) } export function isValid(datasource: Datasource) { From fe7b632727904fbb0b6fb46b08837a4fdedf4278 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 24 Jan 2023 19:09:36 +0000 Subject: [PATCH 203/387] Quick updates for #8989 - this issue appeared to be fixed already but just adding a few extra bits of security to make sure that looping only occurs when valid data is found in the binding. --- packages/bbui/yarn.lock | 8 ++++---- packages/server/src/threads/automation.ts | 14 +++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/bbui/yarn.lock b/packages/bbui/yarn.lock index 3286c33e69..16f1feb920 100644 --- a/packages/bbui/yarn.lock +++ b/packages/bbui/yarn.lock @@ -114,10 +114,10 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74" integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA== -"@spectrum-css/actionbutton@^1.0.1": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.2.tgz#7753a94c64cebecfca6749ef20e37a5ea80c59be" - integrity sha512-laDWk7PCgy2I0AGsMjTmYKkiMVYVoF1B4tffJf4cIp66znTiqPHEbLDh5EDNU88JLTY2bWoCOY4cJxvXk5gERw== +"@spectrum-css/actionbutton@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577" + integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw== "@spectrum-css/actiongroup@1.0.1": version "1.0.1" diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts index 44951869f4..d765ef8472 100644 --- a/packages/server/src/threads/automation.ts +++ b/packages/server/src/threads/automation.ts @@ -37,9 +37,13 @@ function getLoopIterations(loopStep: LoopStep, input: LoopInput) { if (!loopStep || !binding) { return 1 } - return Array.isArray(binding) - ? binding.length - : automationUtils.stringSplit(binding).length + if (Array.isArray(binding)) { + return binding.length + } + if (typeof binding === "string") { + return automationUtils.stringSplit(binding).length + } + return 1 } /** @@ -280,13 +284,13 @@ class Orchestrator { break } - let item + let item = [] if ( typeof loopStep.inputs.binding === "string" && loopStep.inputs.option === "String" ) { item = automationUtils.stringSplit(newInput.binding) - } else { + } else if (Array.isArray(loopStep.inputs.binding)) { item = loopStep.inputs.binding } this._context.steps[loopStepNumber] = { From 767b7839234b93739d9efaf7acd6476b92f1750d Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 25 Jan 2023 09:15:12 +0000 Subject: [PATCH 204/387] Fix upgrade button not working when account portal is an external URL --- .../src/pages/builder/portal/_components/UpgradeButton.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte b/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte index 7de6205a31..5b02bb1e84 100644 --- a/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte +++ b/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte @@ -10,7 +10,7 @@ size="S" on:click on:click={() => { - $goto($admin.accountPortalUrl + "/portal/upgrade") + window.open($admin.accountPortalUrl + "/portal/upgrade", "_blank") }} > Upgrade From e9b1c9e063f1d9e44399fa870fa0a510e0510373 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 25 Jan 2023 09:25:53 +0000 Subject: [PATCH 205/387] v2.2.12-alpha.36 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index fa4cea6971..0b0801c9f6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 2344dc27ae..ecfdaed67d 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.35", + "@budibase/types": "2.2.12-alpha.36", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 7c6ccfcc38..3894241cac 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.35", + "@budibase/string-templates": "2.2.12-alpha.36", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index fca2f69bc6..59bcafbc58 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.35", - "@budibase/client": "2.2.12-alpha.35", - "@budibase/frontend-core": "2.2.12-alpha.35", - "@budibase/string-templates": "2.2.12-alpha.35", + "@budibase/bbui": "2.2.12-alpha.36", + "@budibase/client": "2.2.12-alpha.36", + "@budibase/frontend-core": "2.2.12-alpha.36", + "@budibase/string-templates": "2.2.12-alpha.36", "@sentry/browser": "5.19.1", "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 408c76a762..78ab0eba82 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.35", - "@budibase/string-templates": "2.2.12-alpha.35", - "@budibase/types": "2.2.12-alpha.35", + "@budibase/backend-core": "2.2.12-alpha.36", + "@budibase/string-templates": "2.2.12-alpha.36", + "@budibase/types": "2.2.12-alpha.36", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 33b9aa82f4..3b37ac41e9 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.35", - "@budibase/frontend-core": "2.2.12-alpha.35", - "@budibase/string-templates": "2.2.12-alpha.35", + "@budibase/bbui": "2.2.12-alpha.36", + "@budibase/frontend-core": "2.2.12-alpha.36", + "@budibase/string-templates": "2.2.12-alpha.36", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index dc45bb9a9a..3ca233c979 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.35", + "@budibase/bbui": "2.2.12-alpha.36", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0a870d9b0e..6ff23b743a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index db493c2b8a..f9d27397cc 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.35", - "@budibase/client": "2.2.12-alpha.35", + "@budibase/backend-core": "2.2.12-alpha.36", + "@budibase/client": "2.2.12-alpha.36", "@budibase/pro": "2.2.12-alpha.35", - "@budibase/string-templates": "2.2.12-alpha.35", - "@budibase/types": "2.2.12-alpha.35", + "@budibase/string-templates": "2.2.12-alpha.36", + "@budibase/types": "2.2.12-alpha.36", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d0b72e9175..91e1dfe293 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 4f296c9e6b..35180f8835 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index f7702128b6..1062c8eb94 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.35", + "@budibase/backend-core": "2.2.12-alpha.36", "@budibase/pro": "2.2.12-alpha.35", - "@budibase/string-templates": "2.2.12-alpha.35", - "@budibase/types": "2.2.12-alpha.35", + "@budibase/string-templates": "2.2.12-alpha.36", + "@budibase/types": "2.2.12-alpha.36", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 8716581d9d768be2be38165e60d5cf632dc359a1 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 25 Jan 2023 09:29:18 +0000 Subject: [PATCH 206/387] Update pro version to 2.2.12-alpha.36 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index f9d27397cc..ea686b1349 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.36", "@budibase/client": "2.2.12-alpha.36", - "@budibase/pro": "2.2.12-alpha.35", + "@budibase/pro": "2.2.12-alpha.36", "@budibase/string-templates": "2.2.12-alpha.36", "@budibase/types": "2.2.12-alpha.36", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 69a75c4166..8757525049 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.35": - version "2.2.12-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.35.tgz#36045cdccee548d86a5d0951606d41d0de96bd5c" - integrity sha512-CdIioYKH6y8KQRMWJ2esiOeCOOs3RIGGAAY7DYw71ejjxtCcAZ8Fnez+xIgTFqI6Hee64HjMbX2Tc3OO4J/Kxg== +"@budibase/backend-core@2.2.12-alpha.36": + version "2.2.12-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.36.tgz#cabf232b1ab99d932b5a76fe32cf7e0037da6a3f" + integrity sha512-/8uqdYDXTp+wP9+cURL54jlqbwZDoXr917Alw01qlXS00oxqSbaQA4YmLiONjk/V/O8HvYCJRiiCFMS5bz2q4w== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.35" + "@budibase/types" "2.2.12-alpha.36" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.35": - version "2.2.12-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.35.tgz#6b0f3c2e616b9603b05292dede50d44d3e2d60fe" - integrity sha512-bFaPfocgEUDT3kZV/BWjui9kGr/hn5mfTlj/pPMGQnA/8E9sToJR5bjKjjFrZUr1YrclFDUkaEsixWBK1hWPaw== +"@budibase/pro@2.2.12-alpha.36": + version "2.2.12-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.36.tgz#6869e676eb3a01eb9ecea5574eabb2cfdb9f57b2" + integrity sha512-IK+iShaGrJ0k3z9+JEjRHSFYZz2nlnQlQ/4juOoJn5hTaLxkJ9nDPQ2PbzynPLfPj817BmzHLJH272YoLr216Q== dependencies: - "@budibase/backend-core" "2.2.12-alpha.35" - "@budibase/types" "2.2.12-alpha.35" + "@budibase/backend-core" "2.2.12-alpha.36" + "@budibase/types" "2.2.12-alpha.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1405,10 +1405,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.35": - version "2.2.12-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.35.tgz#35c812289a3ca97c18629c4cf3607bf1aa3539da" - integrity sha512-mkGA/Ago7ckqPeoq70DLN2flbIYpaJgniwd7Tz6zlSrLlBC+fBUSdjzxeXE3FASr3NtC7qHyVS6ZMXEpou6/QQ== +"@budibase/types@2.2.12-alpha.36": + version "2.2.12-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.36.tgz#cd51bd207df840e3f803c9397d1b4346037f17ec" + integrity sha512-v6l7JQCCVQ8eGV4npCUJKo+mgqt6+QKJjFYKXjuhLNVvxz1szxxOa1fLDey4yuIiL/gH/Q/SHWA28FlKF31L2w== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 1062c8eb94..8e70dbd4d8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.36", - "@budibase/pro": "2.2.12-alpha.35", + "@budibase/pro": "2.2.12-alpha.36", "@budibase/string-templates": "2.2.12-alpha.36", "@budibase/types": "2.2.12-alpha.36", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 30ab4d4d0a..38a07998f6 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.35": - version "2.2.12-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.35.tgz#36045cdccee548d86a5d0951606d41d0de96bd5c" - integrity sha512-CdIioYKH6y8KQRMWJ2esiOeCOOs3RIGGAAY7DYw71ejjxtCcAZ8Fnez+xIgTFqI6Hee64HjMbX2Tc3OO4J/Kxg== +"@budibase/backend-core@2.2.12-alpha.36": + version "2.2.12-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.36.tgz#cabf232b1ab99d932b5a76fe32cf7e0037da6a3f" + integrity sha512-/8uqdYDXTp+wP9+cURL54jlqbwZDoXr917Alw01qlXS00oxqSbaQA4YmLiONjk/V/O8HvYCJRiiCFMS5bz2q4w== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.35" + "@budibase/types" "2.2.12-alpha.36" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,23 +521,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.35": - version "2.2.12-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.35.tgz#6b0f3c2e616b9603b05292dede50d44d3e2d60fe" - integrity sha512-bFaPfocgEUDT3kZV/BWjui9kGr/hn5mfTlj/pPMGQnA/8E9sToJR5bjKjjFrZUr1YrclFDUkaEsixWBK1hWPaw== +"@budibase/pro@2.2.12-alpha.36": + version "2.2.12-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.36.tgz#6869e676eb3a01eb9ecea5574eabb2cfdb9f57b2" + integrity sha512-IK+iShaGrJ0k3z9+JEjRHSFYZz2nlnQlQ/4juOoJn5hTaLxkJ9nDPQ2PbzynPLfPj817BmzHLJH272YoLr216Q== dependencies: - "@budibase/backend-core" "2.2.12-alpha.35" - "@budibase/types" "2.2.12-alpha.35" + "@budibase/backend-core" "2.2.12-alpha.36" + "@budibase/types" "2.2.12-alpha.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.35": - version "2.2.12-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.35.tgz#35c812289a3ca97c18629c4cf3607bf1aa3539da" - integrity sha512-mkGA/Ago7ckqPeoq70DLN2flbIYpaJgniwd7Tz6zlSrLlBC+fBUSdjzxeXE3FASr3NtC7qHyVS6ZMXEpou6/QQ== +"@budibase/types@2.2.12-alpha.36": + version "2.2.12-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.36.tgz#cd51bd207df840e3f803c9397d1b4346037f17ec" + integrity sha512-v6l7JQCCVQ8eGV4npCUJKo+mgqt6+QKJjFYKXjuhLNVvxz1szxxOa1fLDey4yuIiL/gH/Q/SHWA28FlKF31L2w== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 8f186041ac64c1f86d587c787f38c59d0656ef8f Mon Sep 17 00:00:00 2001 From: Adria Navarro Date: Wed, 25 Jan 2023 10:13:35 +0000 Subject: [PATCH 207/387] Don't create the apps on test --- packages/server/src/api/controllers/application.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index 08482dbfca..a8b3797681 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -319,7 +319,11 @@ async function performAppCreate(ctx: BBContext) { const response = await db.put(newApplication, { force: true }) newApplication._rev = response.rev + /* istanbul ignore next */ await createApp(appId) + if (!env.isTest()) { + await createApp(appId) + } await cache.app.invalidateAppMetadata(appId, newApplication) return newApplication From 100571b6fe1258e65b88c13bc86e638ba40e40a0 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 25 Jan 2023 11:27:57 +0000 Subject: [PATCH 208/387] add licensing check to env dropdown --- .../bbui/src/Form/Core/EnvDropdown.svelte | 94 +++++++++++-------- packages/bbui/src/Form/EnvDropdown.svelte | 4 + .../IntegrationConfigForm.svelte | 10 +- 3 files changed, 70 insertions(+), 38 deletions(-) diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte index e3cb33f555..178603ee5d 100644 --- a/packages/bbui/src/Form/Core/EnvDropdown.svelte +++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte @@ -15,7 +15,8 @@ export let autofocus = false export let variables export let showModal - + export let environmentVariablesEnabled + export let handleUpgradePanel const dispatch = createEventDispatcher() let field @@ -131,34 +132,41 @@ class="spectrum-Popover spectrum-Popover--bottom spectrum-Picker-popover is-open" >
      - {#if variables.length} - {#each variables as variable, idx} -
    • handleVarSelect(variable.name)} - > - -
      - {variable.name} - -
      - -       -
      • - {/each} + {#if !environmentVariablesEnabled} +
      + Upgrade your plan to get environment variables +
      + {:else if variables.length} +
      + {#each variables as variable, idx} +
    • handleVarSelect(variable.name)} + > + +
      + {variable.name} + +
      + +       +
      • + {/each} +
      {:else}
      You don't have any environment variables yet @@ -166,16 +174,29 @@ {/if}
    -
    showModal()} class="add-variable"> - -
    Add Variable
    -
    + {#if environmentVariablesEnabled} +
    showModal()} class="add-variable"> + +
    Add Variable
    +
    + {:else} +
    handleUpgradePanel()} class="add-variable"> + +
    Upgrade plan
    +
    + {/if}
{/if}
@@ -222,7 +243,6 @@ } .no-variables-height { - height: 100px; } .no-variables-text { diff --git a/packages/bbui/src/Form/EnvDropdown.svelte b/packages/bbui/src/Form/EnvDropdown.svelte index 941b036e24..33924af0a5 100644 --- a/packages/bbui/src/Form/EnvDropdown.svelte +++ b/packages/bbui/src/Form/EnvDropdown.svelte @@ -17,6 +17,8 @@ export let autofocus export let variables export let showModal + export let environmentVariablesEnabled + export let handleUpgradePanel const dispatch = createEventDispatcher() const onChange = e => { value = e.detail @@ -38,6 +40,8 @@ {autofocus} {variables} {showModal} + {environmentVariablesEnabled} + {handleUpgradePanel} on:change={onChange} on:click on:input diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte index f960c63c08..1a261008c2 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte @@ -14,7 +14,7 @@ import { IntegrationTypes } from "constants/backend" import { createValidationStore } from "helpers/validation/yup" import { createEventDispatcher, onMount } from "svelte" - import { environment } from "stores/portal" + import { environment, licensing } from "stores/portal" import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte" export let datasource @@ -75,6 +75,12 @@ function showModal() { createVariableModal.show() } + + async function handleUpgradePanel() { + await environment.upgradePanelOpened() + $licensing.goToUpgradePage() + } + onMount(async () => { await environment.loadVariables() }) @@ -127,6 +133,8 @@ on:change bind:value={config[configKey]} error={$validation.errors[configKey]} + environmentVariablesEnabled={$licensing.environmentVariablesEnabled} + {handleUpgradePanel} />
{/if} From fc6d20c0b2bcf22f7d823edeaae6f498e28f1d0e Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 25 Jan 2023 11:39:13 +0000 Subject: [PATCH 209/387] add environment bindings to rest query binding drawer --- .../builder/src/builderStore/dataBinding.js | 18 +++++++++++++++++- .../common/bindings/DrawerBindableInput.svelte | 2 +- .../integration/RestQueryViewer.svelte | 8 ++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index d188073b95..3f284f75c4 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -21,6 +21,7 @@ import { import { TableNames } from "../constants" import { JSONUtils } from "@budibase/frontend-core" import ActionDefinitions from "components/design/settings/controls/ButtonActionEditor/manifest.json" +import { environment } from "stores/portal" // Regex to match all instances of template strings const CAPTURE_VAR_INSIDE_TEMPLATE = /{{([^}]+)}}/g @@ -54,7 +55,7 @@ export const getBindableProperties = (asset, componentId) => { */ export const getRestBindings = () => { const userBindings = getUserBindings() - return [...userBindings, ...getAuthBindings()] + return [...userBindings, ...getAuthBindings(), ...getEnvironmentBindings()] } /** @@ -89,6 +90,21 @@ export const getAuthBindings = () => { return bindings } +export const getEnvironmentBindings = () => { + let envVars = get(environment).variables + let test = envVars.map(variable => { + return { + type: "context", + runtimeBinding: `env.${makePropSafe(variable.name)}`, + readableBinding: `env.${variable.name}`, + category: "Environment", + icon: "Key", + display: { type: "string", name: variable.name }, + } + }) + return test +} + /** * Utility - convert a key/value map to an array of custom 'context' bindings * @param {object} valueMap Key/value pairings diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte index 6859e4f92b..f115ab89ce 100644 --- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte +++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte @@ -20,7 +20,7 @@ export let allowHelpers = true export let updateOnChange = true export let drawerLeft - $: console.log(bindings) + const dispatch = createEventDispatcher() let bindingDrawer let valid = true diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte index 2c381efa47..d67e4c939b 100644 --- a/packages/builder/src/components/integration/RestQueryViewer.svelte +++ b/packages/builder/src/components/integration/RestQueryViewer.svelte @@ -1,6 +1,7 @@ - {value || ""} + {selectedLabel || ""}
From e3064709c8cb46096951452ebcba71ea2ef3b4b0 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 25 Jan 2023 14:23:22 +0000 Subject: [PATCH 214/387] v2.2.12-alpha.38 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index c5e4b53c66..bad7cb265a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.37", + "version": "2.2.12-alpha.38", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index b0e05719c5..df3cdf574d 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.37", + "version": "2.2.12-alpha.38", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.37", + "@budibase/types": "2.2.12-alpha.38", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 89b06c0d81..58cb9f9934 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.37", + "version": "2.2.12-alpha.38", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.37", + "@budibase/string-templates": "2.2.12-alpha.38", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index e273d05040..e4ac98a572 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.37", + "version": "2.2.12-alpha.38", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.37", - "@budibase/client": "2.2.12-alpha.37", - "@budibase/frontend-core": "2.2.12-alpha.37", - "@budibase/string-templates": "2.2.12-alpha.37", + "@budibase/bbui": "2.2.12-alpha.38", + "@budibase/client": "2.2.12-alpha.38", + "@budibase/frontend-core": "2.2.12-alpha.38", + "@budibase/string-templates": "2.2.12-alpha.38", "@sentry/browser": "5.19.1", "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index e0ba18d054..aa1507eef1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.37", + "version": "2.2.12-alpha.38", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.37", - "@budibase/string-templates": "2.2.12-alpha.37", - "@budibase/types": "2.2.12-alpha.37", + "@budibase/backend-core": "2.2.12-alpha.38", + "@budibase/string-templates": "2.2.12-alpha.38", + "@budibase/types": "2.2.12-alpha.38", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 0cd2b06c4d..07435e6afd 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.37", + "version": "2.2.12-alpha.38", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.37", - "@budibase/frontend-core": "2.2.12-alpha.37", - "@budibase/string-templates": "2.2.12-alpha.37", + "@budibase/bbui": "2.2.12-alpha.38", + "@budibase/frontend-core": "2.2.12-alpha.38", + "@budibase/string-templates": "2.2.12-alpha.38", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 3fca440818..42919b367e 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.37", + "version": "2.2.12-alpha.38", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.37", + "@budibase/bbui": "2.2.12-alpha.38", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 5d1146a40c..226597db3a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.37", + "version": "2.2.12-alpha.38", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index d470cdc2bd..0b8ae79e41 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.37", + "version": "2.2.12-alpha.38", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.37", - "@budibase/client": "2.2.12-alpha.37", + "@budibase/backend-core": "2.2.12-alpha.38", + "@budibase/client": "2.2.12-alpha.38", "@budibase/pro": "2.2.12-alpha.37", - "@budibase/string-templates": "2.2.12-alpha.37", - "@budibase/types": "2.2.12-alpha.37", + "@budibase/string-templates": "2.2.12-alpha.38", + "@budibase/types": "2.2.12-alpha.38", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index c254b5d979..d16334a309 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.37", + "version": "2.2.12-alpha.38", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 719309466b..90b824aaa9 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.37", + "version": "2.2.12-alpha.38", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 6966c57111..830d77cdbd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.37", + "version": "2.2.12-alpha.38", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.37", + "@budibase/backend-core": "2.2.12-alpha.38", "@budibase/pro": "2.2.12-alpha.37", - "@budibase/string-templates": "2.2.12-alpha.37", - "@budibase/types": "2.2.12-alpha.37", + "@budibase/string-templates": "2.2.12-alpha.38", + "@budibase/types": "2.2.12-alpha.38", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From fe9c233bfc0e3cd72e7ebf02e342b36894a00459 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 25 Jan 2023 14:27:14 +0000 Subject: [PATCH 215/387] Update pro version to 2.2.12-alpha.38 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 0b8ae79e41..966f1579a7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.38", "@budibase/client": "2.2.12-alpha.38", - "@budibase/pro": "2.2.12-alpha.37", + "@budibase/pro": "2.2.12-alpha.38", "@budibase/string-templates": "2.2.12-alpha.38", "@budibase/types": "2.2.12-alpha.38", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index f1cc34ec71..80cfbbf9f5 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.37": - version "2.2.12-alpha.37" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.37.tgz#acbbfbd98f7f30320a131b7f897cc4909cc31d01" - integrity sha512-3N9tDET3AR0lNkmAGXm4NPwM+0lMf9azFTSHWTagDW1qKL/lUlXJX6HuvoAROcV8yENHwkhhzIjGcuip3zASKg== +"@budibase/backend-core@2.2.12-alpha.38": + version "2.2.12-alpha.38" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.38.tgz#47b57ed384acee3f18e4339f1ff3266b5426c228" + integrity sha512-3mvbWVkb4Su4hIKBNtPTlxU3jUDPT7XhiYImSkt7+3SC05GgpUCdA0N8cA8c6+OslLO2+ocGLAvzu/9p3vOGqQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.37" + "@budibase/types" "2.2.12-alpha.38" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.37": - version "2.2.12-alpha.37" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.37.tgz#6ec071a4ad8e02db7e8e3454b71b0489f45a004a" - integrity sha512-tIIa+1TJGVDqGXQ7z0jWNY6nz2BelxPedmVrAYju49unUyPU4/HYdRVfk0Xqq5nApVji68i0EHSjJq0QPScXpA== +"@budibase/pro@2.2.12-alpha.38": + version "2.2.12-alpha.38" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.38.tgz#22a8f028fc6dfc16045ee9d9a30338fccb237069" + integrity sha512-90T70INmsy6fC/iIcx5c0h3/EGxNNrI1I8FTgbCZefU1VyoCDQGujxGrQN2CuNcaIn5zGLvSSUdVr/bHn0fbyw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.37" - "@budibase/types" "2.2.12-alpha.37" + "@budibase/backend-core" "2.2.12-alpha.38" + "@budibase/types" "2.2.12-alpha.38" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1405,10 +1405,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.37": - version "2.2.12-alpha.37" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.37.tgz#b48da267d1a143a5db89a2bf6bd9e1fede99d2fc" - integrity sha512-lbxjK+5eXoFzgwyzyq/l7thmyBLyxs9oA+KspSOM0LvTpvm7rZJPqxqOpkOFnsPq3h42qiue/94Z7z5+dxWyAw== +"@budibase/types@2.2.12-alpha.38": + version "2.2.12-alpha.38" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.38.tgz#1c60dcd6f6c00f8dea555710137c560ae263e5ca" + integrity sha512-MizsYBZGpOz7Vok2t3BhHEKCtcq+a7lfwRTR1DnZJEtqwV335PctHdlqF5SzcamFRfv8oFuSb3k4FRFYf5EU4Q== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 830d77cdbd..4bed83ccbd 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.38", - "@budibase/pro": "2.2.12-alpha.37", + "@budibase/pro": "2.2.12-alpha.38", "@budibase/string-templates": "2.2.12-alpha.38", "@budibase/types": "2.2.12-alpha.38", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 27c2563848..e91e541e75 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.37": - version "2.2.12-alpha.37" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.37.tgz#acbbfbd98f7f30320a131b7f897cc4909cc31d01" - integrity sha512-3N9tDET3AR0lNkmAGXm4NPwM+0lMf9azFTSHWTagDW1qKL/lUlXJX6HuvoAROcV8yENHwkhhzIjGcuip3zASKg== +"@budibase/backend-core@2.2.12-alpha.38": + version "2.2.12-alpha.38" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.38.tgz#47b57ed384acee3f18e4339f1ff3266b5426c228" + integrity sha512-3mvbWVkb4Su4hIKBNtPTlxU3jUDPT7XhiYImSkt7+3SC05GgpUCdA0N8cA8c6+OslLO2+ocGLAvzu/9p3vOGqQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.37" + "@budibase/types" "2.2.12-alpha.38" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,23 +521,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.37": - version "2.2.12-alpha.37" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.37.tgz#6ec071a4ad8e02db7e8e3454b71b0489f45a004a" - integrity sha512-tIIa+1TJGVDqGXQ7z0jWNY6nz2BelxPedmVrAYju49unUyPU4/HYdRVfk0Xqq5nApVji68i0EHSjJq0QPScXpA== +"@budibase/pro@2.2.12-alpha.38": + version "2.2.12-alpha.38" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.38.tgz#22a8f028fc6dfc16045ee9d9a30338fccb237069" + integrity sha512-90T70INmsy6fC/iIcx5c0h3/EGxNNrI1I8FTgbCZefU1VyoCDQGujxGrQN2CuNcaIn5zGLvSSUdVr/bHn0fbyw== dependencies: - "@budibase/backend-core" "2.2.12-alpha.37" - "@budibase/types" "2.2.12-alpha.37" + "@budibase/backend-core" "2.2.12-alpha.38" + "@budibase/types" "2.2.12-alpha.38" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.37": - version "2.2.12-alpha.37" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.37.tgz#b48da267d1a143a5db89a2bf6bd9e1fede99d2fc" - integrity sha512-lbxjK+5eXoFzgwyzyq/l7thmyBLyxs9oA+KspSOM0LvTpvm7rZJPqxqOpkOFnsPq3h42qiue/94Z7z5+dxWyAw== +"@budibase/types@2.2.12-alpha.38": + version "2.2.12-alpha.38" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.38.tgz#1c60dcd6f6c00f8dea555710137c560ae263e5ca" + integrity sha512-MizsYBZGpOz7Vok2t3BhHEKCtcq+a7lfwRTR1DnZJEtqwV335PctHdlqF5SzcamFRfv8oFuSb3k4FRFYf5EU4Q== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 1eebab89105ac9120f2a452afcc9779b72ffd218 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 25 Jan 2023 15:55:57 +0000 Subject: [PATCH 216/387] Add suffix prop to fancy input component --- packages/bbui/src/FancyForm/FancyInput.svelte | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/bbui/src/FancyForm/FancyInput.svelte b/packages/bbui/src/FancyForm/FancyInput.svelte index ef254949c8..7437deeb98 100644 --- a/packages/bbui/src/FancyForm/FancyInput.svelte +++ b/packages/bbui/src/FancyForm/FancyInput.svelte @@ -2,6 +2,7 @@ import { createEventDispatcher } from "svelte" import FancyField from "./FancyField.svelte" import FancyFieldLabel from "./FancyFieldLabel.svelte" + import { fade } from "svelte/transition" export let label export let value @@ -9,6 +10,7 @@ export let disabled = false export let error = null export let validate = null + export let suffix = null const dispatch = createEventDispatcher() @@ -38,6 +40,9 @@ on:blur={() => (focused = false)} class:placeholder /> + {#if suffix && !placeholder} +
{suffix}
+ {/if} From f068f20c61834d7da7f7fd0dfa1e414e74aa0799 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 25 Jan 2023 15:57:47 +0000 Subject: [PATCH 217/387] Add suffix setting to fancy input component and fix lint warning --- packages/bbui/src/FancyForm/FancyInput.svelte | 2 ++ packages/frontend-core/src/components/TestimonialPage.svelte | 1 + 2 files changed, 3 insertions(+) diff --git a/packages/bbui/src/FancyForm/FancyInput.svelte b/packages/bbui/src/FancyForm/FancyInput.svelte index 7437deeb98..8735e2c30c 100644 --- a/packages/bbui/src/FancyForm/FancyInput.svelte +++ b/packages/bbui/src/FancyForm/FancyInput.svelte @@ -57,6 +57,8 @@ color: var(--spectrum-global-color-gray-900); outline: none; border: none; + padding: 0; + margin: 0; } input.placeholder { transform: translateY(0); diff --git a/packages/frontend-core/src/components/TestimonialPage.svelte b/packages/frontend-core/src/components/TestimonialPage.svelte index 3028d4447a..f2f74731d0 100644 --- a/packages/frontend-core/src/components/TestimonialPage.svelte +++ b/packages/frontend-core/src/components/TestimonialPage.svelte @@ -14,6 +14,7 @@
a-happy-budibase-user
From 61e64055836cbc8d07ae8aa477c0aa196faa453d Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 25 Jan 2023 16:12:14 +0000 Subject: [PATCH 218/387] v2.2.12-alpha.39 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index bad7cb265a..abd5790072 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.38", + "version": "2.2.12-alpha.39", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index df3cdf574d..7e3a7d3a20 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.38", + "version": "2.2.12-alpha.39", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.38", + "@budibase/types": "2.2.12-alpha.39", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 58cb9f9934..f2579540ab 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.38", + "version": "2.2.12-alpha.39", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.38", + "@budibase/string-templates": "2.2.12-alpha.39", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index e4ac98a572..c9e9cf7724 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.38", + "version": "2.2.12-alpha.39", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.38", - "@budibase/client": "2.2.12-alpha.38", - "@budibase/frontend-core": "2.2.12-alpha.38", - "@budibase/string-templates": "2.2.12-alpha.38", + "@budibase/bbui": "2.2.12-alpha.39", + "@budibase/client": "2.2.12-alpha.39", + "@budibase/frontend-core": "2.2.12-alpha.39", + "@budibase/string-templates": "2.2.12-alpha.39", "@sentry/browser": "5.19.1", "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index aa1507eef1..a6200060f1 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.38", + "version": "2.2.12-alpha.39", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.38", - "@budibase/string-templates": "2.2.12-alpha.38", - "@budibase/types": "2.2.12-alpha.38", + "@budibase/backend-core": "2.2.12-alpha.39", + "@budibase/string-templates": "2.2.12-alpha.39", + "@budibase/types": "2.2.12-alpha.39", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 07435e6afd..16c93740ea 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.38", + "version": "2.2.12-alpha.39", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.38", - "@budibase/frontend-core": "2.2.12-alpha.38", - "@budibase/string-templates": "2.2.12-alpha.38", + "@budibase/bbui": "2.2.12-alpha.39", + "@budibase/frontend-core": "2.2.12-alpha.39", + "@budibase/string-templates": "2.2.12-alpha.39", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 42919b367e..5b303ee3eb 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.38", + "version": "2.2.12-alpha.39", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.38", + "@budibase/bbui": "2.2.12-alpha.39", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 226597db3a..a65407a066 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.38", + "version": "2.2.12-alpha.39", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 966f1579a7..0d56f53f08 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.38", + "version": "2.2.12-alpha.39", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.38", - "@budibase/client": "2.2.12-alpha.38", + "@budibase/backend-core": "2.2.12-alpha.39", + "@budibase/client": "2.2.12-alpha.39", "@budibase/pro": "2.2.12-alpha.38", - "@budibase/string-templates": "2.2.12-alpha.38", - "@budibase/types": "2.2.12-alpha.38", + "@budibase/string-templates": "2.2.12-alpha.39", + "@budibase/types": "2.2.12-alpha.39", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d16334a309..b9ee7b8efb 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.38", + "version": "2.2.12-alpha.39", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 90b824aaa9..b0d84c045b 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.38", + "version": "2.2.12-alpha.39", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 4bed83ccbd..e0d05a9dd8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.38", + "version": "2.2.12-alpha.39", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.38", + "@budibase/backend-core": "2.2.12-alpha.39", "@budibase/pro": "2.2.12-alpha.38", - "@budibase/string-templates": "2.2.12-alpha.38", - "@budibase/types": "2.2.12-alpha.38", + "@budibase/string-templates": "2.2.12-alpha.39", + "@budibase/types": "2.2.12-alpha.39", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 00a888c224d5d52b3937615cc839f2b181e09bc0 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 25 Jan 2023 16:16:45 +0000 Subject: [PATCH 219/387] Update pro version to 2.2.12-alpha.39 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 0d56f53f08..cb8da37ca7 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.39", "@budibase/client": "2.2.12-alpha.39", - "@budibase/pro": "2.2.12-alpha.38", + "@budibase/pro": "2.2.12-alpha.39", "@budibase/string-templates": "2.2.12-alpha.39", "@budibase/types": "2.2.12-alpha.39", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 80cfbbf9f5..eda3110dd6 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.38": - version "2.2.12-alpha.38" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.38.tgz#47b57ed384acee3f18e4339f1ff3266b5426c228" - integrity sha512-3mvbWVkb4Su4hIKBNtPTlxU3jUDPT7XhiYImSkt7+3SC05GgpUCdA0N8cA8c6+OslLO2+ocGLAvzu/9p3vOGqQ== +"@budibase/backend-core@2.2.12-alpha.39": + version "2.2.12-alpha.39" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.39.tgz#8b56bd113761099ec7b16b14298f881ab5f91854" + integrity sha512-pqijIq/qpvTtaxo8QxYl8gyW6D3joAt2cGHLEdjACi1cFzCjMd/Wf2muJLv6hYria1DOEkoP82n819OeKqgNoQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.38" + "@budibase/types" "2.2.12-alpha.39" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.38": - version "2.2.12-alpha.38" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.38.tgz#22a8f028fc6dfc16045ee9d9a30338fccb237069" - integrity sha512-90T70INmsy6fC/iIcx5c0h3/EGxNNrI1I8FTgbCZefU1VyoCDQGujxGrQN2CuNcaIn5zGLvSSUdVr/bHn0fbyw== +"@budibase/pro@2.2.12-alpha.39": + version "2.2.12-alpha.39" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.39.tgz#8db18f5868155adc29df376656f2126d6f132728" + integrity sha512-p3NBeYSAvVeUiIIP6FUzRjs7eweGTtZ0dJ//efsyeiOZfS0/FDJi9wUsDrp7CbnoSzwXLK1KMYDnf2RIP5kOkQ== dependencies: - "@budibase/backend-core" "2.2.12-alpha.38" - "@budibase/types" "2.2.12-alpha.38" + "@budibase/backend-core" "2.2.12-alpha.39" + "@budibase/types" "2.2.12-alpha.39" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1405,10 +1405,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.38": - version "2.2.12-alpha.38" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.38.tgz#1c60dcd6f6c00f8dea555710137c560ae263e5ca" - integrity sha512-MizsYBZGpOz7Vok2t3BhHEKCtcq+a7lfwRTR1DnZJEtqwV335PctHdlqF5SzcamFRfv8oFuSb3k4FRFYf5EU4Q== +"@budibase/types@2.2.12-alpha.39": + version "2.2.12-alpha.39" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.39.tgz#779b286e2d6855ef6c76699a0c28ad423224621f" + integrity sha512-tJu3SnOm5GHnov2RF5pz53S7eRtqVUBERCMNd4YdvIhM9ACFVGDs4j54WTQhSpZX6WzxxUl+x9LkAFDsuHXVOQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index e0d05a9dd8..61d655bf87 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.39", - "@budibase/pro": "2.2.12-alpha.38", + "@budibase/pro": "2.2.12-alpha.39", "@budibase/string-templates": "2.2.12-alpha.39", "@budibase/types": "2.2.12-alpha.39", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index e91e541e75..f1296535cf 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.38": - version "2.2.12-alpha.38" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.38.tgz#47b57ed384acee3f18e4339f1ff3266b5426c228" - integrity sha512-3mvbWVkb4Su4hIKBNtPTlxU3jUDPT7XhiYImSkt7+3SC05GgpUCdA0N8cA8c6+OslLO2+ocGLAvzu/9p3vOGqQ== +"@budibase/backend-core@2.2.12-alpha.39": + version "2.2.12-alpha.39" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.39.tgz#8b56bd113761099ec7b16b14298f881ab5f91854" + integrity sha512-pqijIq/qpvTtaxo8QxYl8gyW6D3joAt2cGHLEdjACi1cFzCjMd/Wf2muJLv6hYria1DOEkoP82n819OeKqgNoQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.38" + "@budibase/types" "2.2.12-alpha.39" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,23 +521,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.38": - version "2.2.12-alpha.38" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.38.tgz#22a8f028fc6dfc16045ee9d9a30338fccb237069" - integrity sha512-90T70INmsy6fC/iIcx5c0h3/EGxNNrI1I8FTgbCZefU1VyoCDQGujxGrQN2CuNcaIn5zGLvSSUdVr/bHn0fbyw== +"@budibase/pro@2.2.12-alpha.39": + version "2.2.12-alpha.39" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.39.tgz#8db18f5868155adc29df376656f2126d6f132728" + integrity sha512-p3NBeYSAvVeUiIIP6FUzRjs7eweGTtZ0dJ//efsyeiOZfS0/FDJi9wUsDrp7CbnoSzwXLK1KMYDnf2RIP5kOkQ== dependencies: - "@budibase/backend-core" "2.2.12-alpha.38" - "@budibase/types" "2.2.12-alpha.38" + "@budibase/backend-core" "2.2.12-alpha.39" + "@budibase/types" "2.2.12-alpha.39" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.38": - version "2.2.12-alpha.38" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.38.tgz#1c60dcd6f6c00f8dea555710137c560ae263e5ca" - integrity sha512-MizsYBZGpOz7Vok2t3BhHEKCtcq+a7lfwRTR1DnZJEtqwV335PctHdlqF5SzcamFRfv8oFuSb3k4FRFYf5EU4Q== +"@budibase/types@2.2.12-alpha.39": + version "2.2.12-alpha.39" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.39.tgz#779b286e2d6855ef6c76699a0c28ad423224621f" + integrity sha512-tJu3SnOm5GHnov2RF5pz53S7eRtqVUBERCMNd4YdvIhM9ACFVGDs4j54WTQhSpZX6WzxxUl+x9LkAFDsuHXVOQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 697cd8b4eafe1b390b9bee9343f4f66ec2297b62 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Wed, 25 Jan 2023 18:27:58 +0000 Subject: [PATCH 220/387] Adding test cases as per PR comments. --- .../server/src/automations/tests/loop.spec.ts | 45 +++++++++++++ packages/server/src/automations/triggers.ts | 7 +- .../server/src/tests/utilities/structures.ts | 67 ++++++++++++++++++- .../types/src/documents/app/automation.ts | 1 + 4 files changed, 117 insertions(+), 3 deletions(-) create mode 100644 packages/server/src/automations/tests/loop.spec.ts diff --git a/packages/server/src/automations/tests/loop.spec.ts b/packages/server/src/automations/tests/loop.spec.ts new file mode 100644 index 0000000000..b64f7b16f8 --- /dev/null +++ b/packages/server/src/automations/tests/loop.spec.ts @@ -0,0 +1,45 @@ +import * as automation from "../index" +import * as triggers from "../triggers" +import { loopAutomation } from "../../tests/utilities/structures" +import { context } from "@budibase/backend-core" +import * as setup from "./utilities" + +describe("Attempt to run a basic loop automation", () => { + let config = setup.getConfig(), + table: any, + row: any + + beforeEach(async () => { + await automation.init() + await config.init() + table = await config.createTable() + row = await config.createRow() + }) + + afterAll(setup.afterAll) + + async function runLoop(loopOpts?: any) { + const appId = config.getAppId() + return await context.doInAppContext(appId, async () => { + const params = { fields: { appId } } + return await triggers.externalTrigger( + loopAutomation(table._id, loopOpts), + params, + { getResponses: true } + ) + }) + } + + it("attempt to run a basic loop", async () => { + const resp = await runLoop() + expect(resp.steps[2].outputs.iterations).toBe(1) + }) + + it("test a loop with a string", async () => { + const resp = await runLoop({ + type: "String", + binding: "a,b,c", + }) + expect(resp.steps[2].outputs.iterations).toBe(3) + }) +}) diff --git a/packages/server/src/automations/triggers.ts b/packages/server/src/automations/triggers.ts index f4b34bc9e8..78f8a87b0c 100644 --- a/packages/server/src/automations/triggers.ts +++ b/packages/server/src/automations/triggers.ts @@ -109,8 +109,13 @@ export async function externalTrigger( } params.fields = coercedFields } - const data = { automation, event: params } + const data: Record = { automation, event: params } if (getResponses) { + data.event = { + ...data.event, + appId: context.getAppId(), + automation, + } return utils.processEvent({ data }) } else { return automationQueue.add(data, JOB_OPTS) diff --git a/packages/server/src/tests/utilities/structures.ts b/packages/server/src/tests/utilities/structures.ts index a412be4931..9d66fecc5e 100644 --- a/packages/server/src/tests/utilities/structures.ts +++ b/packages/server/src/tests/utilities/structures.ts @@ -1,8 +1,14 @@ -import { roles, permissions } from "@budibase/backend-core" +import { permissions, roles } from "@budibase/backend-core" import { createHomeScreen } from "../../constants/screens" import { EMPTY_LAYOUT } from "../../constants/layouts" import { cloneDeep } from "lodash/fp" -import { TRIGGER_DEFINITIONS, ACTION_DEFINITIONS } from "../../automations" +import { ACTION_DEFINITIONS, TRIGGER_DEFINITIONS } from "../../automations" +import { + Automation, + AutomationActionStepId, + AutomationTriggerStepId, +} from "@budibase/types" + const { v4: uuidv4 } = require("uuid") export const TENANT_ID = "default" @@ -116,6 +122,63 @@ export function basicAutomation() { } } +export function loopAutomation(tableId: string, loopOpts?: any): Automation { + if (!loopOpts) { + loopOpts = { + option: "Array", + binding: "{{ steps.1.rows }}", + } + } + const automation: any = { + name: "looping", + type: "automation", + definition: { + steps: [ + { + id: "b", + type: "ACTION", + stepId: AutomationActionStepId.QUERY_ROWS, + internal: true, + inputs: { + tableId, + }, + schema: ACTION_DEFINITIONS.QUERY_ROWS.schema, + }, + { + id: "c", + type: "ACTION", + stepId: AutomationActionStepId.LOOP, + internal: true, + inputs: loopOpts, + blockToLoop: "d", + schema: ACTION_DEFINITIONS.LOOP.schema, + }, + { + id: "d", + type: "ACTION", + internal: true, + stepId: AutomationActionStepId.SERVER_LOG, + inputs: { + text: "log statement", + }, + schema: ACTION_DEFINITIONS.SERVER_LOG.schema, + }, + ], + trigger: { + id: "a", + type: "TRIGGER", + event: "row:save", + stepId: AutomationTriggerStepId.ROW_SAVED, + inputs: { + tableId, + }, + schema: TRIGGER_DEFINITIONS.ROW_SAVED.schema, + }, + }, + } + return automation as Automation +} + export function basicRow(tableId: string) { return { name: "Test Contact", diff --git a/packages/types/src/documents/app/automation.ts b/packages/types/src/documents/app/automation.ts index 184fed629d..0aa11d808b 100644 --- a/packages/types/src/documents/app/automation.ts +++ b/packages/types/src/documents/app/automation.ts @@ -50,6 +50,7 @@ export interface AutomationStepSchema { internal?: boolean deprecated?: boolean stepId: AutomationTriggerStepId | AutomationActionStepId + blockToLoop?: string inputs: { [key: string]: any } From 01292e22d4ba7128567c06858937e1f4a6e781d3 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 25 Jan 2023 19:13:39 +0000 Subject: [PATCH 221/387] v2.2.12-alpha.40 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index abd5790072..ada4b59a78 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.39", + "version": "2.2.12-alpha.40", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 7e3a7d3a20..d0186f4331 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.39", + "version": "2.2.12-alpha.40", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.39", + "@budibase/types": "2.2.12-alpha.40", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index f2579540ab..7e78ea65f9 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.39", + "version": "2.2.12-alpha.40", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.39", + "@budibase/string-templates": "2.2.12-alpha.40", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index c9e9cf7724..f96150a3e5 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.39", + "version": "2.2.12-alpha.40", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.39", - "@budibase/client": "2.2.12-alpha.39", - "@budibase/frontend-core": "2.2.12-alpha.39", - "@budibase/string-templates": "2.2.12-alpha.39", + "@budibase/bbui": "2.2.12-alpha.40", + "@budibase/client": "2.2.12-alpha.40", + "@budibase/frontend-core": "2.2.12-alpha.40", + "@budibase/string-templates": "2.2.12-alpha.40", "@sentry/browser": "5.19.1", "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index a6200060f1..5f33e9fd7a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.39", + "version": "2.2.12-alpha.40", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.39", - "@budibase/string-templates": "2.2.12-alpha.39", - "@budibase/types": "2.2.12-alpha.39", + "@budibase/backend-core": "2.2.12-alpha.40", + "@budibase/string-templates": "2.2.12-alpha.40", + "@budibase/types": "2.2.12-alpha.40", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 16c93740ea..b0a3924c7e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.39", + "version": "2.2.12-alpha.40", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.39", - "@budibase/frontend-core": "2.2.12-alpha.39", - "@budibase/string-templates": "2.2.12-alpha.39", + "@budibase/bbui": "2.2.12-alpha.40", + "@budibase/frontend-core": "2.2.12-alpha.40", + "@budibase/string-templates": "2.2.12-alpha.40", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 5b303ee3eb..27a0d9c159 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.39", + "version": "2.2.12-alpha.40", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.39", + "@budibase/bbui": "2.2.12-alpha.40", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a65407a066..eb257dccaf 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.39", + "version": "2.2.12-alpha.40", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index cb8da37ca7..13e9f67c07 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.39", + "version": "2.2.12-alpha.40", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.39", - "@budibase/client": "2.2.12-alpha.39", + "@budibase/backend-core": "2.2.12-alpha.40", + "@budibase/client": "2.2.12-alpha.40", "@budibase/pro": "2.2.12-alpha.39", - "@budibase/string-templates": "2.2.12-alpha.39", - "@budibase/types": "2.2.12-alpha.39", + "@budibase/string-templates": "2.2.12-alpha.40", + "@budibase/types": "2.2.12-alpha.40", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index b9ee7b8efb..364f210aa8 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.39", + "version": "2.2.12-alpha.40", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index b0d84c045b..6846bf9765 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.39", + "version": "2.2.12-alpha.40", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 61d655bf87..2a9dbf97a0 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.39", + "version": "2.2.12-alpha.40", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.39", + "@budibase/backend-core": "2.2.12-alpha.40", "@budibase/pro": "2.2.12-alpha.39", - "@budibase/string-templates": "2.2.12-alpha.39", - "@budibase/types": "2.2.12-alpha.39", + "@budibase/string-templates": "2.2.12-alpha.40", + "@budibase/types": "2.2.12-alpha.40", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 38d6d937d26d3488b72eee3de411ea3717495831 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 25 Jan 2023 19:17:06 +0000 Subject: [PATCH 222/387] Update pro version to 2.2.12-alpha.40 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 13e9f67c07..b7bc32817e 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.40", "@budibase/client": "2.2.12-alpha.40", - "@budibase/pro": "2.2.12-alpha.39", + "@budibase/pro": "2.2.12-alpha.40", "@budibase/string-templates": "2.2.12-alpha.40", "@budibase/types": "2.2.12-alpha.40", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index eda3110dd6..4596733fde 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.39": - version "2.2.12-alpha.39" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.39.tgz#8b56bd113761099ec7b16b14298f881ab5f91854" - integrity sha512-pqijIq/qpvTtaxo8QxYl8gyW6D3joAt2cGHLEdjACi1cFzCjMd/Wf2muJLv6hYria1DOEkoP82n819OeKqgNoQ== +"@budibase/backend-core@2.2.12-alpha.40": + version "2.2.12-alpha.40" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.40.tgz#49bae56f5d8c1511100d64c447171c96e1929b26" + integrity sha512-wvArhOlcSGq3K9hE6zFcFB5zztzZjmAA+I3+2DYud9/8KxBOyQmPlUyRRrHXsrtURDiEtLDyIc/AG9pvDEFwGw== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.39" + "@budibase/types" "2.2.12-alpha.40" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.39": - version "2.2.12-alpha.39" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.39.tgz#8db18f5868155adc29df376656f2126d6f132728" - integrity sha512-p3NBeYSAvVeUiIIP6FUzRjs7eweGTtZ0dJ//efsyeiOZfS0/FDJi9wUsDrp7CbnoSzwXLK1KMYDnf2RIP5kOkQ== +"@budibase/pro@2.2.12-alpha.40": + version "2.2.12-alpha.40" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.40.tgz#e41af1af7db36aac4e27412b58cf6a25ab921606" + integrity sha512-Z7kW/KLu0Bst8+JVHdYJYpr65SVavFH55mmqDcCD/j44pNxZKchNBCYe5KTukNwtJS7wnLPAinQI52dDhYcpfg== dependencies: - "@budibase/backend-core" "2.2.12-alpha.39" - "@budibase/types" "2.2.12-alpha.39" + "@budibase/backend-core" "2.2.12-alpha.40" + "@budibase/types" "2.2.12-alpha.40" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1405,10 +1405,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.39": - version "2.2.12-alpha.39" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.39.tgz#779b286e2d6855ef6c76699a0c28ad423224621f" - integrity sha512-tJu3SnOm5GHnov2RF5pz53S7eRtqVUBERCMNd4YdvIhM9ACFVGDs4j54WTQhSpZX6WzxxUl+x9LkAFDsuHXVOQ== +"@budibase/types@2.2.12-alpha.40": + version "2.2.12-alpha.40" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.40.tgz#114c2de00f502736d90b18238ed31eb0b2ef6a19" + integrity sha512-YLCycoImazSypq89w+1l3LHEMZ9qEh5NPBJ5DQ07Un/1Sq5H4QxVLK8r7Z1VtxIqtAh95H3nMPnAB/vLpJEL8Q== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 2a9dbf97a0..5d57e9a855 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.40", - "@budibase/pro": "2.2.12-alpha.39", + "@budibase/pro": "2.2.12-alpha.40", "@budibase/string-templates": "2.2.12-alpha.40", "@budibase/types": "2.2.12-alpha.40", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index f1296535cf..3e267d5bc9 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.39": - version "2.2.12-alpha.39" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.39.tgz#8b56bd113761099ec7b16b14298f881ab5f91854" - integrity sha512-pqijIq/qpvTtaxo8QxYl8gyW6D3joAt2cGHLEdjACi1cFzCjMd/Wf2muJLv6hYria1DOEkoP82n819OeKqgNoQ== +"@budibase/backend-core@2.2.12-alpha.40": + version "2.2.12-alpha.40" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.40.tgz#49bae56f5d8c1511100d64c447171c96e1929b26" + integrity sha512-wvArhOlcSGq3K9hE6zFcFB5zztzZjmAA+I3+2DYud9/8KxBOyQmPlUyRRrHXsrtURDiEtLDyIc/AG9pvDEFwGw== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.39" + "@budibase/types" "2.2.12-alpha.40" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,23 +521,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.39": - version "2.2.12-alpha.39" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.39.tgz#8db18f5868155adc29df376656f2126d6f132728" - integrity sha512-p3NBeYSAvVeUiIIP6FUzRjs7eweGTtZ0dJ//efsyeiOZfS0/FDJi9wUsDrp7CbnoSzwXLK1KMYDnf2RIP5kOkQ== +"@budibase/pro@2.2.12-alpha.40": + version "2.2.12-alpha.40" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.40.tgz#e41af1af7db36aac4e27412b58cf6a25ab921606" + integrity sha512-Z7kW/KLu0Bst8+JVHdYJYpr65SVavFH55mmqDcCD/j44pNxZKchNBCYe5KTukNwtJS7wnLPAinQI52dDhYcpfg== dependencies: - "@budibase/backend-core" "2.2.12-alpha.39" - "@budibase/types" "2.2.12-alpha.39" + "@budibase/backend-core" "2.2.12-alpha.40" + "@budibase/types" "2.2.12-alpha.40" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.39": - version "2.2.12-alpha.39" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.39.tgz#779b286e2d6855ef6c76699a0c28ad423224621f" - integrity sha512-tJu3SnOm5GHnov2RF5pz53S7eRtqVUBERCMNd4YdvIhM9ACFVGDs4j54WTQhSpZX6WzxxUl+x9LkAFDsuHXVOQ== +"@budibase/types@2.2.12-alpha.40": + version "2.2.12-alpha.40" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.40.tgz#114c2de00f502736d90b18238ed31eb0b2ef6a19" + integrity sha512-YLCycoImazSypq89w+1l3LHEMZ9qEh5NPBJ5DQ07Un/1Sq5H4QxVLK8r7Z1VtxIqtAh95H3nMPnAB/vLpJEL8Q== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From ac520e3a1eac32271321a57e30b1f9166483d42f Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Wed, 25 Jan 2023 22:26:09 +0000 Subject: [PATCH 223/387] Update pull_request_template.md --- pull_request_template.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pull_request_template.md b/pull_request_template.md index ade39d55e4..36e2f425d5 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,5 +11,8 @@ Addresses: ## Screenshots _If a UI facing feature, a short video of the happy path, and some screenshots of the new functionality._ +## Documentation +- [ ] I have reviewed the budibase documentatation to verify if this feature requires any changes. If changes or new docs are required I have written them. + From 4eaefa677aeefcfac8731d653d374c68b75fcfe3 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 26 Jan 2023 14:24:10 +0000 Subject: [PATCH 224/387] add tags to input dropdown --- .../bbui/src/Form/Core/EnvDropdown.svelte | 45 ++++++++++++------- .../IntegrationConfigForm.svelte | 17 +++++-- .../CreateEditVariableModal.svelte | 20 ++++++--- 3 files changed, 58 insertions(+), 24 deletions(-) diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte index 178603ee5d..c7a500372f 100644 --- a/packages/bbui/src/Form/Core/EnvDropdown.svelte +++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte @@ -3,6 +3,9 @@ import { createEventDispatcher, onMount } from "svelte" import clickOutside from "../../Actions/click_outside" import Divider from "../../Divider/Divider.svelte" + import Tag from "../../Tags/Tag.svelte" + import Tags from "../../Tags/Tags.svelte" + export let value = null export let placeholder = null export let type = "text" @@ -24,6 +27,12 @@ let iconFocused = false let open = false + //eslint-disable-next-line + const STRIP_NAME_REGEX = /(?<=\.)(.*?)(?=\ })/g + + // Strips the name out of the value which is {{ env.Variable }} resulting in an array like ["Variable"] + $: tags = String(value)?.match(STRIP_NAME_REGEX) || [] + const updateValue = newValue => { if (readonly) { return @@ -57,15 +66,6 @@ updateValue(event.target.value) } - const updateValueOnEnter = event => { - if (readonly) { - return - } - if (event.key === "Enter") { - updateValue(event.target.value) - } - } - const handleOutsideClick = event => { if (open) { event.stopPropagation() @@ -78,6 +78,8 @@ const handleVarSelect = variable => { open = false + focus = false + iconFocused = false updateValue(`{{ env.${variable} }}`) } @@ -102,6 +104,17 @@ > + +
+
+ {#each tags as tag} + updateValue("")}> + {tag} + + {/each} +
+
+ diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte index 1a261008c2..3ea75ffac3 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte @@ -14,7 +14,7 @@ import { IntegrationTypes } from "constants/backend" import { createValidationStore } from "helpers/validation/yup" import { createEventDispatcher, onMount } from "svelte" - import { environment, licensing } from "stores/portal" + import { environment, licensing, auth } from "stores/portal" import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte" export let datasource @@ -22,6 +22,8 @@ export let creating let createVariableModal + let selectedKey + const validation = createValidationStore() const dispatch = createEventDispatcher() @@ -69,10 +71,13 @@ function save(data) { environment.createVariable(data) + config[selectedKey] = `{{ env.${data.name} }}` createVariableModal.hide() } - function showModal() { + function showModal(configKey) { + selectedKey = configKey + console.log(selectedKey) createVariableModal.show() } @@ -83,7 +88,13 @@ onMount(async () => { await environment.loadVariables() + + if ($auth.user) { + await licensing.init() + } }) + + $: console.log(config) @@ -128,7 +139,7 @@
showModal(configKey)} variables={$environment.variables} on:change bind:value={config[configKey]} diff --git a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte index 44fdbd0182..70029eb3c5 100644 --- a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte +++ b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte @@ -32,15 +32,23 @@ notifications.error(err.message) } } + + const saveVariable = () => { + try { + save({ + name, + production: productionValue, + development: developmentValue, + }) + notifications.success("Environment variable saved") + } catch (err) { + notifications.error("Error saving environment variable") + } + } - save({ - name, - production: productionValue, - development: developmentValue, - })} + onConfirm={() => saveVariable()} title={!row ? "Add new environment variable" : "Edit environment variable"} > From 843649eb5416ea3e3da27fa1ac5cb80a797b814d Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 26 Jan 2023 14:59:29 +0000 Subject: [PATCH 225/387] add envrionment bindings to automations --- .../builder/src/builderStore/dataBinding.js | 3 +-- .../SetupPanel/AutomationBlockSetup.svelte | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index 3f284f75c4..701d6b99ed 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -92,7 +92,7 @@ export const getAuthBindings = () => { export const getEnvironmentBindings = () => { let envVars = get(environment).variables - let test = envVars.map(variable => { + return envVars.map(variable => { return { type: "context", runtimeBinding: `env.${makePropSafe(variable.name)}`, @@ -102,7 +102,6 @@ export const getEnvironmentBindings = () => { display: { type: "string", name: variable.name }, } }) - return test } /** diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index a73db5648b..6230ea1c41 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -18,6 +18,7 @@ import { automationStore } from "builderStore" import { tables } from "stores/backend" + import { environment } from "stores/portal" import WebhookDisplay from "../Shared/WebhookDisplay.svelte" import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte" import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte" @@ -33,6 +34,7 @@ import { Utils } from "@budibase/frontend-core" import { TriggerStepID, ActionStepID } from "constants/backend/automations" import { cloneDeep } from "lodash/fp" + import { onMount } from "svelte" export let block export let testData @@ -166,6 +168,23 @@ ) } + // Environment bindings + bindings = bindings.concat( + $environment.variables.map(variable => { + return { + label: `env.${variable.name}`, + path: `env.${variable.name}`, + type: "test", + icon: "Key", + category: "Environment", + display: { + type: "string", + name: variable.name, + }, + } + }) + ) + return bindings } @@ -196,6 +215,10 @@ onChange({ detail: tempFilters }, defKey) drawer.hide() } + + onMount(async () => { + await environment.loadVariables() + })
From debef20af516b30e4ea6670044d9230ccf38d041 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 26 Jan 2023 15:09:20 +0000 Subject: [PATCH 226/387] gate env vars in binding drawers behind license --- .../builder/src/builderStore/dataBinding.js | 9 +++-- .../SetupPanel/AutomationBlockSetup.svelte | 33 ++++++++++--------- .../bindings/DrawerBindableInput.svelte | 1 - .../builder/src/stores/portal/licensing.js | 1 - 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index 701d6b99ed..b7b479bf2d 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -21,7 +21,7 @@ import { import { TableNames } from "../constants" import { JSONUtils } from "@budibase/frontend-core" import ActionDefinitions from "components/design/settings/controls/ButtonActionEditor/manifest.json" -import { environment } from "stores/portal" +import { environment, licensing } from "stores/portal" // Regex to match all instances of template strings const CAPTURE_VAR_INSIDE_TEMPLATE = /{{([^}]+)}}/g @@ -54,8 +54,13 @@ export const getBindableProperties = (asset, componentId) => { * Gets all rest bindable data fields */ export const getRestBindings = () => { + const hasEnvironmentVariablesEnabled = get(licensing).hasEnvironmentVariables const userBindings = getUserBindings() - return [...userBindings, ...getAuthBindings(), ...getEnvironmentBindings()] + return [ + ...userBindings, + ...getAuthBindings(), + ...(hasEnvironmentVariablesEnabled ? getEnvironmentBindings() : []), + ] } /** diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte index 6230ea1c41..c2ad6324f7 100644 --- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte +++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte @@ -18,7 +18,7 @@ import { automationStore } from "builderStore" import { tables } from "stores/backend" - import { environment } from "stores/portal" + import { environment, licensing } from "stores/portal" import WebhookDisplay from "../Shared/WebhookDisplay.svelte" import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte" import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte" @@ -169,21 +169,22 @@ } // Environment bindings - bindings = bindings.concat( - $environment.variables.map(variable => { - return { - label: `env.${variable.name}`, - path: `env.${variable.name}`, - type: "test", - icon: "Key", - category: "Environment", - display: { - type: "string", - name: variable.name, - }, - } - }) - ) + if ($licensing.environmentVariablesEnabled) { + bindings = bindings.concat( + $environment.variables.map(variable => { + return { + label: `env.${variable.name}`, + path: `env.${variable.name}`, + icon: "Key", + category: "Environment", + display: { + type: "string", + name: variable.name, + }, + } + }) + ) + } return bindings } diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte index f115ab89ce..cc64e28835 100644 --- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte +++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte @@ -28,7 +28,6 @@ $: readableValue = runtimeToReadableBinding(bindings, value) $: tempValue = readableValue - $: console.log(tempValue) $: isJS = isJSBinding(value) const saveBinding = () => { diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js index ff302bfebd..96164ef2dc 100644 --- a/packages/builder/src/stores/portal/licensing.js +++ b/packages/builder/src/stores/portal/licensing.js @@ -64,7 +64,6 @@ export const createLicensingStore = () => { Constants.Features.ENVIRONMENT_VARIABLES ) - environmentVariablesEnabled = true store.update(state => { return { ...state, From 9175cab4cad3b958e25e1f420bea41050ca6da65 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 26 Jan 2023 15:34:03 +0000 Subject: [PATCH 227/387] add environmentVariables feature to constants --- packages/frontend-core/src/constants.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js index f2e48b6fef..3a16013df2 100644 --- a/packages/frontend-core/src/constants.js +++ b/packages/frontend-core/src/constants.js @@ -114,6 +114,7 @@ export const ApiVersion = "1" export const Features = { USER_GROUPS: "userGroups", BACKUPS: "appBackups", + ENVIRONMENT_VARIABLES: "environmentVariables", } // Role IDs From c68b5ccb845cd525adc6e3441e818f987684d440 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 26 Jan 2023 16:16:56 +0000 Subject: [PATCH 228/387] fix license check --- packages/builder/src/builderStore/dataBinding.js | 4 ++-- packages/builder/src/stores/portal/licensing.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index b7b479bf2d..122cb0d519 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -54,12 +54,12 @@ export const getBindableProperties = (asset, componentId) => { * Gets all rest bindable data fields */ export const getRestBindings = () => { - const hasEnvironmentVariablesEnabled = get(licensing).hasEnvironmentVariables + const environmentVariablesEnabled = get(licensing).environmentVariablesEnabled const userBindings = getUserBindings() return [ ...userBindings, ...getAuthBindings(), - ...(hasEnvironmentVariablesEnabled ? getEnvironmentBindings() : []), + ...(environmentVariablesEnabled ? getEnvironmentBindings() : []), ] } diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js index 96164ef2dc..6f5c80e03c 100644 --- a/packages/builder/src/stores/portal/licensing.js +++ b/packages/builder/src/stores/portal/licensing.js @@ -60,7 +60,7 @@ export const createLicensingStore = () => { const backupsEnabled = license.features.includes( Constants.Features.BACKUPS ) - let environmentVariablesEnabled = license.features.includes( + const environmentVariablesEnabled = license.features.includes( Constants.Features.ENVIRONMENT_VARIABLES ) From 74269dbb272408fa7413568d2fb2b93eaf2e069b Mon Sep 17 00:00:00 2001 From: adrinr Date: Wed, 25 Jan 2023 11:51:08 +0000 Subject: [PATCH 229/387] Fix timespan issues --- packages/server/src/migrations/tests/index.spec.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/server/src/migrations/tests/index.spec.ts b/packages/server/src/migrations/tests/index.spec.ts index cf283cf518..4540d8f61f 100644 --- a/packages/server/src/migrations/tests/index.spec.ts +++ b/packages/server/src/migrations/tests/index.spec.ts @@ -10,8 +10,9 @@ import * as structures from "../../tests/utilities/structures" import { MIGRATIONS } from "../" import * as helpers from "./helpers" -const { mocks } = require("@budibase/backend-core/tests") -const timestamp = mocks.date.MOCK_DATE.toISOString() +import tk from "timekeeper" +const timestamp = new Date().toISOString() +tk.freeze(timestamp) const clearMigrations = async () => { const dbs = [context.getDevAppDB(), context.getProdAppDB()] @@ -24,6 +25,10 @@ const clearMigrations = async () => { jest.setTimeout(10000) +afterAll(() => { + tk.reset() +}) + describe("migrations", () => { const config = new TestConfig() From 13af7aa7307f5028a05804633aa7ab7b3251d691 Mon Sep 17 00:00:00 2001 From: Adria Navarro Redo Date: Wed, 25 Jan 2023 12:06:10 +0000 Subject: [PATCH 230/387] Add aws-sdk mock back --- packages/server/__mocks__/aws-sdk.ts | 80 ++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 packages/server/__mocks__/aws-sdk.ts diff --git a/packages/server/__mocks__/aws-sdk.ts b/packages/server/__mocks__/aws-sdk.ts new file mode 100644 index 0000000000..2efbd303f2 --- /dev/null +++ b/packages/server/__mocks__/aws-sdk.ts @@ -0,0 +1,80 @@ +module AwsMock { + const aws: any = {} + + const response = (body: any) => () => ({ promise: () => body }) + + function DocumentClient() { + // @ts-ignore + this.put = jest.fn(response({})) + // @ts-ignore + this.query = jest.fn( + response({ + Items: [], + }) + ) + // @ts-ignore + this.scan = jest.fn( + response({ + Items: [ + { + Name: "test", + }, + ], + }) + ) + // @ts-ignore + this.get = jest.fn(response({})) + // @ts-ignore + this.update = jest.fn(response({})) + // @ts-ignore + this.delete = jest.fn(response({})) + } + + function S3() { + // @ts-ignore + this.listObjects = jest.fn( + response({ + Contents: {}, + }) + ) + + // @ts-ignore + this.createBucket = jest.fn( + response({ + Contents: {}, + }) + ) + + // @ts-ignore + this.deleteObjects = jest.fn( + response({ + Contents: {}, + }) + ) + + // @ts-ignore + this.getSignedUrl = (operation, params) => { + return `http://test.com/${params.Bucket}/${params.Key}` + } + + // @ts-ignore + this.headBucket = jest.fn( + response({ + Contents: {}, + }) + ) + + // @ts-ignore + this.upload = jest.fn( + response({ + Contents: {}, + }) + ) + } + + aws.DynamoDB = { DocumentClient } + aws.S3 = S3 + aws.config = { update: jest.fn() } + + module.exports = aws +} From 067462f458199b859e470e4f075c8ee2d90eee32 Mon Sep 17 00:00:00 2001 From: Adria Navarro Redo Date: Wed, 25 Jan 2023 17:11:37 +0000 Subject: [PATCH 231/387] Use multitenancy for tests --- packages/server/package.json | 3 +- packages/server/src/tests/jestEnv.ts | 1 + .../src/tests/utilities/TestConfiguration.ts | 117 ++++++++++-------- packages/server/yarn.lock | 5 + 4 files changed, 73 insertions(+), 53 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index b51ebd7720..95c6ac6250 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -122,10 +122,11 @@ "@babel/core": "7.17.4", "@babel/preset-env": "7.16.11", "@budibase/standard-components": "^0.9.139", + "@faker-js/faker": "^7.6.0", "@jest/test-sequencer": "24.9.0", - "@trendyol/jest-testcontainers": "^2.1.1", "@swc/core": "^1.3.25", "@swc/jest": "^0.2.24", + "@trendyol/jest-testcontainers": "^2.1.1", "@types/apidoc": "0.50.0", "@types/bson": "4.2.0", "@types/global-agent": "2.1.1", diff --git a/packages/server/src/tests/jestEnv.ts b/packages/server/src/tests/jestEnv.ts index 9b60282897..9707893bd9 100644 --- a/packages/server/src/tests/jestEnv.ts +++ b/packages/server/src/tests/jestEnv.ts @@ -3,6 +3,7 @@ import { tmpdir } from "os" env._set("SELF_HOSTED", "1") env._set("NODE_ENV", "jest") +env._set("MULTI_TENANCY", "1") // @ts-ignore env._set("BUDIBASE_DIR", tmpdir("budibase-unittests")) env._set("LOG_LEVEL", "silent") diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index b59e3591fc..75ab532493 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -1,3 +1,4 @@ +import { faker } from "@faker-js/faker" import { mocks } from "@budibase/backend-core/tests" // init the licensing mock @@ -40,14 +41,9 @@ import { generateUserMetadataID } from "../../db/utils" import { startup } from "../../startup" import { db } from "@budibase/backend-core" import Nano from "@budibase/nano" +import { AuthToken } from "@budibase/types" const supertest = require("supertest") -const GLOBAL_USER_ID = "us_uuid1" -const EMAIL = "babs@babs.com" -const FIRSTNAME = "Barbara" -const LASTNAME = "Barbington" -const CSRF_TOKEN = "e3727778-7af0-4226-b5eb-f43cbe60a306" - class TestConfiguration { server: any request: any @@ -64,6 +60,14 @@ class TestConfiguration { linkedTable: any automation: any datasource: any + tenantId: string | null + defaultValues: { + globalUserId: string + email: string + firstName: string + lastName: string + csrfToken: string + } constructor(openServer = true) { if (openServer) { @@ -78,6 +82,18 @@ class TestConfiguration { } this.appId = null this.allApps = [] + this.tenantId = null + this.defaultValues = this.populateDefaultValues() + } + + populateDefaultValues() { + return { + globalUserId: faker.datatype.uuid(), + email: faker.internet.email(), + firstName: faker.name.firstName(), + lastName: faker.name.lastName(), + csrfToken: faker.datatype.uuid(), + } } getRequest() { @@ -102,10 +118,10 @@ class TestConfiguration { getUserDetails() { return { - globalId: GLOBAL_USER_ID, - email: EMAIL, - firstName: FIRSTNAME, - lastName: LASTNAME, + globalId: this.defaultValues.globalUserId, + email: this.defaultValues.email, + firstName: this.defaultValues.firstName, + lastName: this.defaultValues.lastName, } } @@ -113,7 +129,9 @@ class TestConfiguration { if (!appId) { appId = this.appId } - return tenancy.doInTenant(TENANT_ID, () => { + + const tenant = this.getTenantId() + return tenancy.doInTenant(tenant, () => { // check if already in a context if (context.getAppId() == null && appId !== null) { return context.doInAppContext(appId, async () => { @@ -129,7 +147,12 @@ class TestConfiguration { // use a new id as the name to avoid name collisions async init(appName = newid()) { - await this.cleanAllDbs() + this.defaultValues = this.populateDefaultValues() + if (context.isMultiTenant()) { + this.tenantId = `tenant-${newid()}` + context.updateTenantId(this.tenantId) + } + if (!this.started) { await startup() } @@ -140,24 +163,6 @@ class TestConfiguration { return this.createApp(appName) } - async cleanAllDbs() { - const couchInfo = db.getCouchInfo() - const nano = Nano({ - url: couchInfo.url, - requestDefaults: { - headers: { - Authorization: couchInfo.cookie, - }, - }, - parseUrl: false, - }) - let dbs - do { - dbs = await nano.db.list() - await Promise.all(dbs.map(x => nano.db.destroy(x))) - } while (dbs.length) - } - end() { if (!this) { return @@ -180,7 +185,7 @@ class TestConfiguration { // fake cookies, we don't need them request.cookies = { set: () => {}, get: () => {} } request.config = { jwtSecret: env.JWT_SECRET } - request.user = { appId, tenantId: TENANT_ID } + request.user = { appId, tenantId: this.getTenantId() } request.query = {} request.request = { body, @@ -196,15 +201,15 @@ class TestConfiguration { // USER / AUTH async globalUser({ - id = GLOBAL_USER_ID, - firstName = FIRSTNAME, - lastName = LASTNAME, + id = this.defaultValues.globalUserId, + firstName = this.defaultValues.firstName, + lastName = this.defaultValues.lastName, builder = true, admin = false, - email = EMAIL, + email = this.defaultValues.email, roles, }: any = {}) { - return tenancy.doWithGlobalDB(TENANT_ID, async (db: any) => { + return tenancy.doWithGlobalDB(this.getTenantId(), async (db: any) => { let existing try { existing = await db.get(id) @@ -215,14 +220,14 @@ class TestConfiguration { _id: id, ...existing, roles: roles || {}, - tenantId: TENANT_ID, + tenantId: this.getTenantId(), firstName, lastName, } await sessions.createASession(id, { sessionId: "sessionid", - tenantId: TENANT_ID, - csrfToken: CSRF_TOKEN, + tenantId: this.getTenantId(), + csrfToken: this.defaultValues.csrfToken, }) if (builder) { user.builder = { global: true } @@ -244,9 +249,9 @@ class TestConfiguration { async createUser( id = null, - firstName = FIRSTNAME, - lastName = LASTNAME, - email = EMAIL, + firstName = this.defaultValues.firstName, + lastName = this.defaultValues.lastName, + email = this.defaultValues.email, builder = true, admin = false, roles = {} @@ -285,13 +290,13 @@ class TestConfiguration { } await sessions.createASession(userId, { sessionId: "sessionid", - tenantId: TENANT_ID, + tenantId: this.getTenantId(), }) // have to fake this const authObj = { userId, sessionId: "sessionid", - tenantId: TENANT_ID, + tenantId: this.getTenantId(), } const app = { roleId: roleId, @@ -314,10 +319,11 @@ class TestConfiguration { } defaultHeaders(extras = {}) { - const authObj = { - userId: GLOBAL_USER_ID, + const tenantId = this.getTenantId() + const authObj: AuthToken = { + userId: this.defaultValues.globalUserId, sessionId: "sessionid", - tenantId: TENANT_ID, + tenantId, } const app = { roleId: roles.BUILTIN_ROLE_IDS.ADMIN, @@ -331,15 +337,22 @@ class TestConfiguration { `${constants.Cookie.Auth}=${authToken}`, `${constants.Cookie.CurrentApp}=${appToken}`, ], - [constants.Header.CSRF_TOKEN]: CSRF_TOKEN, + [constants.Header.CSRF_TOKEN]: this.defaultValues.csrfToken, ...extras, } if (this.appId) { headers[constants.Header.APP_ID] = this.appId } + if (this.tenantId) { + headers[constants.Header.TENANT_ID] = this.tenantId + } return headers } + getTenantId() { + return this.tenantId || TENANT_ID + } + publicHeaders({ prodApp = true } = {}) { const appId = prodApp ? this.prodAppId : this.appId @@ -353,7 +366,7 @@ class TestConfiguration { } async roleHeaders({ - email = EMAIL, + email = this.defaultValues.email, roleId = roles.BUILTIN_ROLE_IDS.ADMIN, builder = false, prodApp = true, @@ -363,8 +376,8 @@ class TestConfiguration { // API - async generateApiKey(userId = GLOBAL_USER_ID) { - return tenancy.doWithGlobalDB(TENANT_ID, async (db: any) => { + async generateApiKey(userId = this.defaultValues.globalUserId) { + return tenancy.doWithGlobalDB(this.getTenantId(), async (db: any) => { const id = dbCore.generateDevInfoID(userId) let devInfo try { @@ -373,7 +386,7 @@ class TestConfiguration { devInfo = { _id: id, userId } } devInfo.apiKey = encryption.encrypt( - `${TENANT_ID}${dbCore.SEPARATOR}${newid()}` + `${this.getTenantId()}${dbCore.SEPARATOR}${newid()}` ) await db.put(devInfo) return devInfo.apiKey diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index e4a86cf759..142bdca634 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1527,6 +1527,11 @@ pump "^3.0.0" secure-json-parse "^2.1.0" +"@faker-js/faker@^7.6.0": + version "7.6.0" + resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.6.0.tgz#9ea331766084288634a9247fcd8b84f16ff4ba07" + integrity sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw== + "@google-cloud/firestore@5.0.2": version "5.0.2" resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-5.0.2.tgz#36923fde45987f928a220d347f341c5602f9e340" From 8c68741f987c82323358d7f5608a0bc8a3e7478c Mon Sep 17 00:00:00 2001 From: Adria Navarro Redo Date: Wed, 25 Jan 2023 17:13:23 +0000 Subject: [PATCH 232/387] Fix application delete tests --- packages/backend-core/src/db/couch/DatabaseImpl.ts | 2 +- packages/server/src/api/controllers/application.ts | 4 +++- packages/types/src/sdk/db.ts | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts index 9b4761d961..4919d8db4a 100644 --- a/packages/backend-core/src/db/couch/DatabaseImpl.ts +++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts @@ -146,7 +146,7 @@ export class DatabaseImpl implements Database { async destroy() { try { - await DatabaseImpl.nano.db.destroy(this.name) + return await DatabaseImpl.nano.db.destroy(this.name) } catch (err: any) { // didn't exist, don't worry if (err.statusCode === 404) { diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index a8b3797681..fef883ef9e 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -500,7 +500,9 @@ async function destroyApp(ctx: BBContext) { await quotas.removeApp() await events.app.deleted(app) - await deleteApp(appId) + if (!env.isTest()) { + await deleteApp(appId) + } await removeAppFromUserRoles(ctx, appId) await cache.app.invalidateAppMetadata(devAppId) diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts index 50078ed6cc..35d198ccb2 100644 --- a/packages/types/src/sdk/db.ts +++ b/packages/types/src/sdk/db.ts @@ -1,4 +1,3 @@ -import PouchDB from "pouchdb" import Nano from "@budibase/nano" import { AllDocsResponse, AnyDocument, Document } from "../" From a54c1a16472b0b22804694ebfb147926465dea0e Mon Sep 17 00:00:00 2001 From: Adria Navarro Redo Date: Wed, 25 Jan 2023 17:39:09 +0000 Subject: [PATCH 233/387] Set expected id --- packages/server/src/tests/utilities/TestConfiguration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index 75ab532493..75a56d695e 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -88,7 +88,7 @@ class TestConfiguration { populateDefaultValues() { return { - globalUserId: faker.datatype.uuid(), + globalUserId: `us_${faker.datatype.uuid()}`, email: faker.internet.email(), firstName: faker.name.firstName(), lastName: faker.name.lastName(), From 9242470f6f626b85be57d5084630a152d275d08c Mon Sep 17 00:00:00 2001 From: Adria Navarro Redo Date: Wed, 25 Jan 2023 19:01:24 +0000 Subject: [PATCH 234/387] Fix snapshots test --- package.json | 1 + packages/backend-core/src/cache/user.ts | 12 +++- .../__snapshots__/datasource.spec.ts.snap | 2 +- .../server/src/api/routes/tests/auth.spec.js | 2 +- .../src/api/routes/tests/datasource.spec.ts | 13 ++++- .../src/api/routes/tests/utilities/index.ts | 8 ++- .../src/tests/utilities/TestConfiguration.ts | 56 +++++++++---------- yarn.lock | 25 +++++++++ 8 files changed, 82 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 53d60249f7..6815429f1e 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "private": true, "devDependencies": { "@rollup/plugin-json": "^4.0.2", + "@types/supertest": "^2.0.12", "@typescript-eslint/parser": "5.45.0", "babel-eslint": "^10.0.3", "eslint": "^7.28.0", diff --git a/packages/backend-core/src/cache/user.ts b/packages/backend-core/src/cache/user.ts index a128465cd6..6cc80da07d 100644 --- a/packages/backend-core/src/cache/user.ts +++ b/packages/backend-core/src/cache/user.ts @@ -49,10 +49,11 @@ export async function getUser( } const client = await redis.getUserClient() // try cache - let user = await client.get(userId) + const cacheKey = getCacheKey(tenantId!, userId) + let user = await client.get(cacheKey) if (!user) { user = await populateUser(userId, tenantId) - await client.store(userId, user, EXPIRY_SECONDS) + await client.store(cacheKey, user, EXPIRY_SECONDS) } if (user && !user.tenantId && tenantId) { // make sure the tenant ID is always correct/set @@ -62,6 +63,11 @@ export async function getUser( } export async function invalidateUser(userId: string) { + const tenantId = getTenantId() + const cacheKey = getCacheKey(tenantId, userId) const client = await redis.getUserClient() - await client.delete(userId) + await client.delete(cacheKey) } + +const getCacheKey = (tenantId: string, userId: string) => + `${tenantId}_${userId}` diff --git a/packages/server/src/api/routes/tests/__snapshots__/datasource.spec.ts.snap b/packages/server/src/api/routes/tests/__snapshots__/datasource.spec.ts.snap index 436818f089..7c45a8418f 100644 --- a/packages/server/src/api/routes/tests/__snapshots__/datasource.spec.ts.snap +++ b/packages/server/src/api/routes/tests/__snapshots__/datasource.spec.ts.snap @@ -7,7 +7,7 @@ Array [ "entities": Array [ Object { "_id": "ta_users", - "_rev": "1-6f4013e796887f1771bf7837598d87e7", + "_rev": "1-2375e1bc58aeec664dc1b1f04ad43e44", "createdAt": "2020-01-01T00:00:00.000Z", "name": "Users", "primaryDisplay": "email", diff --git a/packages/server/src/api/routes/tests/auth.spec.js b/packages/server/src/api/routes/tests/auth.spec.js index fa26eb83ac..06a1f52ad8 100644 --- a/packages/server/src/api/routes/tests/auth.spec.js +++ b/packages/server/src/api/routes/tests/auth.spec.js @@ -18,7 +18,7 @@ describe("/authenticate", () => { .set(config.defaultHeaders()) .expect("Content-Type", /json/) .expect(200) - expect(res.body._id).toEqual(generateUserMetadataID("us_uuid1")) + expect(res.body._id).toEqual(generateUserMetadataID(config.user._id)) }) }) }) \ No newline at end of file diff --git a/packages/server/src/api/routes/tests/datasource.spec.ts b/packages/server/src/api/routes/tests/datasource.spec.ts index 66888023c4..bd03d151fa 100644 --- a/packages/server/src/api/routes/tests/datasource.spec.ts +++ b/packages/server/src/api/routes/tests/datasource.spec.ts @@ -4,6 +4,10 @@ import { checkBuilderEndpoint } from "./utilities/TestFunctions" import { checkCacheForDynamicVariable } from "../../../threads/utils" import { events } from "@budibase/backend-core" +import tk from "timekeeper" +import { mocks } from "@budibase/backend-core/tests" +tk.freeze(mocks.date.MOCK_DATE) + let { basicDatasource } = setup.structures const pg = require("pg") @@ -55,7 +59,14 @@ describe("/datasources", () => { datasource: any, fields: { path: string; queryString: string } ) { - return config.previewQuery(request, config, datasource, fields) + return config.previewQuery( + request, + config, + datasource, + fields, + undefined, + "" + ) } it("should invalidate changed or removed variables", async () => { diff --git a/packages/server/src/api/routes/tests/utilities/index.ts b/packages/server/src/api/routes/tests/utilities/index.ts index 519e8a1459..bf69b91e3b 100644 --- a/packages/server/src/api/routes/tests/utilities/index.ts +++ b/packages/server/src/api/routes/tests/utilities/index.ts @@ -1,5 +1,6 @@ import TestConfig from "../../../../tests/utilities/TestConfiguration" import env from "../../../../environment" +import supertest from "supertest" export * as structures from "../../../../tests/utilities/structures" function user() { @@ -44,7 +45,8 @@ export function delay(ms: number) { return new Promise(resolve => setTimeout(resolve, ms)) } -let request: any, config: any +let request: supertest.SuperTest | undefined | null, + config: TestConfig | null export function beforeAll() { config = new TestConfig() @@ -65,14 +67,14 @@ export function getRequest() { if (!request) { beforeAll() } - return request + return request! } export function getConfig() { if (!config) { beforeAll() } - return config + return config! } export async function switchToSelfHosted(func: any) { diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index 75a56d695e..ff9c82d367 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -39,11 +39,17 @@ import { cleanup } from "../../utilities/fileSystem" import newid from "../../db/newid" import { generateUserMetadataID } from "../../db/utils" import { startup } from "../../startup" -import { db } from "@budibase/backend-core" -import Nano from "@budibase/nano" import { AuthToken } from "@budibase/types" const supertest = require("supertest") +type DefaultUserValues = { + globalUserId: string + email: string + firstName: string + lastName: string + csrfToken: string +} + class TestConfiguration { server: any request: any @@ -61,13 +67,7 @@ class TestConfiguration { automation: any datasource: any tenantId: string | null - defaultValues: { - globalUserId: string - email: string - firstName: string - lastName: string - csrfToken: string - } + defaultUserValues: DefaultUserValues constructor(openServer = true) { if (openServer) { @@ -83,10 +83,10 @@ class TestConfiguration { this.appId = null this.allApps = [] this.tenantId = null - this.defaultValues = this.populateDefaultValues() + this.defaultUserValues = this.populateDefaultUserValues() } - populateDefaultValues() { + populateDefaultUserValues(): DefaultUserValues { return { globalUserId: `us_${faker.datatype.uuid()}`, email: faker.internet.email(), @@ -118,10 +118,10 @@ class TestConfiguration { getUserDetails() { return { - globalId: this.defaultValues.globalUserId, - email: this.defaultValues.email, - firstName: this.defaultValues.firstName, - lastName: this.defaultValues.lastName, + globalId: this.defaultUserValues.globalUserId, + email: this.defaultUserValues.email, + firstName: this.defaultUserValues.firstName, + lastName: this.defaultUserValues.lastName, } } @@ -147,7 +147,7 @@ class TestConfiguration { // use a new id as the name to avoid name collisions async init(appName = newid()) { - this.defaultValues = this.populateDefaultValues() + this.defaultUserValues = this.populateDefaultUserValues() if (context.isMultiTenant()) { this.tenantId = `tenant-${newid()}` context.updateTenantId(this.tenantId) @@ -201,12 +201,12 @@ class TestConfiguration { // USER / AUTH async globalUser({ - id = this.defaultValues.globalUserId, - firstName = this.defaultValues.firstName, - lastName = this.defaultValues.lastName, + id = this.defaultUserValues.globalUserId, + firstName = this.defaultUserValues.firstName, + lastName = this.defaultUserValues.lastName, builder = true, admin = false, - email = this.defaultValues.email, + email = this.defaultUserValues.email, roles, }: any = {}) { return tenancy.doWithGlobalDB(this.getTenantId(), async (db: any) => { @@ -227,7 +227,7 @@ class TestConfiguration { await sessions.createASession(id, { sessionId: "sessionid", tenantId: this.getTenantId(), - csrfToken: this.defaultValues.csrfToken, + csrfToken: this.defaultUserValues.csrfToken, }) if (builder) { user.builder = { global: true } @@ -249,9 +249,9 @@ class TestConfiguration { async createUser( id = null, - firstName = this.defaultValues.firstName, - lastName = this.defaultValues.lastName, - email = this.defaultValues.email, + firstName = this.defaultUserValues.firstName, + lastName = this.defaultUserValues.lastName, + email = this.defaultUserValues.email, builder = true, admin = false, roles = {} @@ -321,7 +321,7 @@ class TestConfiguration { defaultHeaders(extras = {}) { const tenantId = this.getTenantId() const authObj: AuthToken = { - userId: this.defaultValues.globalUserId, + userId: this.defaultUserValues.globalUserId, sessionId: "sessionid", tenantId, } @@ -337,7 +337,7 @@ class TestConfiguration { `${constants.Cookie.Auth}=${authToken}`, `${constants.Cookie.CurrentApp}=${appToken}`, ], - [constants.Header.CSRF_TOKEN]: this.defaultValues.csrfToken, + [constants.Header.CSRF_TOKEN]: this.defaultUserValues.csrfToken, ...extras, } if (this.appId) { @@ -366,7 +366,7 @@ class TestConfiguration { } async roleHeaders({ - email = this.defaultValues.email, + email = this.defaultUserValues.email, roleId = roles.BUILTIN_ROLE_IDS.ADMIN, builder = false, prodApp = true, @@ -376,7 +376,7 @@ class TestConfiguration { // API - async generateApiKey(userId = this.defaultValues.globalUserId) { + async generateApiKey(userId = this.defaultUserValues.globalUserId) { return tenancy.doWithGlobalDB(this.getTenantId(), async (db: any) => { const id = dbCore.generateDevInfoID(userId) let devInfo diff --git a/yarn.lock b/yarn.lock index 60cb598a60..f80cde1b6f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -986,6 +986,11 @@ estree-walker "^1.0.1" picomatch "^2.2.2" +"@types/cookiejar@*": + version "2.1.2" + resolved "https://registry.yarnpkg.com/@types/cookiejar/-/cookiejar-2.1.2.tgz#66ad9331f63fe8a3d3d9d8c6e3906dd10f6446e8" + integrity sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog== + "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" @@ -1001,6 +1006,11 @@ resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== +"@types/node@*": + version "18.11.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" + integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== + "@types/node@>= 8": version "18.0.0" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.0.tgz#67c7b724e1bcdd7a8821ce0d5ee184d3b4dd525a" @@ -1011,6 +1021,21 @@ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== +"@types/superagent@*": + version "4.1.16" + resolved "https://registry.yarnpkg.com/@types/superagent/-/superagent-4.1.16.tgz#12c9c16f232f9d89beab91d69368f96ce8e2d881" + integrity sha512-tLfnlJf6A5mB6ddqF159GqcDizfzbMUB1/DeT59/wBNqzRTNNKsaw79A/1TZ84X+f/EwWH8FeuSkjlCLyqS/zQ== + dependencies: + "@types/cookiejar" "*" + "@types/node" "*" + +"@types/supertest@^2.0.12": + version "2.0.12" + resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.12.tgz#ddb4a0568597c9aadff8dbec5b2e8fddbe8692fc" + integrity sha512-X3HPWTwXRerBZS7Mo1k6vMVR1Z6zmJcDVn5O/31whe0tnjE4te6ZJSJGq1RiqHPjzPdMTfjCFogDJmwng9xHaQ== + dependencies: + "@types/superagent" "*" + "@typescript-eslint/parser@5.45.0": version "5.45.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.45.0.tgz#b18a5f6b3cf1c2b3e399e9d2df4be40d6b0ddd0e" From 6a4fe1d5e68dd86de21a8bb3539f173a89f9217d Mon Sep 17 00:00:00 2001 From: Adria Navarro Redo Date: Thu, 26 Jan 2023 11:38:21 +0000 Subject: [PATCH 235/387] Fix automation test --- packages/backend-core/jest.config.ts | 9 +++++++++ packages/server/jest.config.ts | 16 ++++++++++++++++ .../src/automations/tests/automation.spec.js | 6 +++--- .../src/tests/utilities/TestConfiguration.ts | 4 ++-- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/packages/backend-core/jest.config.ts b/packages/backend-core/jest.config.ts index 059d3d2a43..133c25734e 100644 --- a/packages/backend-core/jest.config.ts +++ b/packages/backend-core/jest.config.ts @@ -13,4 +13,13 @@ const config: Config.InitialOptions = { }, } +if (!process.env.CI) { + // use sources when not in CI + config.moduleNameMapper = { + "@budibase/types": "/../types/src", + } +} else { + console.log("Running tests with compiled dependency sources") +} + export default config diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index c261d109c9..7d5c202f15 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -18,4 +18,20 @@ const config: Config.InitialOptions = { }, } +if (!process.env.CI) { + // use sources when not in CI + config.moduleNameMapper = { + "@budibase/backend-core/(.*)": "/../backend-core/$1", + "@budibase/backend-core": "/../backend-core/src", + "@budibase/types": "/../types/src", + } + // add pro sources if they exist + if (fs.existsSync("../../../budibase-pro")) { + config.moduleNameMapper["@budibase/pro"] = + "/../../../budibase-pro/packages/pro/src" + } +} else { + console.log("Running tests with compiled dependency sources") +} + export default config diff --git a/packages/server/src/automations/tests/automation.spec.js b/packages/server/src/automations/tests/automation.spec.js index 4a9f7e2f79..59ee531e9b 100644 --- a/packages/server/src/automations/tests/automation.spec.js +++ b/packages/server/src/automations/tests/automation.spec.js @@ -29,9 +29,9 @@ describe("Run through some parts of the automations system", () => { afterAll(setup.afterAll) it("should be able to init in builder", async () => { - await triggers.externalTrigger(basicAutomation(), { a: 1, appId: "app_123" }) - await wait(100) - expect(thread.execute).toHaveBeenCalled() + await triggers.externalTrigger(basicAutomation(), { a: 1, appId: config.appId }) + await wait(100) + expect(thread.execute).toHaveBeenCalled() }) it("should check coercion", async () => { diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index ff9c82d367..15f090035a 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -399,11 +399,11 @@ class TestConfiguration { // clear any old app this.appId = null // @ts-ignore - await context.updateAppId(null) + context.updateAppId(null) this.app = await this._req({ name: appName }, null, controllers.app.create) this.appId = this.app.appId // @ts-ignore - await context.updateAppId(this.appId) + context.updateAppId(this.appId) // create production app this.prodApp = await this.publish() From 8c1e539fc7073dd81bf463f5b6a17fb9345dae76 Mon Sep 17 00:00:00 2001 From: Adria Navarro Redo Date: Thu, 26 Jan 2023 11:55:11 +0000 Subject: [PATCH 236/387] Fix date related tests --- packages/server/src/api/routes/tests/query.spec.js | 3 +++ packages/server/src/api/routes/tests/row.spec.js | 9 +++++++-- packages/server/src/migrations/tests/index.spec.ts | 4 ---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/server/src/api/routes/tests/query.spec.js b/packages/server/src/api/routes/tests/query.spec.js index f9f2fa8347..f0cfdaa76f 100644 --- a/packages/server/src/api/routes/tests/query.spec.js +++ b/packages/server/src/api/routes/tests/query.spec.js @@ -1,3 +1,6 @@ +const tk = require( "timekeeper") +tk.freeze(Date.now()) + // Mock out postgres for this jest.mock("pg") jest.mock("node-fetch") diff --git a/packages/server/src/api/routes/tests/row.spec.js b/packages/server/src/api/routes/tests/row.spec.js index cd09302dcc..740c833eb8 100644 --- a/packages/server/src/api/routes/tests/row.spec.js +++ b/packages/server/src/api/routes/tests/row.spec.js @@ -1,3 +1,8 @@ +const tk = require( "timekeeper") +const timestamp = new Date("2023-01-26T11:48:57.597Z").toISOString() +tk.freeze(timestamp) + + const { outputProcessing } = require("../../../utilities/rowProcessor") const setup = require("./utilities") const { basicRow } = setup.structures @@ -111,8 +116,8 @@ describe("/rows", () => { _id: existing._id, _rev: existing._rev, type: "row", - createdAt: "2020-01-01T00:00:00.000Z", - updatedAt: "2020-01-01T00:00:00.000Z", + createdAt: timestamp, + updatedAt: timestamp, }) await assertQueryUsage(queryUsage + 1) }) diff --git a/packages/server/src/migrations/tests/index.spec.ts b/packages/server/src/migrations/tests/index.spec.ts index 4540d8f61f..8e52831c5e 100644 --- a/packages/server/src/migrations/tests/index.spec.ts +++ b/packages/server/src/migrations/tests/index.spec.ts @@ -25,10 +25,6 @@ const clearMigrations = async () => { jest.setTimeout(10000) -afterAll(() => { - tk.reset() -}) - describe("migrations", () => { const config = new TestConfig() From 33f162800001fd9d14bb921488ebc322ee30110c Mon Sep 17 00:00:00 2001 From: Adria Navarro Redo Date: Thu, 26 Jan 2023 14:18:56 +0000 Subject: [PATCH 237/387] Fix issues with parallel tests and self/cloud modes --- packages/server/jest.config.ts | 24 +++++++++++++++---- packages/server/package.json | 1 + .../src/api/routes/tests/backup.spec.ts | 7 +++--- .../{cloud.spec.ts => cloud.seq.spec.ts} | 22 +++++++---------- .../server/src/api/routes/tests/query.spec.js | 1 + .../routes/tests/utilities/TestFunctions.ts | 20 ++++++++++++++++ .../src/tests/utilities/TestConfiguration.ts | 22 +++++++++++++++++ packages/server/yarn.lock | 5 ++++ 8 files changed, 81 insertions(+), 21 deletions(-) rename packages/server/src/api/routes/tests/{cloud.spec.ts => cloud.seq.spec.ts} (77%) diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index 7d5c202f15..a55044a3dd 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -1,8 +1,8 @@ -import { Config } from "@jest/types" +import { Config } from "jest" import * as fs from "fs" const preset = require("ts-jest/jest-preset") -const config: Config.InitialOptions = { +const configSettings = { ...preset, preset: "@trendyol/jest-testcontainers", setupFiles: ["./src/tests/jestEnv.ts"], @@ -20,18 +20,34 @@ const config: Config.InitialOptions = { if (!process.env.CI) { // use sources when not in CI - config.moduleNameMapper = { + configSettings.moduleNameMapper = { "@budibase/backend-core/(.*)": "/../backend-core/$1", "@budibase/backend-core": "/../backend-core/src", "@budibase/types": "/../types/src", } // add pro sources if they exist if (fs.existsSync("../../../budibase-pro")) { - config.moduleNameMapper["@budibase/pro"] = + configSettings.moduleNameMapper["@budibase/pro"] = "/../../../budibase-pro/packages/pro/src" } } else { console.log("Running tests with compiled dependency sources") } +const config: Config = { + projects: [ + { + ...configSettings, + displayName: "sequential test", + testMatch: ["/**/*.seq.spec.[jt]s"], + runner: "jest-serial-runner", + }, + { + ...configSettings, + displayName: "parallel test", + testMatch: ["/**/!(*.seq).spec.[jt]s"], + }, + ], +} + export default config diff --git a/packages/server/package.json b/packages/server/package.json index 95c6ac6250..90ba4bb482 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -153,6 +153,7 @@ "is-wsl": "2.2.0", "jest": "28.1.1", "jest-openapi": "0.14.2", + "jest-serial-runner": "^1.2.1", "nodemon": "2.0.15", "openapi-types": "9.3.1", "openapi-typescript": "5.2.0", diff --git a/packages/server/src/api/routes/tests/backup.spec.ts b/packages/server/src/api/routes/tests/backup.spec.ts index 7ab4f2b531..7b325c080d 100644 --- a/packages/server/src/api/routes/tests/backup.spec.ts +++ b/packages/server/src/api/routes/tests/backup.spec.ts @@ -2,6 +2,7 @@ import * as setup from "./utilities" import { events } from "@budibase/backend-core" import sdk from "../../../sdk" import { checkBuilderEndpoint } from "./utilities/TestFunctions" + describe("/backups", () => { let request = setup.getRequest() let config = setup.getConfig() @@ -34,9 +35,9 @@ describe("/backups", () => { describe("calculateBackupStats", () => { it("should be able to calculate the backup statistics", async () => { - config.createAutomation() - config.createScreen() - let res = await sdk.backups.calculateBackupStats(config.getAppId()) + await config.createAutomation() + await config.createScreen() + let res = await sdk.backups.calculateBackupStats(config.getAppId()!) expect(res.automations).toEqual(1) expect(res.datasources).toEqual(1) expect(res.screens).toEqual(1) diff --git a/packages/server/src/api/routes/tests/cloud.spec.ts b/packages/server/src/api/routes/tests/cloud.seq.spec.ts similarity index 77% rename from packages/server/src/api/routes/tests/cloud.spec.ts rename to packages/server/src/api/routes/tests/cloud.seq.spec.ts index f52bf838ff..3ed9241a51 100644 --- a/packages/server/src/api/routes/tests/cloud.spec.ts +++ b/packages/server/src/api/routes/tests/cloud.seq.spec.ts @@ -1,14 +1,20 @@ -import { db as dbCore } from "@budibase/backend-core" import { AppStatus } from "../../../db/utils" import * as setup from "./utilities" +import { wipeDb } from "./utilities/TestFunctions" + describe("/cloud", () => { let request = setup.getRequest() let config = setup.getConfig() afterAll(setup.afterAll) + beforeAll(() => { + // Importing is only allowed in self hosted environments + config.modeSelf() + }) + beforeEach(async () => { await config.init() }) @@ -22,19 +28,7 @@ describe("/cloud", () => { it("should be able to import apps", async () => { // first we need to delete any existing apps on the system so it looks clean otherwise the // import will not run - await request - .post( - `/api/applications/${dbCore.getProdAppID( - config.getAppId() - )}/unpublish` - ) - .set(config.defaultHeaders()) - .expect(204) - await request - .delete(`/api/applications/${config.getAppId()}`) - .set(config.defaultHeaders()) - .expect("Content-Type", /json/) - .expect(200) + await wipeDb() // get a count of apps before the import const preImportApps = await request diff --git a/packages/server/src/api/routes/tests/query.spec.js b/packages/server/src/api/routes/tests/query.spec.js index f0cfdaa76f..6db6ea69cf 100644 --- a/packages/server/src/api/routes/tests/query.spec.js +++ b/packages/server/src/api/routes/tests/query.spec.js @@ -31,6 +31,7 @@ describe("/queries", () => { afterAll(setup.afterAll) beforeEach(async () => { + config.modeSelf() await config.init() datasource = await config.createDatasource() query = await config.createQuery() diff --git a/packages/server/src/api/routes/tests/utilities/TestFunctions.ts b/packages/server/src/api/routes/tests/utilities/TestFunctions.ts index 1c7998332d..ad65c705ac 100644 --- a/packages/server/src/api/routes/tests/utilities/TestFunctions.ts +++ b/packages/server/src/api/routes/tests/utilities/TestFunctions.ts @@ -4,6 +4,8 @@ import { AppStatus } from "../../../../db/utils" import { roles, tenancy, context } from "@budibase/backend-core" import { TENANT_ID } from "../../../../tests/utilities/structures" import env from "../../../../environment" +import { db } from "@budibase/backend-core" +import Nano from "@budibase/nano" class Request { appId: any @@ -55,6 +57,24 @@ export const clearAllAutomations = async (config: any) => { } } +export const wipeDb = async () => { + const couchInfo = db.getCouchInfo() + const nano = Nano({ + url: couchInfo.url, + requestDefaults: { + headers: { + Authorization: couchInfo.cookie, + }, + }, + parseUrl: false, + }) + let dbs + do { + dbs = await nano.db.list() + await Promise.all(dbs.map(x => nano.db.destroy(x))) + } while (dbs.length) +} + export const createRequest = ( request: any, method: any, diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index 15f090035a..d1dba3d2f3 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -11,6 +11,7 @@ mocks.licenses.useUnlimited() import { init as dbInit } from "../../db" dbInit() import env from "../../environment" +import { env as coreEnv } from "@budibase/backend-core" import { basicTable, basicRow, @@ -175,6 +176,27 @@ class TestConfiguration { } } + // MODES + setMultiTenancy = (value: boolean) => { + env._set("MULTI_TENANCY", value) + coreEnv._set("MULTI_TENANCY", value) + } + + setSelfHosted = (value: boolean) => { + env._set("SELF_HOSTED", value) + coreEnv._set("SELF_HOSTED", value) + } + + modeCloud = () => { + this.setSelfHosted(false) + this.setMultiTenancy(true) + } + + modeSelf = () => { + this.setSelfHosted(true) + this.setMultiTenancy(false) + } + // UTILS async _req(body: any, params: any, controlFunc: any) { diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 142bdca634..2bf20c70af 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -9393,6 +9393,11 @@ jest-runtime@^28.1.3: slash "^3.0.0" strip-bom "^4.0.0" +jest-serial-runner@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/jest-serial-runner/-/jest-serial-runner-1.2.1.tgz#0f5f8dbe6f077119bd1fdd7e8518f92353c194d5" + integrity sha512-d59fF+7HdjNvQEL7B4WyFE+f8q5tGzlNUqtOnxTrT1ofun7O6/Lgm/j255BBgCY2fmSue/34M7Xy9+VWRByP0Q== + jest-serializer@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.9.0.tgz#e6d7d7ef96d31e8b9079a714754c5d5c58288e73" From b94546b1a1ebab927ce8b1ed85697e565f4bf714 Mon Sep 17 00:00:00 2001 From: Adria Navarro Redo Date: Thu, 26 Jan 2023 15:16:42 +0000 Subject: [PATCH 238/387] Fix user test --- packages/backend-core/src/cache/user.ts | 4 ++-- packages/server/jest.config.ts | 1 - .../src/tests/utilities/TestConfiguration.ts | 21 ++++++++++++------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/packages/backend-core/src/cache/user.ts b/packages/backend-core/src/cache/user.ts index 6cc80da07d..9236d843fd 100644 --- a/packages/backend-core/src/cache/user.ts +++ b/packages/backend-core/src/cache/user.ts @@ -62,8 +62,8 @@ export async function getUser( return user } -export async function invalidateUser(userId: string) { - const tenantId = getTenantId() +export async function invalidateUser(userId: string, tenantId?: string) { + tenantId = tenantId || getTenantId() const cacheKey = getCacheKey(tenantId, userId) const client = await redis.getUserClient() await client.delete(cacheKey) diff --git a/packages/server/jest.config.ts b/packages/server/jest.config.ts index a55044a3dd..c856057920 100644 --- a/packages/server/jest.config.ts +++ b/packages/server/jest.config.ts @@ -44,7 +44,6 @@ const config: Config = { }, { ...configSettings, - displayName: "parallel test", testMatch: ["/**/!(*.seq).spec.[jt]s"], }, ], diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index d1dba3d2f3..503066ea7e 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -177,24 +177,24 @@ class TestConfiguration { } // MODES - setMultiTenancy = (value: boolean) => { + #setMultiTenancy = (value: boolean) => { env._set("MULTI_TENANCY", value) coreEnv._set("MULTI_TENANCY", value) } - setSelfHosted = (value: boolean) => { + #setSelfHosted = (value: boolean) => { env._set("SELF_HOSTED", value) coreEnv._set("SELF_HOSTED", value) } modeCloud = () => { - this.setSelfHosted(false) - this.setMultiTenancy(true) + this.#setSelfHosted(false) + this.#setMultiTenancy(true) } modeSelf = () => { - this.setSelfHosted(true) - this.setMultiTenancy(false) + this.#setSelfHosted(true) + this.#setMultiTenancy(false) } // UTILS @@ -288,7 +288,7 @@ class TestConfiguration { admin, roles, }) - await cache.user.invalidateUser(globalId) + await cache.user.invalidateUser(globalId, this.getTenantId()) return { ...resp, globalId, @@ -328,7 +328,7 @@ class TestConfiguration { const appToken = auth.jwt.sign(app, env.JWT_SECRET) // returning necessary request headers - await cache.user.invalidateUser(userId) + await cache.user.invalidateUser(userId, this.getTenantId()) return { Accept: "application/json", Cookie: [ @@ -384,6 +384,11 @@ class TestConfiguration { if (appId) { headers[constants.Header.APP_ID] = appId } + + if (this.tenantId) { + headers[constants.Header.TENANT_ID] = this.tenantId + } + return headers } From 23769b669b57538a38ef244ed696c826a8645955 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 25 Jan 2023 09:15:12 +0000 Subject: [PATCH 239/387] Fix upgrade button not working when account portal is an external URL --- .../src/pages/builder/portal/_components/UpgradeButton.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte b/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte index 7de6205a31..5b02bb1e84 100644 --- a/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte +++ b/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte @@ -10,7 +10,7 @@ size="S" on:click on:click={() => { - $goto($admin.accountPortalUrl + "/portal/upgrade") + window.open($admin.accountPortalUrl + "/portal/upgrade", "_blank") }} > Upgrade From 0ad9443991d538775c23d1091e1cf97275cff353 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 25 Jan 2023 09:25:53 +0000 Subject: [PATCH 240/387] v2.2.12-alpha.36 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index fa4cea6971..0b0801c9f6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 58de72f422..08db960274 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.35", + "@budibase/types": "2.2.12-alpha.36", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 7c6ccfcc38..3894241cac 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.35", + "@budibase/string-templates": "2.2.12-alpha.36", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index fca2f69bc6..59bcafbc58 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.35", - "@budibase/client": "2.2.12-alpha.35", - "@budibase/frontend-core": "2.2.12-alpha.35", - "@budibase/string-templates": "2.2.12-alpha.35", + "@budibase/bbui": "2.2.12-alpha.36", + "@budibase/client": "2.2.12-alpha.36", + "@budibase/frontend-core": "2.2.12-alpha.36", + "@budibase/string-templates": "2.2.12-alpha.36", "@sentry/browser": "5.19.1", "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 408c76a762..78ab0eba82 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.35", - "@budibase/string-templates": "2.2.12-alpha.35", - "@budibase/types": "2.2.12-alpha.35", + "@budibase/backend-core": "2.2.12-alpha.36", + "@budibase/string-templates": "2.2.12-alpha.36", + "@budibase/types": "2.2.12-alpha.36", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 33b9aa82f4..3b37ac41e9 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.35", - "@budibase/frontend-core": "2.2.12-alpha.35", - "@budibase/string-templates": "2.2.12-alpha.35", + "@budibase/bbui": "2.2.12-alpha.36", + "@budibase/frontend-core": "2.2.12-alpha.36", + "@budibase/string-templates": "2.2.12-alpha.36", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index dc45bb9a9a..3ca233c979 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.35", + "@budibase/bbui": "2.2.12-alpha.36", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0a870d9b0e..6ff23b743a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 90ba4bb482..94315eba07 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.35", - "@budibase/client": "2.2.12-alpha.35", + "@budibase/backend-core": "2.2.12-alpha.36", + "@budibase/client": "2.2.12-alpha.36", "@budibase/pro": "2.2.12-alpha.35", - "@budibase/string-templates": "2.2.12-alpha.35", - "@budibase/types": "2.2.12-alpha.35", + "@budibase/string-templates": "2.2.12-alpha.36", + "@budibase/types": "2.2.12-alpha.36", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index d0b72e9175..91e1dfe293 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index 4f296c9e6b..35180f8835 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 05c87866a4..ff3eea3889 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.35", + "version": "2.2.12-alpha.36", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.35", + "@budibase/backend-core": "2.2.12-alpha.36", "@budibase/pro": "2.2.12-alpha.35", - "@budibase/string-templates": "2.2.12-alpha.35", - "@budibase/types": "2.2.12-alpha.35", + "@budibase/string-templates": "2.2.12-alpha.36", + "@budibase/types": "2.2.12-alpha.36", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From b5cbe3e7e181dcf46c299393ae9335d3c0660477 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Wed, 25 Jan 2023 09:29:18 +0000 Subject: [PATCH 241/387] Update pro version to 2.2.12-alpha.36 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 94315eba07..a32e5eadd8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.36", "@budibase/client": "2.2.12-alpha.36", - "@budibase/pro": "2.2.12-alpha.35", + "@budibase/pro": "2.2.12-alpha.36", "@budibase/string-templates": "2.2.12-alpha.36", "@budibase/types": "2.2.12-alpha.36", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 2bf20c70af..22f30a80a2 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1278,13 +1278,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.35": - version "2.2.12-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.35.tgz#36045cdccee548d86a5d0951606d41d0de96bd5c" - integrity sha512-CdIioYKH6y8KQRMWJ2esiOeCOOs3RIGGAAY7DYw71ejjxtCcAZ8Fnez+xIgTFqI6Hee64HjMbX2Tc3OO4J/Kxg== +"@budibase/backend-core@2.2.12-alpha.36": + version "2.2.12-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.36.tgz#cabf232b1ab99d932b5a76fe32cf7e0037da6a3f" + integrity sha512-/8uqdYDXTp+wP9+cURL54jlqbwZDoXr917Alw01qlXS00oxqSbaQA4YmLiONjk/V/O8HvYCJRiiCFMS5bz2q4w== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.35" + "@budibase/types" "2.2.12-alpha.36" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1379,13 +1379,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.35": - version "2.2.12-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.35.tgz#6b0f3c2e616b9603b05292dede50d44d3e2d60fe" - integrity sha512-bFaPfocgEUDT3kZV/BWjui9kGr/hn5mfTlj/pPMGQnA/8E9sToJR5bjKjjFrZUr1YrclFDUkaEsixWBK1hWPaw== +"@budibase/pro@2.2.12-alpha.36": + version "2.2.12-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.36.tgz#6869e676eb3a01eb9ecea5574eabb2cfdb9f57b2" + integrity sha512-IK+iShaGrJ0k3z9+JEjRHSFYZz2nlnQlQ/4juOoJn5hTaLxkJ9nDPQ2PbzynPLfPj817BmzHLJH272YoLr216Q== dependencies: - "@budibase/backend-core" "2.2.12-alpha.35" - "@budibase/types" "2.2.12-alpha.35" + "@budibase/backend-core" "2.2.12-alpha.36" + "@budibase/types" "2.2.12-alpha.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1410,10 +1410,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.35": - version "2.2.12-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.35.tgz#35c812289a3ca97c18629c4cf3607bf1aa3539da" - integrity sha512-mkGA/Ago7ckqPeoq70DLN2flbIYpaJgniwd7Tz6zlSrLlBC+fBUSdjzxeXE3FASr3NtC7qHyVS6ZMXEpou6/QQ== +"@budibase/types@2.2.12-alpha.36": + version "2.2.12-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.36.tgz#cd51bd207df840e3f803c9397d1b4346037f17ec" + integrity sha512-v6l7JQCCVQ8eGV4npCUJKo+mgqt6+QKJjFYKXjuhLNVvxz1szxxOa1fLDey4yuIiL/gH/Q/SHWA28FlKF31L2w== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index ff3eea3889..662459a3a2 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.36", - "@budibase/pro": "2.2.12-alpha.35", + "@budibase/pro": "2.2.12-alpha.36", "@budibase/string-templates": "2.2.12-alpha.36", "@budibase/types": "2.2.12-alpha.36", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index ea842c44b0..f51f26a891 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -475,13 +475,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.35": - version "2.2.12-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.35.tgz#36045cdccee548d86a5d0951606d41d0de96bd5c" - integrity sha512-CdIioYKH6y8KQRMWJ2esiOeCOOs3RIGGAAY7DYw71ejjxtCcAZ8Fnez+xIgTFqI6Hee64HjMbX2Tc3OO4J/Kxg== +"@budibase/backend-core@2.2.12-alpha.36": + version "2.2.12-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.36.tgz#cabf232b1ab99d932b5a76fe32cf7e0037da6a3f" + integrity sha512-/8uqdYDXTp+wP9+cURL54jlqbwZDoXr917Alw01qlXS00oxqSbaQA4YmLiONjk/V/O8HvYCJRiiCFMS5bz2q4w== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.35" + "@budibase/types" "2.2.12-alpha.36" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -526,23 +526,23 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.35": - version "2.2.12-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.35.tgz#6b0f3c2e616b9603b05292dede50d44d3e2d60fe" - integrity sha512-bFaPfocgEUDT3kZV/BWjui9kGr/hn5mfTlj/pPMGQnA/8E9sToJR5bjKjjFrZUr1YrclFDUkaEsixWBK1hWPaw== +"@budibase/pro@2.2.12-alpha.36": + version "2.2.12-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.36.tgz#6869e676eb3a01eb9ecea5574eabb2cfdb9f57b2" + integrity sha512-IK+iShaGrJ0k3z9+JEjRHSFYZz2nlnQlQ/4juOoJn5hTaLxkJ9nDPQ2PbzynPLfPj817BmzHLJH272YoLr216Q== dependencies: - "@budibase/backend-core" "2.2.12-alpha.35" - "@budibase/types" "2.2.12-alpha.35" + "@budibase/backend-core" "2.2.12-alpha.36" + "@budibase/types" "2.2.12-alpha.36" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" jsonwebtoken "8.5.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.35": - version "2.2.12-alpha.35" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.35.tgz#35c812289a3ca97c18629c4cf3607bf1aa3539da" - integrity sha512-mkGA/Ago7ckqPeoq70DLN2flbIYpaJgniwd7Tz6zlSrLlBC+fBUSdjzxeXE3FASr3NtC7qHyVS6ZMXEpou6/QQ== +"@budibase/types@2.2.12-alpha.36": + version "2.2.12-alpha.36" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.36.tgz#cd51bd207df840e3f803c9397d1b4346037f17ec" + integrity sha512-v6l7JQCCVQ8eGV4npCUJKo+mgqt6+QKJjFYKXjuhLNVvxz1szxxOa1fLDey4yuIiL/gH/Q/SHWA28FlKF31L2w== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From cfb3bffb59f407d4620b9fbb305076f303066799 Mon Sep 17 00:00:00 2001 From: melohagan <101575380+melohagan@users.noreply.github.com> Date: Wed, 25 Jan 2023 13:09:20 +0000 Subject: [PATCH 242/387] Prevent many-many relationships with same tables (#9421) * Prevent many-many relationships with same tables * Don't check relationship if original tables * Refactor --- .../Datasources/CreateEditRelationship.svelte | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte index e4cbbfc7aa..e43437d756 100644 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte @@ -19,6 +19,8 @@ export let close const colNotSet = "Please specify a column name" + const relationshipAlreadyExists = + "A relationship between these tables already exists." const relationshipTypes = [ { label: "One to Many", @@ -154,6 +156,10 @@ if (!isMany && !fromPrimary) { errObj.fromPrimary = "Please pick the primary key" } + if (isMany && relationshipExists()) { + errObj.fromTable = relationshipAlreadyExists + errObj.toTable = relationshipAlreadyExists + } // currently don't support relationships back onto the table itself, needs to relate out const tableError = "From/to/through tables must be different" @@ -271,6 +277,35 @@ toRelationship = relateTo } + function relationshipExists() { + if ( + originalFromTable && + originalToTable && + originalFromTable === fromTable && + originalToTable === toTable + ) { + return false + } + let fromThroughLinks = Object.values( + datasource.entities[fromTable.name].schema + ).filter(value => value.through) + let toThroughLinks = Object.values( + datasource.entities[toTable.name].schema + ).filter(value => value.through) + + const matchAgainstUserInput = (fromTableId, toTableId) => + (fromTableId === fromId && toTableId === toId) || + (fromTableId === toId && toTableId === fromId) + + return !!fromThroughLinks.find(from => + toThroughLinks.find( + to => + from.through === to.through && + matchAgainstUserInput(from.tableId, to.tableId) + ) + ) + } + function removeExistingRelationship() { if (originalFromTable && originalFromColumnName) { delete datasource.entities[originalFromTable.name].schema[ @@ -332,8 +367,13 @@ bind:error={errors.fromTable} on:change={e => { fromColumn = tableOptions.find(opt => opt.value === e.detail)?.label || "" + if (errors.fromTable === relationshipAlreadyExists) { + errors.toColumn = null + } errors.fromTable = null errors.fromColumn = null + errors.toTable = null + errors.throughTable = null }} /> {#if isManyToOne && fromTable} @@ -352,8 +392,13 @@ bind:error={errors.toTable} on:change={e => { toColumn = tableOptions.find(opt => opt.value === e.detail)?.label || "" + if (errors.toTable === relationshipAlreadyExists) { + errors.fromColumn = null + } errors.toTable = null errors.toColumn = null + errors.fromTable = null + errors.throughTable = null }} /> {#if isManyToMany} @@ -362,6 +407,11 @@ options={tableOptions} bind:value={throughId} bind:error={errors.throughTable} + on:change={() => { + errors.fromTable = null + errors.toTable = null + errors.throughTable = null + }} /> {#if fromTable && toTable && throughTable} +
+ {/each} + + {:else}
diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte index e4cbbfc7aa..e43437d756 100644 --- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte +++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte @@ -19,6 +19,8 @@ export let close const colNotSet = "Please specify a column name" + const relationshipAlreadyExists = + "A relationship between these tables already exists." const relationshipTypes = [ { label: "One to Many", @@ -154,6 +156,10 @@ if (!isMany && !fromPrimary) { errObj.fromPrimary = "Please pick the primary key" } + if (isMany && relationshipExists()) { + errObj.fromTable = relationshipAlreadyExists + errObj.toTable = relationshipAlreadyExists + } // currently don't support relationships back onto the table itself, needs to relate out const tableError = "From/to/through tables must be different" @@ -271,6 +277,35 @@ toRelationship = relateTo } + function relationshipExists() { + if ( + originalFromTable && + originalToTable && + originalFromTable === fromTable && + originalToTable === toTable + ) { + return false + } + let fromThroughLinks = Object.values( + datasource.entities[fromTable.name].schema + ).filter(value => value.through) + let toThroughLinks = Object.values( + datasource.entities[toTable.name].schema + ).filter(value => value.through) + + const matchAgainstUserInput = (fromTableId, toTableId) => + (fromTableId === fromId && toTableId === toId) || + (fromTableId === toId && toTableId === fromId) + + return !!fromThroughLinks.find(from => + toThroughLinks.find( + to => + from.through === to.through && + matchAgainstUserInput(from.tableId, to.tableId) + ) + ) + } + function removeExistingRelationship() { if (originalFromTable && originalFromColumnName) { delete datasource.entities[originalFromTable.name].schema[ @@ -332,8 +367,13 @@ bind:error={errors.fromTable} on:change={e => { fromColumn = tableOptions.find(opt => opt.value === e.detail)?.label || "" + if (errors.fromTable === relationshipAlreadyExists) { + errors.toColumn = null + } errors.fromTable = null errors.fromColumn = null + errors.toTable = null + errors.throughTable = null }} /> {#if isManyToOne && fromTable} @@ -352,8 +392,13 @@ bind:error={errors.toTable} on:change={e => { toColumn = tableOptions.find(opt => opt.value === e.detail)?.label || "" + if (errors.toTable === relationshipAlreadyExists) { + errors.fromColumn = null + } errors.toTable = null errors.toColumn = null + errors.fromTable = null + errors.throughTable = null }} /> {#if isManyToMany} @@ -362,6 +407,11 @@ options={tableOptions} bind:value={throughId} bind:error={errors.throughTable} + on:change={() => { + errors.fromTable = null + errors.toTable = null + errors.throughTable = null + }} /> {#if fromTable && toTable && throughTable}
@@ -220,7 +222,7 @@ .icon-position { position: absolute; - top: 20%; + top: 25%; right: 2%; } @@ -275,9 +277,11 @@ background: var(--grey-1); } - .tags { - position: absolute; - bottom: 12%; - left: 1px; + .close-color { + color: var(--spectrum-global-color-gray-900) !important; + } + + .close-color:hover { + color: var(--spectrum-global-color-blue-400) !important; } diff --git a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte index 45dc75a1fe..47cf2957d1 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/TableIntegrationMenu/IntegrationConfigForm.svelte @@ -87,7 +87,6 @@ function showModal(configKey) { selectedKey = configKey - console.log(selectedKey) createVariableModal.show() } @@ -103,8 +102,6 @@ await licensing.init() } }) - - $: console.log(config) diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index ae4cf60d4c..d995bd507b 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -122,7 +122,6 @@ // Adds a data binding to the expression const addBinding = (binding, { forceJS } = {}) => { - console.log(binding) if (usingJS || forceJS) { let js = decodeJSBinding(jsValue) js = addJSBinding(js, getCaretPosition(), binding.readableBinding) From 7ccce5c042e4157aacf5921178fe3c3f68de4476 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 27 Jan 2023 11:49:44 +0000 Subject: [PATCH 267/387] fix warnings --- packages/bbui/src/Form/Core/EnvDropdown.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte index 43240684c1..61aa50e756 100644 --- a/packages/bbui/src/Form/Core/EnvDropdown.svelte +++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte @@ -122,7 +122,7 @@ bind:this={field} disabled={false} {readonly} - id={"thisOne"} + {id} data-cy={dataCy} value={hbsValue.length ? `{{ ${hbsValue[0]} }}` : value} placeholder={placeholder || ""} @@ -135,7 +135,7 @@ on:focus={onFocus} on:input={onInput} {type} - style="color: white !important;" + style={align ? `text-align: ${align};` : ""} class="spectrum-Textfield-input" inputmode={type === "number" ? "decimal" : "text"} /> From d031a9157e1c341f4661dd375b6120d88c844695 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 27 Jan 2023 12:04:32 +0000 Subject: [PATCH 268/387] fix max-height in dropdown --- packages/bbui/src/Form/Core/EnvDropdown.svelte | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte index 61aa50e756..0867e7ed2d 100644 --- a/packages/bbui/src/Form/Core/EnvDropdown.svelte +++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte @@ -145,12 +145,7 @@ use:clickOutside={handleOutsideClick} class="spectrum-Popover spectrum-Popover--bottom spectrum-Picker-popover is-open" > -
    +
      {#if !environmentVariablesEnabled}
      Upgrade your plan to get environment variables From 4ed239e5fd7800ef1ea2d5c81bc88b7dd8b0d233 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Fri, 27 Jan 2023 12:06:34 +0000 Subject: [PATCH 269/387] fix input not disabling properly --- packages/bbui/src/Form/Core/EnvDropdown.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte index 0867e7ed2d..f51704248b 100644 --- a/packages/bbui/src/Form/Core/EnvDropdown.svelte +++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte @@ -101,7 +101,7 @@
      Date: Fri, 27 Jan 2023 12:36:52 +0000 Subject: [PATCH 270/387] Add module name mapper back --- packages/worker/jest.config.ts | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/packages/worker/jest.config.ts b/packages/worker/jest.config.ts index 0d06446862..85f554f8da 100644 --- a/packages/worker/jest.config.ts +++ b/packages/worker/jest.config.ts @@ -1,10 +1,7 @@ import { Config } from "@jest/types" import * as fs from "fs" -const preset = require("ts-jest/jest-preset") const config: Config.InitialOptions = { - ...preset, - preset: "@trendyol/jest-testcontainers", testEnvironment: "node", setupFiles: ["./src/tests/jestEnv.ts"], setupFilesAfterEnv: ["./src/tests/jestSetup.ts"], @@ -15,4 +12,22 @@ const config: Config.InitialOptions = { }, } +if (!process.env.CI) { + // use sources when not in CI + config.moduleNameMapper = { + "@budibase/backend-core/(.*)": "/../backend-core/$1", + "@budibase/backend-core": "/../backend-core/src", + "@budibase/types": "/../types/src", + } + // add pro sources if they exist + if (fs.existsSync("../../../budibase-pro")) { + config.moduleNameMapper["@budibase/pro/(.*)"] = + "/../../../budibase-pro/packages/pro/$1" + config.moduleNameMapper["@budibase/pro"] = + "/../../../budibase-pro/packages/pro/src" + } +} else { + console.log("Running tests with compiled dependency sources") +} + export default config From a5980caf680d62ae12c32a8d8a1d7e37fde19029 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 27 Jan 2023 13:17:19 +0000 Subject: [PATCH 271/387] Updating Dockerfile to use same path as the publish (restrict context size). --- hosting/dependencies/Dockerfile | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosting/dependencies/Dockerfile b/hosting/dependencies/Dockerfile index 859ba10c83..c4872213f1 100644 --- a/hosting/dependencies/Dockerfile +++ b/hosting/dependencies/Dockerfile @@ -12,7 +12,7 @@ RUN chmod +x install.sh && ./install.sh WORKDIR / -ADD hosting/dependencies/runner.sh . +ADD dependencies/runner.sh . RUN chmod +x ./runner.sh EXPOSE 5984 diff --git a/package.json b/package.json index 6815429f1e..c499d35af7 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "build:docker:single:multiarch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/single/Dockerfile -t budibase:latest .", "build:docker:single:image": "docker build -f hosting/single/Dockerfile -t budibase:latest .", "build:docker:single": "npm run build:docker:pre && npm run build:docker:single:image", - "build:docker:dependencies": "docker build -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest .", + "build:docker:dependencies": "docker build -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest ./hosting", "publish:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.2.1 --push ./hosting/couchdb", "publish:docker:dependencies": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest -t budibase/dependencies:v3.2.1 --push ./hosting", "build:docs": "lerna run build:docs", From 6e3f87c7987c97fc04e65992e21bb774d2d9fdae Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Fri, 27 Jan 2023 13:37:36 +0000 Subject: [PATCH 272/387] Fixing issue with apps not being created correctly due to the recent update to context. --- .../server/src/api/controllers/application.ts | 225 +++++++++--------- 1 file changed, 116 insertions(+), 109 deletions(-) diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts index 68765cdbf4..33f5a53894 100644 --- a/packages/server/src/api/controllers/application.ts +++ b/packages/server/src/api/controllers/application.ts @@ -112,46 +112,45 @@ function checkAppName( } } -async function createInstance(template: any, includeSampleData: boolean) { - const tenantId = tenancy.isMultiTenant() ? tenancy.getTenantId() : null - const baseAppId = generateAppID(tenantId) - const appId = generateDevAppID(baseAppId) - return await context.doInAppContext(appId, async () => { - const db = context.getAppDB() - await db.put({ - _id: "_design/database", - // view collation information, read before writing any complex views: - // https://docs.couchdb.org/en/master/ddocs/views/collation.html#collation-specification - views: {}, - }) - - // NOTE: indexes need to be created before any tables/templates - // add view for linked rows - await createLinkView() - await createRoutingView() - await createAllSearchIndex() - - // replicate the template data to the instance DB - // this is currently very hard to test, downloading and importing template files - if (template && template.templateString) { - const { ok } = await db.load(stringToReadStream(template.templateString)) - if (!ok) { - throw "Error loading database dump from memory." - } - } else if (template && template.useTemplate === "true") { - await sdk.backups.importApp(appId, db, template) - } else { - // create the users table - await db.put(USERS_TABLE_SCHEMA) - - if (includeSampleData) { - // create ootb stock db - await addDefaultTables(db) - } - } - - return { _id: appId } +async function createInstance( + appId: string, + template: any, + includeSampleData: boolean +) { + const db = context.getAppDB() + await db.put({ + _id: "_design/database", + // view collation information, read before writing any complex views: + // https://docs.couchdb.org/en/master/ddocs/views/collation.html#collation-specification + views: {}, }) + + // NOTE: indexes need to be created before any tables/templates + // add view for linked rows + await createLinkView() + await createRoutingView() + await createAllSearchIndex() + + // replicate the template data to the instance DB + // this is currently very hard to test, downloading and importing template files + if (template && template.templateString) { + const { ok } = await db.load(stringToReadStream(template.templateString)) + if (!ok) { + throw "Error loading database dump from memory." + } + } else if (template && template.useTemplate === "true") { + await sdk.backups.importApp(appId, db, template) + } else { + // create the users table + await db.put(USERS_TABLE_SCHEMA) + + if (includeSampleData) { + // create ootb stock db + await addDefaultTables(db) + } + } + + return { _id: appId } } async function addDefaultTables(db: Database) { @@ -250,82 +249,90 @@ async function performAppCreate(ctx: BBContext) { instanceConfig.file = ctx.request.files.templateFile } const includeSampleData = isQsTrue(ctx.request.body.sampleData) - const instance = await createInstance(instanceConfig, includeSampleData) - const appId = instance._id - const db = context.getAppDB() + const tenantId = tenancy.isMultiTenant() ? tenancy.getTenantId() : null + const appId = generateDevAppID(generateAppID(tenantId)) - let newApplication: App = { - _id: DocumentType.APP_METADATA, - _rev: undefined, - appId, - type: "app", - version: packageJson.version, - componentLibraries: ["@budibase/standard-components"], - name: name, - url: url, - template: templateKey, - instance, - tenantId: tenancy.getTenantId(), - updatedAt: new Date().toISOString(), - createdAt: new Date().toISOString(), - status: AppStatus.DEV, - navigation: { - navigation: "Top", - title: name, - navWidth: "Large", - navBackground: "var(--spectrum-global-color-gray-100)", - links: [ - { - url: "/home", - text: "Home", - }, - ], - }, - theme: "spectrum--light", - customTheme: { - buttonBorderRadius: "16px", - }, - } + return await context.doInAppContext(appId, async () => { + const instance = await createInstance( + appId, + instanceConfig, + includeSampleData + ) + const db = context.getAppDB() - // If we used a template or imported an app there will be an existing doc. - // Fetch and migrate some metadata from the existing app. - try { - const existing: App = await db.get(DocumentType.APP_METADATA) - const keys: (keyof App)[] = [ - "_rev", - "navigation", - "theme", - "customTheme", - "icon", - ] - keys.forEach(key => { - if (existing[key]) { - // @ts-ignore - newApplication[key] = existing[key] - } - }) - - // Migrate navigation settings and screens if required - if (existing) { - const navigation = await migrateAppNavigation() - if (navigation) { - newApplication.navigation = navigation - } + let newApplication: App = { + _id: DocumentType.APP_METADATA, + _rev: undefined, + appId, + type: "app", + version: packageJson.version, + componentLibraries: ["@budibase/standard-components"], + name: name, + url: url, + template: templateKey, + instance, + tenantId: tenancy.getTenantId(), + updatedAt: new Date().toISOString(), + createdAt: new Date().toISOString(), + status: AppStatus.DEV, + navigation: { + navigation: "Top", + title: name, + navWidth: "Large", + navBackground: "var(--spectrum-global-color-gray-100)", + links: [ + { + url: "/home", + text: "Home", + }, + ], + }, + theme: "spectrum--light", + customTheme: { + buttonBorderRadius: "16px", + }, } - } catch (err) { - // Nothing to do - } - const response = await db.put(newApplication, { force: true }) - newApplication._rev = response.rev + // If we used a template or imported an app there will be an existing doc. + // Fetch and migrate some metadata from the existing app. + try { + const existing: App = await db.get(DocumentType.APP_METADATA) + const keys: (keyof App)[] = [ + "_rev", + "navigation", + "theme", + "customTheme", + "icon", + ] + keys.forEach(key => { + if (existing[key]) { + // @ts-ignore + newApplication[key] = existing[key] + } + }) - /* istanbul ignore next */ - if (!env.isTest()) { - await createApp(appId) - } + // Migrate navigation settings and screens if required + if (existing) { + const navigation = await migrateAppNavigation() + if (navigation) { + newApplication.navigation = navigation + } + } + } catch (err) { + // Nothing to do + } - await cache.app.invalidateAppMetadata(appId, newApplication) - return newApplication + const response = await db.put(newApplication, { force: true }) + newApplication._rev = response.rev + + /* istanbul ignore next */ + if (!env.isTest()) { + await createApp(appId) + } + + await cache.app.invalidateAppMetadata(appId, newApplication) + return newApplication + }) } async function creationEvents(request: any, app: App) { From d37c0e4b5d5981775c61cb046502733c0a7e694b Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 27 Jan 2023 13:44:57 +0000 Subject: [PATCH 273/387] UI Onboarding UI/UX auth refactoring --- .../src/pages/builder/admin/index.svelte | 173 ++++++++++----- .../auth/_components/GoogleButton.svelte | 30 +-- .../auth/_components/OIDCButton.svelte | 30 +-- .../pages/builder/auth/_components/utils.js | 18 ++ .../src/pages/builder/auth/forgot.svelte | 103 +++++---- .../src/pages/builder/auth/login.svelte | 164 +++++++++------ .../src/pages/builder/auth/reset.svelte | 135 ++++++++---- .../src/pages/builder/invite/index.svelte | 198 ++++++++++++++---- packages/builder/src/stores/portal/users.js | 9 +- packages/frontend-core/src/api/user.js | 16 +- .../src/api/controllers/global/users.ts | 13 ++ packages/worker/src/api/index.ts | 4 + .../worker/src/api/routes/global/users.ts | 14 ++ 13 files changed, 622 insertions(+), 285 deletions(-) create mode 100644 packages/builder/src/pages/builder/auth/_components/utils.js diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte index 99731b8285..7ef2d6d290 100644 --- a/packages/builder/src/pages/builder/admin/index.svelte +++ b/packages/builder/src/pages/builder/admin/index.svelte @@ -4,37 +4,45 @@ Heading, notifications, Layout, - Input, Body, - ActionButton, Modal, } from "@budibase/bbui" import { goto } from "@roxi/routify" import { API } from "api" import { admin, auth } from "stores/portal" - import PasswordRepeatInput from "components/common/users/PasswordRepeatInput.svelte" import ImportAppsModal from "./_components/ImportAppsModal.svelte" import Logo from "assets/bb-emblem.svg" import { onMount } from "svelte" + import { FancyForm, FancyInput, ActionButton } from "@budibase/bbui" + import { TestimonialPage } from "@budibase/frontend-core/src/components" + import { handleError, passwordsMatch } from "../auth/_components/utils" - let adminUser = {} - let error let modal + let form + let errors = {} + let formData = {} + let submitted = false $: tenantId = $auth.tenantId - $: multiTenancyEnabled = $admin.multiTenancy $: cloud = $admin.cloud $: imported = $admin.importComplete + $: multiTenancyEnabled = $admin.multiTenancy async function save() { + form.validate() + if (Object.keys(errors).length > 0) { + return + } + submitted = true try { - adminUser.tenantId = tenantId + const adminUser = { ...formData, tenantId } // Save the admin user await API.createAdminUser(adminUser) notifications.success("Admin user created") await admin.init() $goto("../portal") } catch (error) { + submitted = false notifications.error("Failed to create admin user") } } @@ -53,35 +61,109 @@ -
      -
      - + + + + logo - - Create an admin user - - The admin user has access to everything in Budibase. - - - - - - - - - {#if multiTenancyEnabled} - { - admin.unload() - $goto("../auth/org") - }} - > - Change organisation - - {:else if !cloud && !imported} + Create an admin user + The admin user has access to everything in Budibase. + + + + { + formData = { + ...formData, + email: e.detail, + } + }} + validate={() => { + handleError(() => { + return { + email: !formData.email + ? "Please enter a valid email" + : undefined, + } + }, errors) + }} + disabled={submitted} + error={errors.email} + /> + { + formData = { + ...formData, + password: e.detail, + } + }} + validate={() => { + handleError(() => { + let err = {} + + err["password"] = !formData.password + ? "Please enter a password" + : undefined + + err["confirmationPassword"] = + !passwordsMatch( + formData.password, + formData.confirmationPassword + ) && formData.confirmationPassword + ? "Passwords must match" + : undefined + + return err + }, errors) + }} + error={errors.password} + disabled={submitted} + /> + { + formData = { + ...formData, + confirmationPassword: e.detail, + } + }} + validate={() => { + handleError(() => { + return { + confirmationPassword: + !passwordsMatch( + formData.password, + formData.confirmationPassword + ) && formData.password + ? "Passwords must match" + : undefined, + } + }, errors) + }} + error={errors.confirmationPassword} + disabled={submitted} + /> + + + + + + + -
      - + + diff --git a/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte index 0acaa127cc..d8e1da7072 100644 --- a/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte +++ b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte @@ -1,5 +1,5 @@ {#if show} - window.open(`/api/global/auth/${tenantId}/google`, "_blank")} > -
      - google icon -

      Sign in with Google

      -
      -       + Log in with Google + {/if} - - diff --git a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte index 27f5bde186..396bde3cb0 100644 --- a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte +++ b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte @@ -1,5 +1,5 @@ {#if show} - window.open( `/api/global/auth/${$auth.tenantId}/oidc/configs/${$oidc.uuid}`, "_blank" )} > -
      - oidc icon -

      {`Sign in with ${$oidc.name || "OIDC"}`}

      -
      -       + {`Log in with ${$oidc.name || "OIDC"}`} + {/if} - - diff --git a/packages/builder/src/pages/builder/auth/_components/utils.js b/packages/builder/src/pages/builder/auth/_components/utils.js new file mode 100644 index 0000000000..0ca42292b9 --- /dev/null +++ b/packages/builder/src/pages/builder/auth/_components/utils.js @@ -0,0 +1,18 @@ +exports.handleError = (validate, errors) => { + const err = validate() + let update = { ...errors, ...err } + errors = Object.keys(update).reduce((acc, key) => { + if (update[key]) { + acc[key] = update[key] + } + return acc + }, {}) +} + +exports.passwordsMatch = (password, confirmation) => { + let confirm = confirmation?.trim() + let pwd = password?.trim() + return ( + typeof confirm === "string" && typeof pwd === "string" && confirm == pwd + ) +} diff --git a/packages/builder/src/pages/builder/auth/forgot.svelte b/packages/builder/src/pages/builder/auth/forgot.svelte index 7227fd6377..13c8331c2d 100644 --- a/packages/builder/src/pages/builder/auth/forgot.svelte +++ b/packages/builder/src/pages/builder/auth/forgot.svelte @@ -1,25 +1,35 @@ - + + + + { + email = e.detail + }} + validate={() => { + if (!email) { + return "Please enter your email" + } + return null + }} + {error} + disabled={submitted} + /> + + +
      + +
      + + diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte index d8633a4fbc..b80dac44e7 100644 --- a/packages/builder/src/pages/builder/auth/login.svelte +++ b/packages/builder/src/pages/builder/auth/login.svelte @@ -5,7 +5,6 @@ Button, Divider, Heading, - Input, Layout, notifications, Link, @@ -14,22 +13,30 @@ import { auth, organisation, oidc, admin } from "stores/portal" import GoogleButton from "./_components/GoogleButton.svelte" import OIDCButton from "./_components/OIDCButton.svelte" + import { handleError } from "./_components/utils" import Logo from "assets/bb-emblem.svg" + import { TestimonialPage } from "@budibase/frontend-core/src/components" + import { FancyForm, FancyInput } from "@budibase/bbui" import { onMount } from "svelte" - let username = "" - let password = "" let loaded = false + let form + let errors = {} + let formData = {} $: company = $organisation.company || "Budibase" - $: multiTenancyEnabled = $admin.multiTenancy $: cloud = $admin.cloud async function login() { + form.validate() + if (Object.keys(errors).length > 0) { + console.log("errors") + return + } try { await auth.login({ - username: username.trim(), - password, + username: formData?.username.trim(), + password: formData?.password, }) if ($auth?.user?.forceResetPassword) { $goto("./reset") @@ -57,75 +64,98 @@ - + + {#if loaded && ($organisation.google || $organisation.oidc)} + + + + + + {/if} + + { + formData = { + ...formData, + username: e.detail, + } + }} + validate={() => { + handleError(() => { + return { + username: !formData.username + ? "Please enter a valid email" + : undefined, + } + }, errors) + }} + error={errors.username} + /> + { + formData = { + ...formData, + password: e.detail, + } + }} + validate={() => { + handleError(() => { + return { + password: !formData.password + ? "Please enter your password" + : undefined, + } + }, errors) + }} + error={errors.password} + /> + + + + + + + + + + {#if cloud} + + By using Budibase Cloud +
      + you are agreeing to our + + License Agreement + + + {/if} + + diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js index e9bdf790f2..1510207604 100644 --- a/packages/builder/src/stores/portal/users.js +++ b/packages/builder/src/stores/portal/users.js @@ -29,13 +29,19 @@ export function createUsersStore() { async function invite(payload) { return API.inviteUsers(payload) } - async function acceptInvite(inviteCode, password) { + async function acceptInvite(inviteCode, password, firstName, lastName) { return API.acceptInvite({ inviteCode, password, + firstName, + lastName, }) } + async function fetchInvite(inviteCode) { + return API.getUserInvite(inviteCode) + } + async function create(data) { let mappedUsers = data.users.map(user => { const body = { @@ -101,6 +107,7 @@ export function createUsersStore() { fetch, invite, acceptInvite, + fetchInvite, create, save, bulkDelete, diff --git a/packages/frontend-core/src/api/user.js b/packages/frontend-core/src/api/user.js index 5c4f070802..9875605ce0 100644 --- a/packages/frontend-core/src/api/user.js +++ b/packages/frontend-core/src/api/user.js @@ -146,6 +146,16 @@ export const buildUserEndpoints = API => ({ }) }, + /** + * Retrieves the invitation associated with a provided code. + * @param code The unique code for the target invite + */ + getUserInvite: async code => { + return await API.get({ + url: `/api/global/users/invite/${code}`, + }) + }, + /** * Invites multiple users to the current tenant. * @param users An array of users to invite @@ -168,13 +178,17 @@ export const buildUserEndpoints = API => ({ * Accepts an invite to join the platform and creates a user. * @param inviteCode the invite code sent in the email * @param password the password for the newly created user + * @param firstName the first name of the new user + * @param lastName the last name of the new user */ - acceptInvite: async ({ inviteCode, password }) => { + acceptInvite: async ({ inviteCode, password, firstName, lastName }) => { return await API.post({ url: "/api/global/users/invite/accept", body: { inviteCode, password, + firstName, + lastName, }, }) }, diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts index 10741f3725..817480151d 100644 --- a/packages/worker/src/api/controllers/global/users.ts +++ b/packages/worker/src/api/controllers/global/users.ts @@ -210,6 +210,19 @@ export const inviteMultiple = async (ctx: any) => { ctx.body = await sdk.users.invite(request) } +export const checkInvite = async (ctx: any) => { + const { code } = ctx.params + let invite + try { + invite = await checkInviteCode(code, false) + } catch (e) { + ctx.throw(400, "There was a problem with the invite") + } + ctx.body = { + email: invite.email, + } +} + export const inviteAccept = async (ctx: any) => { const { inviteCode, password, firstName, lastName } = ctx.request.body try { diff --git a/packages/worker/src/api/index.ts b/packages/worker/src/api/index.ts index e37c6c2d94..d8df62f532 100644 --- a/packages/worker/src/api/index.ts +++ b/packages/worker/src/api/index.ts @@ -62,6 +62,10 @@ const PUBLIC_ENDPOINTS = [ route: "/api/system/restored", method: "POST", }, + { + route: "/api/global/users/invite", + method: "GET", + }, ] const NO_TENANCY_ENDPOINTS = [ diff --git a/packages/worker/src/api/routes/global/users.ts b/packages/worker/src/api/routes/global/users.ts index 26cba8e1ab..a73462b235 100644 --- a/packages/worker/src/api/routes/global/users.ts +++ b/packages/worker/src/api/routes/global/users.ts @@ -38,6 +38,13 @@ function buildInviteMultipleValidation() { )) } +function buildInviteLookupValidation() { + // prettier-ignore + return auth.joiValidator.params(Joi.object({ + code: Joi.string().required() + }).unknown(true)) +} + const createUserAdminOnly = (ctx: any, next: any) => { if (!ctx.request.body._id) { return auth.adminOnly(ctx, next) @@ -51,6 +58,8 @@ function buildInviteAcceptValidation() { return auth.joiValidator.body(Joi.object({ inviteCode: Joi.string().required(), password: Joi.string().required(), + firstName: Joi.string().required(), + lastName: Joi.string().optional(), }).required().unknown(true)) } @@ -91,6 +100,11 @@ router ) // non-global endpoints + .get( + "/api/global/users/invite/:code", + buildInviteLookupValidation(), + controller.checkInvite + ) .post( "/api/global/users/invite/accept", buildInviteAcceptValidation(), From 2211becdba365d2c2f8555eb2c79e935e798e149 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Fri, 27 Jan 2023 14:38:31 +0000 Subject: [PATCH 274/387] Fix certain types of popover not working inside modals or side panels (#9424) --- packages/bbui/src/Actions/click_outside.js | 24 +++++++++++++++------- packages/bbui/src/Popover/Popover.svelte | 5 ++++- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/packages/bbui/src/Actions/click_outside.js b/packages/bbui/src/Actions/click_outside.js index 6842b94a32..bdcbaa5d88 100644 --- a/packages/bbui/src/Actions/click_outside.js +++ b/packages/bbui/src/Actions/click_outside.js @@ -1,4 +1,4 @@ -const ignoredClasses = [".flatpickr-calendar"] +const ignoredClasses = [".flatpickr-calendar", ".spectrum-Popover"] let clickHandlers = [] /** @@ -19,7 +19,7 @@ const handleClick = event => { } // Ignore clicks for modals, unless the handler is registered from a modal - const sourceInModal = handler.element.closest(".spectrum-Modal") != null + const sourceInModal = handler.anchor.closest(".spectrum-Modal") != null const clickInModal = event.target.closest(".spectrum-Modal") != null if (clickInModal && !sourceInModal) { return @@ -33,10 +33,10 @@ document.documentElement.addEventListener("click", handleClick, true) /** * Adds or updates a click handler */ -const updateHandler = (id, element, callback) => { +const updateHandler = (id, element, anchor, callback) => { let existingHandler = clickHandlers.find(x => x.id === id) if (!existingHandler) { - clickHandlers.push({ id, element, callback }) + clickHandlers.push({ id, element, anchor, callback }) } else { existingHandler.callback = callback } @@ -51,12 +51,22 @@ const removeHandler = id => { /** * Svelte action to apply a click outside handler for a certain element + * opts.anchor is an optional param specifying the real root source of the + * component being observed. This is required for things like popovers, where + * the element using the clickoutside action is the popover, but the popover is + * rendered at the root of the DOM somewhere, whereas the popover anchor is the + * element we actually want to consider when determining the source component. */ -export default (element, callback) => { +export default (element, opts) => { const id = Math.random() - updateHandler(id, element, callback) + const update = newOpts => { + const callback = newOpts?.callback || newOpts + const anchor = newOpts?.anchor || element + updateHandler(id, element, anchor, callback) + } + update(opts) return { - update: newCallback => updateHandler(id, element, newCallback), + update, destroy: () => removeHandler(id), } } diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte index 7eb77d90fa..5505b2546d 100644 --- a/packages/bbui/src/Popover/Popover.svelte +++ b/packages/bbui/src/Popover/Popover.svelte @@ -68,7 +68,10 @@ @@ -64,6 +64,8 @@ >Add and manage environment variables for development and production + + {#if $licensing.environmentVariablesEnabled} {#if noEncryptionKey} {/if} - +
      + +
      +
-
- -
{:else}
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

Eiqzl|ot6gfeGL3z^UcV}p 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 w)o<%`q6{9?XL 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%0Di2tBS`7|sIy*Bb{DwMVRIG5y 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%0ANlb^Qs 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

4{7HF+y;{Jn_a^NH2<|{YyW8l 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�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 literal 0 HcmV?d00001 diff --git a/packages/frontend-core/assets/bulgaria.png b/packages/frontend-core/assets/bulgaria.png new file mode 100644 index 0000000000000000000000000000000000000000..d4174d9ddd2f0805d9b24ca55258cc8b634164bc GIT binary patch literal 107944 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

24eM) zhG!N`x>G2Gs%R`++LQ^ViEu>1&a>IBb390xBId~(2bVa?S!^C?mK#OTrZFb3yE=h4jsmV4NUP;8??RG-~UI}lRy!m#h`IPR}?@~B1xH+h0F05 zW1Fh^gx(w7y&PRoJw~#i091`yZ;u)6^_v$p2Myca1*740@)Cy))e`J58RppW?LTz& z^0t-D+djYUV)z@X4x=`@($__I`qcjh?$Yj1yuK(hlF)|=FYa{Ed(W&O&W46~LU%st V-TAjB%+mf{5G^CkYISJD{{tobK6d~B literal 0 HcmV?d00001 From e0ba99621c5592a14157eca968c9b2f46b506e67 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 31 Jan 2023 15:48:35 +0000 Subject: [PATCH 333/387] Update background of split page to use purplish gradient, and also fix it to dark theme --- .../src/components/SplitPage.svelte | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/frontend-core/src/components/SplitPage.svelte b/packages/frontend-core/src/components/SplitPage.svelte index c05da94311..08ec519715 100644 --- a/packages/frontend-core/src/components/SplitPage.svelte +++ b/packages/frontend-core/src/components/SplitPage.svelte @@ -1,10 +1,15 @@ + +

-
+
+ background
@@ -25,11 +30,14 @@ overflow-y: auto; } .right { - background: linear-gradient( - to bottom right, - var(--spectrum-global-color-gray-300) 0%, - var(--background) 100% - ); + position: relative; + } + .right img { + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; } .content { width: 100%; From ca399568e2df1d189c1e4196ea09ac2370dbdc40 Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 31 Jan 2023 15:49:41 +0000 Subject: [PATCH 334/387] Use real testimonials on testimonial page --- .../src/components/TestimonialPage.svelte | 60 ++++++++++++------- 1 file changed, 38 insertions(+), 22 deletions(-) diff --git a/packages/frontend-core/src/components/TestimonialPage.svelte b/packages/frontend-core/src/components/TestimonialPage.svelte index f2f74731d0..25ed4ac08d 100644 --- a/packages/frontend-core/src/components/TestimonialPage.svelte +++ b/packages/frontend-core/src/components/TestimonialPage.svelte @@ -1,6 +1,34 @@ @@ -8,19 +36,17 @@
+ a-happy-budibase-user
- "Here is an example of how Budibase changed my life for the better and - now all I do is eat, sleep, build apps, repeat." + "{testimonial.text}"
-
- a-happy-budibase-user -
-
No-code Enthusiast
-
Bedroom TLD
-
+
+
{testimonial.name}
+
{testimonial.role}
@@ -35,23 +61,13 @@ place-items: center; } .testimonial { - width: 280px; + width: 380px; padding: 40px; } .text { font-size: var(--font-size-l); font-style: italic; } - img { - width: 40px; - } - .user { - display: flex; - flex-direction: row; - justify-content: flex-start; - align-items: center; - gap: var(--spacing-s); - } .name { font-weight: bold; color: var(--spectrum-global-color-gray-900); From 6bd5d9e80b3737930cb91f2cf4cc07608e20afd7 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 31 Jan 2023 15:49:55 +0000 Subject: [PATCH 335/387] Update pro version to 2.2.12-alpha.49 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index e0a44c74d0..3f357a2e26 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.49", "@budibase/client": "2.2.12-alpha.49", - "@budibase/pro": "2.2.12-alpha.48", + "@budibase/pro": "2.2.12-alpha.49", "@budibase/string-templates": "2.2.12-alpha.49", "@budibase/types": "2.2.12-alpha.49", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 44cb55b072..f218c89ca4 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.48": - version "2.2.12-alpha.48" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.48.tgz#d211474e8ba57f2aa8d9c7b263cfbe96f7051ab9" - integrity sha512-7UuMHuV7jcaq5Y9fz7PM+YgT5bexuhm2UOoTivAtKOJwUR5Au7lGunVAZqLB5BPp55B9ncD/mQ5fev16vrep0Q== +"@budibase/backend-core@2.2.12-alpha.49": + version "2.2.12-alpha.49" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.49.tgz#898f8465cb834c87123d2451f1b43cdeef8c080d" + integrity sha512-TyEiCrU5zmsLLcd6OejHYNp9fYMw0MdbstCWnek2GTuBKTrnifir33EYgCMh5+z7GQ63V28XHpmY9DKMnhC7MQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.48" + "@budibase/types" "2.2.12-alpha.49" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.48": - version "2.2.12-alpha.48" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.48.tgz#639431a654dbe55c316a94e4220adae76e5f7540" - integrity sha512-QMilBTDN/y5ieTnIjSlovhbmBLfTQV11B3YapJcdtpWKALyGpuZ7eYBY2DIjZtxTx5BE1Ib+BAJZmBxyXlkcHg== +"@budibase/pro@2.2.12-alpha.49": + version "2.2.12-alpha.49" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.49.tgz#2b79207a19ac3364dfadaec7cf546fb0f92f0881" + integrity sha512-0m0ZcS65N2D8YBRbrSH7ajapMSNIJnqGM+tkbAg8LtNwrApt6p1S1KbCEuCSDxxy+tr6MXV+2hDLLaSa3ukgQg== dependencies: - "@budibase/backend-core" "2.2.12-alpha.48" - "@budibase/types" "2.2.12-alpha.48" + "@budibase/backend-core" "2.2.12-alpha.49" + "@budibase/types" "2.2.12-alpha.49" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1406,10 +1406,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.48": - version "2.2.12-alpha.48" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.48.tgz#5036062395c0290e6d7d83c2438945a4fbe33432" - integrity sha512-DrGGGaJL7QIwM5W40jXFWHdVU7g3mTqqhqSmciglitaapngYnkVAztkS2itjimStB/6WuxE+V2dRKAJgkvKeGw== +"@budibase/types@2.2.12-alpha.49": + version "2.2.12-alpha.49" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.49.tgz#c873c3ced54d06e4bc40959a9f8112c73326175e" + integrity sha512-wiU0KtyVQ9HJiSUSdEsidq62GEf0Yn13DqXBFtB2VLKcwrcpmyQdDb3hLzFvGCmlfy2h8qkjUFVBEImlwlB9+Q== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 8c4b112fa1..2957ebc743 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.49", - "@budibase/pro": "2.2.12-alpha.48", + "@budibase/pro": "2.2.12-alpha.49", "@budibase/string-templates": "2.2.12-alpha.49", "@budibase/types": "2.2.12-alpha.49", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index f3c081acfb..0b928943dc 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.48": - version "2.2.12-alpha.48" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.48.tgz#d211474e8ba57f2aa8d9c7b263cfbe96f7051ab9" - integrity sha512-7UuMHuV7jcaq5Y9fz7PM+YgT5bexuhm2UOoTivAtKOJwUR5Au7lGunVAZqLB5BPp55B9ncD/mQ5fev16vrep0Q== +"@budibase/backend-core@2.2.12-alpha.49": + version "2.2.12-alpha.49" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.49.tgz#898f8465cb834c87123d2451f1b43cdeef8c080d" + integrity sha512-TyEiCrU5zmsLLcd6OejHYNp9fYMw0MdbstCWnek2GTuBKTrnifir33EYgCMh5+z7GQ63V28XHpmY9DKMnhC7MQ== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.48" + "@budibase/types" "2.2.12-alpha.49" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,13 +521,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.48": - version "2.2.12-alpha.48" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.48.tgz#639431a654dbe55c316a94e4220adae76e5f7540" - integrity sha512-QMilBTDN/y5ieTnIjSlovhbmBLfTQV11B3YapJcdtpWKALyGpuZ7eYBY2DIjZtxTx5BE1Ib+BAJZmBxyXlkcHg== +"@budibase/pro@2.2.12-alpha.49": + version "2.2.12-alpha.49" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.49.tgz#2b79207a19ac3364dfadaec7cf546fb0f92f0881" + integrity sha512-0m0ZcS65N2D8YBRbrSH7ajapMSNIJnqGM+tkbAg8LtNwrApt6p1S1KbCEuCSDxxy+tr6MXV+2hDLLaSa3ukgQg== dependencies: - "@budibase/backend-core" "2.2.12-alpha.48" - "@budibase/types" "2.2.12-alpha.48" + "@budibase/backend-core" "2.2.12-alpha.49" + "@budibase/types" "2.2.12-alpha.49" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -535,10 +535,10 @@ lru-cache "^7.14.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.48": - version "2.2.12-alpha.48" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.48.tgz#5036062395c0290e6d7d83c2438945a4fbe33432" - integrity sha512-DrGGGaJL7QIwM5W40jXFWHdVU7g3mTqqhqSmciglitaapngYnkVAztkS2itjimStB/6WuxE+V2dRKAJgkvKeGw== +"@budibase/types@2.2.12-alpha.49": + version "2.2.12-alpha.49" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.49.tgz#c873c3ced54d06e4bc40959a9f8112c73326175e" + integrity sha512-wiU0KtyVQ9HJiSUSdEsidq62GEf0Yn13DqXBFtB2VLKcwrcpmyQdDb3hLzFvGCmlfy2h8qkjUFVBEImlwlB9+Q== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 06f87c3a825e34f9674eb673a81b7273602c2acd Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Tue, 31 Jan 2023 15:54:06 +0000 Subject: [PATCH 336/387] Enable rollup to bundle PNG images due to new assets in frontend-core --- packages/client/package.json | 1 + packages/client/rollup.config.js | 2 ++ packages/client/yarn.lock | 34 +++++++++++++++++++++++++++++++- 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/packages/client/package.json b/packages/client/package.json index 2f28c4e699..6c176f211a 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -48,6 +48,7 @@ "devDependencies": { "@rollup/plugin-alias": "^3.1.5", "@rollup/plugin-commonjs": "^18.0.0", + "@rollup/plugin-image": "^3.0.2", "@rollup/plugin-node-resolve": "^11.2.1", "postcss": "^8.2.10", "rollup": "^2.44.0", diff --git a/packages/client/rollup.config.js b/packages/client/rollup.config.js index be94ace90c..a69de38799 100644 --- a/packages/client/rollup.config.js +++ b/packages/client/rollup.config.js @@ -5,6 +5,7 @@ import svelte from "rollup-plugin-svelte" import { terser } from "rollup-plugin-terser" import postcss from "rollup-plugin-postcss" import svg from "rollup-plugin-svg" +import image from "@rollup/plugin-image" import json from "rollup-plugin-json" import nodePolyfills from "rollup-plugin-polyfill-node" import path from "path" @@ -87,6 +88,7 @@ export default { dedupe: ["svelte", "svelte/internal"], }), svg(), + image(), json(), production && terser(), !production && visualizer(), diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock index 68d29299a8..e7140f7af3 100644 --- a/packages/client/yarn.lock +++ b/packages/client/yarn.lock @@ -83,6 +83,14 @@ magic-string "^0.25.7" resolve "^1.17.0" +"@rollup/plugin-image@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-image/-/plugin-image-3.0.2.tgz#8a66389510517495c5d10d392140cdefa43b27c2" + integrity sha512-eGVrD6lummWH5ENo9LWX3JY62uBb9okUNQ2htXkugrG6WjACrMUVhWvss+0wW3fwJWmFYpoEny3yL4spEdh15g== + dependencies: + "@rollup/pluginutils" "^5.0.1" + mini-svg-data-uri "^1.4.4" + "@rollup/plugin-inject@^4.0.0": version "4.0.4" resolved "https://registry.yarnpkg.com/@rollup/plugin-inject/-/plugin-inject-4.0.4.tgz#fbeee66e9a700782c4f65c8b0edbafe58678fbc2" @@ -113,6 +121,15 @@ estree-walker "^1.0.1" picomatch "^2.2.2" +"@rollup/pluginutils@^5.0.1": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33" + integrity sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA== + dependencies: + "@types/estree" "^1.0.0" + estree-walker "^2.0.2" + picomatch "^2.3.1" + "@socket.io/component-emitter@~3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" @@ -182,6 +199,11 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== +"@types/estree@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" + integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== + "@types/node@*": version "16.11.7" resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz#36820945061326978c42a01e56b61cd223dfdc42" @@ -599,7 +621,7 @@ estree-walker@^1.0.1: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== -estree-walker@^2.0.1: +estree-walker@^2.0.1, estree-walker@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== @@ -845,6 +867,11 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== +mini-svg-data-uri@^1.4.4: + version "1.4.4" + resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939" + integrity sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg== + minimatch@^3.0.2, minimatch@^3.0.4: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -955,6 +982,11 @@ picomatch@^2.2.2: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== +picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + pify@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f" From b2813db5db41f99b61f166a5c32bd05eaf13bd77 Mon Sep 17 00:00:00 2001 From: adrinr Date: Tue, 31 Jan 2023 16:15:11 +0000 Subject: [PATCH 337/387] Handle db creation race conditions --- hosting/docker-compose.test.yaml | 13 ------------- packages/backend-core/src/db/couch/DatabaseImpl.ts | 9 ++++++++- packages/server/src/app.ts | 7 +------ 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/hosting/docker-compose.test.yaml b/hosting/docker-compose.test.yaml index f11d32fc3b..dfd78621c5 100644 --- a/hosting/docker-compose.test.yaml +++ b/hosting/docker-compose.test.yaml @@ -37,19 +37,6 @@ services: timeout: 20s retries: 3 - couch-init: - image: curlimages/curl - environment: - PUT_CALL: "curl -u ${COUCH_DB_USER}:${COUCH_DB_PASSWORD} -X PUT couchdb-service:5984" - depends_on: - - couchdb-service - command: - [ - "sh", - "-c", - "sleep 10 && $${PUT_CALL}/_users && $${PUT_CALL}/_replicator; fg;", - ] - redis-service: restart: on-failure image: redis diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts index 4919d8db4a..de45c14033 100644 --- a/packages/backend-core/src/db/couch/DatabaseImpl.ts +++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts @@ -58,7 +58,14 @@ export class DatabaseImpl implements Database { throw new Error("DB does not exist") } if (!exists) { - await DatabaseImpl.nano.db.create(this.name) + try { + await DatabaseImpl.nano.db.create(this.name) + } catch (err: any) { + // Handling race conditions + if (err.statusCode !== 412) { + throw err + } + } } return DatabaseImpl.nano.db.use(this.name) } diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts index f550932dbc..177393dee7 100644 --- a/packages/server/src/app.ts +++ b/packages/server/src/app.ts @@ -22,7 +22,6 @@ import * as redis from "./utilities/redis" import { events, logging, middleware } from "@budibase/backend-core" import { initialise as initialiseWebsockets } from "./websocket" import { startup } from "./startup" -import { retry } from "./utilities/retry" const Sentry = require("@sentry/node") const destroyable = require("server-destroy") @@ -81,11 +80,7 @@ server.on("close", async () => { }) export default server.listen(env.PORT || 0, async () => { - if (!env.isTest()) { - await startup(app, server) - } else { - await retry(async () => await startup(app, server)) - } + await startup(app, server) }) const shutdown = () => { From cbd3f2712f1ff282789e1482e492dc8ed9e4af71 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 31 Jan 2023 16:26:17 +0000 Subject: [PATCH 338/387] v2.2.12-alpha.50 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 0ffc7a583c..0360b2e821 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.49", + "version": "2.2.12-alpha.50", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f086da6165..81898f6d0b 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.49", + "version": "2.2.12-alpha.50", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.49", + "@budibase/types": "2.2.12-alpha.50", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 8157a3c3b0..18092ae2a5 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.49", + "version": "2.2.12-alpha.50", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.49", + "@budibase/string-templates": "2.2.12-alpha.50", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 5f3aabdba4..27ee30f56d 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.49", + "version": "2.2.12-alpha.50", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.49", - "@budibase/client": "2.2.12-alpha.49", - "@budibase/frontend-core": "2.2.12-alpha.49", - "@budibase/string-templates": "2.2.12-alpha.49", + "@budibase/bbui": "2.2.12-alpha.50", + "@budibase/client": "2.2.12-alpha.50", + "@budibase/frontend-core": "2.2.12-alpha.50", + "@budibase/string-templates": "2.2.12-alpha.50", "@sentry/browser": "5.19.1", "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 6e82f3e3f2..19fb9e4df8 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.49", + "version": "2.2.12-alpha.50", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.49", - "@budibase/string-templates": "2.2.12-alpha.49", - "@budibase/types": "2.2.12-alpha.49", + "@budibase/backend-core": "2.2.12-alpha.50", + "@budibase/string-templates": "2.2.12-alpha.50", + "@budibase/types": "2.2.12-alpha.50", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 6c176f211a..79016b204e 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.49", + "version": "2.2.12-alpha.50", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.49", - "@budibase/frontend-core": "2.2.12-alpha.49", - "@budibase/string-templates": "2.2.12-alpha.49", + "@budibase/bbui": "2.2.12-alpha.50", + "@budibase/frontend-core": "2.2.12-alpha.50", + "@budibase/string-templates": "2.2.12-alpha.50", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 31a391ecaf..3821337599 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.49", + "version": "2.2.12-alpha.50", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.49", + "@budibase/bbui": "2.2.12-alpha.50", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 470ec65c3b..5b91148966 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.49", + "version": "2.2.12-alpha.50", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 3f357a2e26..f6527669a5 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.49", + "version": "2.2.12-alpha.50", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.49", - "@budibase/client": "2.2.12-alpha.49", + "@budibase/backend-core": "2.2.12-alpha.50", + "@budibase/client": "2.2.12-alpha.50", "@budibase/pro": "2.2.12-alpha.49", - "@budibase/string-templates": "2.2.12-alpha.49", - "@budibase/types": "2.2.12-alpha.49", + "@budibase/string-templates": "2.2.12-alpha.50", + "@budibase/types": "2.2.12-alpha.50", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 87c9b9b392..21ca20ad27 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.49", + "version": "2.2.12-alpha.50", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index da65a48b95..d7b648264e 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.49", + "version": "2.2.12-alpha.50", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 2957ebc743..086813b26a 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.49", + "version": "2.2.12-alpha.50", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.49", + "@budibase/backend-core": "2.2.12-alpha.50", "@budibase/pro": "2.2.12-alpha.49", - "@budibase/string-templates": "2.2.12-alpha.49", - "@budibase/types": "2.2.12-alpha.49", + "@budibase/string-templates": "2.2.12-alpha.50", + "@budibase/types": "2.2.12-alpha.50", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 07794efa2601da0acc5482b174a73e1ece141923 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 31 Jan 2023 16:30:18 +0000 Subject: [PATCH 339/387] Update pro version to 2.2.12-alpha.50 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index f6527669a5..94b5f563cf 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.50", "@budibase/client": "2.2.12-alpha.50", - "@budibase/pro": "2.2.12-alpha.49", + "@budibase/pro": "2.2.12-alpha.50", "@budibase/string-templates": "2.2.12-alpha.50", "@budibase/types": "2.2.12-alpha.50", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index f218c89ca4..bdf6187969 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.49": - version "2.2.12-alpha.49" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.49.tgz#898f8465cb834c87123d2451f1b43cdeef8c080d" - integrity sha512-TyEiCrU5zmsLLcd6OejHYNp9fYMw0MdbstCWnek2GTuBKTrnifir33EYgCMh5+z7GQ63V28XHpmY9DKMnhC7MQ== +"@budibase/backend-core@2.2.12-alpha.50": + version "2.2.12-alpha.50" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.50.tgz#39f228904cf39de2dbb51900df4494267ac72381" + integrity sha512-ysVJ6Eul7o+LZRoilFr7bk1/gkoxSqM30yBbRhKxIhH2IOk0qd9LAaNQiTnwn4ZzU+tJWSkyAsJAQdTnX8/i9g== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.49" + "@budibase/types" "2.2.12-alpha.50" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.49": - version "2.2.12-alpha.49" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.49.tgz#2b79207a19ac3364dfadaec7cf546fb0f92f0881" - integrity sha512-0m0ZcS65N2D8YBRbrSH7ajapMSNIJnqGM+tkbAg8LtNwrApt6p1S1KbCEuCSDxxy+tr6MXV+2hDLLaSa3ukgQg== +"@budibase/pro@2.2.12-alpha.50": + version "2.2.12-alpha.50" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.50.tgz#599edc75363b323f613a0d56e5173150582b13bb" + integrity sha512-eeKY9P4Zi81AlU6vYWVcffMwkyUrNv6PcNjdKZZNBuIgNfOVejy9vmpIukx43LpHUOsk6FKxHFNVDN1txnYRkg== dependencies: - "@budibase/backend-core" "2.2.12-alpha.49" - "@budibase/types" "2.2.12-alpha.49" + "@budibase/backend-core" "2.2.12-alpha.50" + "@budibase/types" "2.2.12-alpha.50" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1406,10 +1406,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.49": - version "2.2.12-alpha.49" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.49.tgz#c873c3ced54d06e4bc40959a9f8112c73326175e" - integrity sha512-wiU0KtyVQ9HJiSUSdEsidq62GEf0Yn13DqXBFtB2VLKcwrcpmyQdDb3hLzFvGCmlfy2h8qkjUFVBEImlwlB9+Q== +"@budibase/types@2.2.12-alpha.50": + version "2.2.12-alpha.50" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.50.tgz#ef07d4593c1ea0da6a6b75004d1319d7621cd910" + integrity sha512-LU+G7gQffBvnLvWfzpxUNcrCZFP/ZNQqAjB2KJxgq9pfeynU3MWAwut1tjKpp8eduuu7GnfBT1uvet9jM87FKA== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index 086813b26a..cb98ce525b 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.50", - "@budibase/pro": "2.2.12-alpha.49", + "@budibase/pro": "2.2.12-alpha.50", "@budibase/string-templates": "2.2.12-alpha.50", "@budibase/types": "2.2.12-alpha.50", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 0b928943dc..d0a31fc49f 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.49": - version "2.2.12-alpha.49" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.49.tgz#898f8465cb834c87123d2451f1b43cdeef8c080d" - integrity sha512-TyEiCrU5zmsLLcd6OejHYNp9fYMw0MdbstCWnek2GTuBKTrnifir33EYgCMh5+z7GQ63V28XHpmY9DKMnhC7MQ== +"@budibase/backend-core@2.2.12-alpha.50": + version "2.2.12-alpha.50" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.50.tgz#39f228904cf39de2dbb51900df4494267ac72381" + integrity sha512-ysVJ6Eul7o+LZRoilFr7bk1/gkoxSqM30yBbRhKxIhH2IOk0qd9LAaNQiTnwn4ZzU+tJWSkyAsJAQdTnX8/i9g== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.49" + "@budibase/types" "2.2.12-alpha.50" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,13 +521,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.49": - version "2.2.12-alpha.49" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.49.tgz#2b79207a19ac3364dfadaec7cf546fb0f92f0881" - integrity sha512-0m0ZcS65N2D8YBRbrSH7ajapMSNIJnqGM+tkbAg8LtNwrApt6p1S1KbCEuCSDxxy+tr6MXV+2hDLLaSa3ukgQg== +"@budibase/pro@2.2.12-alpha.50": + version "2.2.12-alpha.50" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.50.tgz#599edc75363b323f613a0d56e5173150582b13bb" + integrity sha512-eeKY9P4Zi81AlU6vYWVcffMwkyUrNv6PcNjdKZZNBuIgNfOVejy9vmpIukx43LpHUOsk6FKxHFNVDN1txnYRkg== dependencies: - "@budibase/backend-core" "2.2.12-alpha.49" - "@budibase/types" "2.2.12-alpha.49" + "@budibase/backend-core" "2.2.12-alpha.50" + "@budibase/types" "2.2.12-alpha.50" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -535,10 +535,10 @@ lru-cache "^7.14.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.49": - version "2.2.12-alpha.49" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.49.tgz#c873c3ced54d06e4bc40959a9f8112c73326175e" - integrity sha512-wiU0KtyVQ9HJiSUSdEsidq62GEf0Yn13DqXBFtB2VLKcwrcpmyQdDb3hLzFvGCmlfy2h8qkjUFVBEImlwlB9+Q== +"@budibase/types@2.2.12-alpha.50": + version "2.2.12-alpha.50" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.50.tgz#ef07d4593c1ea0da6a6b75004d1319d7621cd910" + integrity sha512-LU+G7gQffBvnLvWfzpxUNcrCZFP/ZNQqAjB2KJxgq9pfeynU3MWAwut1tjKpp8eduuu7GnfBT1uvet9jM87FKA== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From bf5da62f75c510d26e1f6df09b7daa31f45ebaf8 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Tue, 31 Jan 2023 16:48:27 +0000 Subject: [PATCH 340/387] Removing Cypress We no longer need Cypress. I am removing the Cypress directory. Also updated package.json to remove the cypress related lines --- package.json | 6 +- packages/builder/cypress.json | 15 - packages/builder/cypress/fixtures/apikey.json | 3 - .../builder/cypress/fixtures/example.json | 5 - .../builder/cypress/fixtures/exported-app.txt | 3 - .../builder/cypress/fixtures/profile.json | 5 - packages/builder/cypress/fixtures/users.json | 232 ----- .../addMultiOptionDatatype.spec.js | 45 - .../integration/addRadioButtons.spec.js | 43 - .../adminAndManagement/accountPortals.spec.js | 116 --- .../adminAndManagement/authentication.spec.js | 178 ---- .../adminAndManagement/userManagement.spec.js | 238 ----- .../adminAndManagement/userSettings.spec.js | 114 --- .../cypress/integration/appOverview.spec.js | 442 -------- .../integration/appPublishWorkflow.spec.js | 108 -- .../cypress/integration/autoScreensUI.spec.js | 101 -- .../cypress/integration/createApp.spec.js | 235 ----- .../integration/createAutomation.spec.js | 64 -- .../cypress/integration/createBinding.spec.js | 66 -- .../integration/createComponents.spec.js | 275 ----- .../cypress/integration/createScreen.spec.js | 54 - .../cypress/integration/createTable.spec.js | 112 --- .../cypress/integration/createView.spec.js | 161 --- .../customThemingProperties.spec.js | 86 -- .../datasources/datasourceWizard.spec.js | 42 - .../integration/datasources/mySql.spec.js | 229 ----- .../integration/datasources/oracle.spec.js | 229 ----- .../datasources/postgreSql.spec.js | 283 ------ .../integration/datasources/rest.spec.js | 45 - .../queryLevelTransformers.spec.js | 147 --- .../integration/renameAnApplication.spec.js | 112 --- .../cypress/integration/revertApp.spec.js | 75 -- packages/builder/cypress/plugins/index.js | 23 - packages/builder/cypress/setup.js | 45 - packages/builder/cypress/support/commands.js | 945 ------------------ packages/builder/cypress/support/cookies.js | 3 - .../builder/cypress/support/filterTests.js | 16 - packages/builder/cypress/support/index.js | 22 - packages/builder/cypress/support/interact.js | 136 --- .../support/queryLevelTransformerFunction.js | 14 - .../queryLevelTransformerFunctionWithData.js | 31 - packages/builder/cypress/ts/setup.ts | 4 - 42 files changed, 1 insertion(+), 5107 deletions(-) delete mode 100644 packages/builder/cypress.json delete mode 100644 packages/builder/cypress/fixtures/apikey.json delete mode 100644 packages/builder/cypress/fixtures/example.json delete mode 100644 packages/builder/cypress/fixtures/exported-app.txt delete mode 100644 packages/builder/cypress/fixtures/profile.json delete mode 100644 packages/builder/cypress/fixtures/users.json delete mode 100644 packages/builder/cypress/integration/addMultiOptionDatatype.spec.js delete mode 100644 packages/builder/cypress/integration/addRadioButtons.spec.js delete mode 100644 packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js delete mode 100644 packages/builder/cypress/integration/adminAndManagement/authentication.spec.js delete mode 100644 packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js delete mode 100644 packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js delete mode 100644 packages/builder/cypress/integration/appOverview.spec.js delete mode 100644 packages/builder/cypress/integration/appPublishWorkflow.spec.js delete mode 100644 packages/builder/cypress/integration/autoScreensUI.spec.js delete mode 100644 packages/builder/cypress/integration/createApp.spec.js delete mode 100644 packages/builder/cypress/integration/createAutomation.spec.js delete mode 100644 packages/builder/cypress/integration/createBinding.spec.js delete mode 100644 packages/builder/cypress/integration/createComponents.spec.js delete mode 100644 packages/builder/cypress/integration/createScreen.spec.js delete mode 100644 packages/builder/cypress/integration/createTable.spec.js delete mode 100644 packages/builder/cypress/integration/createView.spec.js delete mode 100644 packages/builder/cypress/integration/customThemingProperties.spec.js delete mode 100644 packages/builder/cypress/integration/datasources/datasourceWizard.spec.js delete mode 100644 packages/builder/cypress/integration/datasources/mySql.spec.js delete mode 100644 packages/builder/cypress/integration/datasources/oracle.spec.js delete mode 100644 packages/builder/cypress/integration/datasources/postgreSql.spec.js delete mode 100644 packages/builder/cypress/integration/datasources/rest.spec.js delete mode 100644 packages/builder/cypress/integration/queryLevelTransformers.spec.js delete mode 100644 packages/builder/cypress/integration/renameAnApplication.spec.js delete mode 100644 packages/builder/cypress/integration/revertApp.spec.js delete mode 100644 packages/builder/cypress/plugins/index.js delete mode 100644 packages/builder/cypress/setup.js delete mode 100644 packages/builder/cypress/support/commands.js delete mode 100644 packages/builder/cypress/support/cookies.js delete mode 100644 packages/builder/cypress/support/filterTests.js delete mode 100644 packages/builder/cypress/support/index.js delete mode 100644 packages/builder/cypress/support/interact.js delete mode 100644 packages/builder/cypress/support/queryLevelTransformerFunction.js delete mode 100644 packages/builder/cypress/support/queryLevelTransformerFunctionWithData.js delete mode 100644 packages/builder/cypress/ts/setup.ts diff --git a/package.json b/package.json index 7da8db506d..6290930269 100644 --- a/package.json +++ b/package.json @@ -51,10 +51,6 @@ "lint:fix:eslint": "eslint --fix packages qa-core", "lint:fix:prettier": "prettier --write \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\" && prettier --write \"qa-core/**/*.{js,ts,svelte}\"", "lint:fix": "yarn run lint:fix:prettier && yarn run lint:fix:eslint", - "test:e2e": "lerna run cy:test --stream", - "test:e2e:ci": "lerna run cy:ci --stream", - "test:e2e:ci:record": "lerna run cy:ci:record --stream", - "test:e2e:ci:notify": "lerna run cy:ci:notify", "build:specs": "lerna run specs", "build:docker": "lerna run build:docker && npm run build:docker:proxy && cd hosting/scripts/linux/ && ./release-to-docker-hub.sh $BUDIBASE_RELEASE_VERSION && cd -", "build:docker:pre": "lerna run build && lerna run predocker", @@ -84,4 +80,4 @@ "install:pro": "bash scripts/pro/install.sh", "dep:clean": "yarn clean && yarn bootstrap" } -} +} \ No newline at end of file diff --git a/packages/builder/cypress.json b/packages/builder/cypress.json deleted file mode 100644 index b779794543..0000000000 --- a/packages/builder/cypress.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "baseUrl": "http://localhost:4100", - "video": true, - "projectId": "bmbemn", - "reporter": "cypress-multi-reporters", - "reporterOptions": { - "configFile": "reporterConfig.json" - }, - "env": { - "PORT": "4100", - "WORKER_PORT": "4200", - "JWT_SECRET": "test", - "HOST_IP": "" - } -} \ No newline at end of file diff --git a/packages/builder/cypress/fixtures/apikey.json b/packages/builder/cypress/fixtures/apikey.json deleted file mode 100644 index 1def14ed6c..0000000000 --- a/packages/builder/cypress/fixtures/apikey.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "budibase": "CB373643-3FC4-4902-9E31-449C0ED066B6" -} \ No newline at end of file diff --git a/packages/builder/cypress/fixtures/example.json b/packages/builder/cypress/fixtures/example.json deleted file mode 100644 index da18d9352a..0000000000 --- a/packages/builder/cypress/fixtures/example.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "Using fixtures to represent data", - "email": "hello@cypress.io", - "body": "Fixtures are a great way to mock data for responses to routes" -} \ No newline at end of file diff --git a/packages/builder/cypress/fixtures/exported-app.txt b/packages/builder/cypress/fixtures/exported-app.txt deleted file mode 100644 index 28aeaf958a..0000000000 --- a/packages/builder/cypress/fixtures/exported-app.txt +++ /dev/null @@ -1,3 +0,0 @@ -{"version":"1.2.9","db_type":"http","start_time":"2022-05-12T13:47:50.453Z","db_info":{"db_name":"app_dev_7cae7fa4db8745da848f91430a8211bf","purge_seq":"0-g1AAAABXeJzLYWBgYMpgTmEQTM4vTc5ISXIwNDLXMwBCwxyQVB4LkGRoAFL_gSArkQGP2kSGpHqIoiwAtOgYRA","update_seq":"11-g1AAAACbeJzLYWBgYMpgTmEQTM4vTc5ISXIwNDLXMwBCwxyQVB4LkGRoAFL_gSArgzmRPRcowJ5klmZgaZmKTR8e0xIZkuqhxrBAjEk0NzcwMsSmIQsA89QoWg","sizes":{"file":94626,"external":5665,"active":7627},"props":{},"doc_del_count":0,"doc_count":7,"disk_format_version":8,"compact_running":false,"cluster":{"q":2,"n":1,"w":1,"r":1},"instance_start_time":"0","host":"http://localhost:4005/app_dev_7cae7fa4db8745da848f91430a8211bf/","auto_compaction":false,"adapter":"http"}} -{"docs":[{"_id":"_design/database","_rev":"4-ad6d41ef604ab34da380438c1be89521","views":{"by_link":{"map":"function (doc) {\n // everything in this must remain constant as its going to Pouch, no external variables\n if (doc.type === \"link\") {\n let doc1 = doc.doc1;\n let doc2 = doc.doc2;\n // eslint-disable-next-line no-undef\n emit([doc1.tableId, doc1.rowId], {\n id: doc2.rowId,\n thisId: doc1.rowId,\n fieldName: doc1.fieldName,\n });\n // if linking to same table can't emit twice\n if (doc1.tableId !== doc2.tableId) {\n // eslint-disable-next-line no-undef\n emit([doc2.tableId, doc2.rowId], {\n id: doc1.rowId,\n thisId: doc2.rowId,\n fieldName: doc2.fieldName,\n });\n }\n }\n }"},"screen_routes":{"map":"function(doc) {\n if (doc._id.startsWith(\"screen_\")) {\n emit(doc._id, {\n id: doc._id,\n routing: doc.routing,\n })\n }\n }"}},"indexes":{"rows":{"index":"function (doc) {\n function idx(input, prev) {\n for (let key of Object.keys(input)) {\n let idxKey = prev != null ? `${prev}.${key}` : key;\n idxKey = idxKey.replace(/ /g, \"_\");\n if (Array.isArray(input[key])) {\n for (let val of input[key]) {\n if (typeof val !== \"object\") {\n // eslint-disable-next-line no-undef\n index(idxKey, val, { store: true });\n }\n }\n }\n else if (key === \"_id\" || key === \"_rev\" || input[key] == null) {\n continue;\n }\n if (typeof input[key] === \"string\") {\n // eslint-disable-next-line no-undef\n index(idxKey, input[key].toLowerCase(), { store: true });\n }\n else if (typeof input[key] !== \"object\") {\n // eslint-disable-next-line no-undef\n index(idxKey, input[key], { store: true });\n }\n else {\n idx(input[key], idxKey);\n }\n }\n }\n if (doc._id.startsWith(\"ro_\")) {\n // eslint-disable-next-line no-undef\n index(\"default\", doc._id);\n idx(doc);\n }\n }","analyzer":"keyword"}},"_revisions":{"start":4,"ids":["ad6d41ef604ab34da380438c1be89521","cb47f4fd824d5e096ac8b76117e6f93d","68a9a1d1b01b327676ecbaa4b1e5b8a7","0b24e44a44af45e51e562fd124ce3007"]}},{"_id":"app_metadata","_rev":"2-a4fe55378bfec0fc71e58a1364ac9965","appId":"app_dev_7cae7fa4db8745da848f91430a8211bf","type":"app","version":"1.0.155-alpha.0","componentLibraries":["@budibase/standard-components"],"name":"My app","url":"/my-app","instance":{"_id":"app_dev_7cae7fa4db8745da848f91430a8211bf"},"tenantId":"default","updatedAt":"2022-05-12T13:47:28.756Z","createdAt":"2022-05-12T13:47:26.825Z","status":"development","_revisions":{"start":2,"ids":["a4fe55378bfec0fc71e58a1364ac9965","f0d06bdb6e6ae4781eb5c4aa224002ff"]}},{"_id":"layout_private_master","_rev":"1-c02411b58d697e38763889a375d52159","componentLibraries":["@budibase/standard-components"],"title":"My app","favicon":"./_shared/favicon.png","stylesheets":[],"name":"Navigation Layout","props":{"_id":"4f569166-a4f3-47ea-a09e-6d218c75586f","_instanceName":"Navigation Layout","_component":"@budibase/standard-components/layout","_children":[{"_id":"7fcf11e4-6f5b-4085-8e0d-9f3d44c98967","_component":"@budibase/standard-components/screenslot","_instanceName":"Screen slot","_styles":{"normal":{"flex":"1 1 auto","display":"flex","flex-direction":"column","justify-content":"flex-start","align-items":"stretch"},"hover":{},"active":{},"selected":{}},"_children":[]}],"_styles":{"active":{},"hover":{},"normal":{},"selected":{}},"title":"My app","navigation":"Top","width":"Large","links":[{"text":"Home","url":"/"}]}},{"_id":"layout_public_master","_rev":"1-d6bce47046d4d0de4f19a6ff95064109","componentLibraries":["@budibase/standard-components"],"title":"My app","favicon":"./_shared/favicon.png","stylesheets":[],"name":"Empty Layout","props":{"_id":"3723ffa1-f9e0-4c05-8013-98195c788ed6","_instanceName":"Empty Layout","_component":"@budibase/standard-components/layout","_children":[{"_id":"7fcf11e4-6f5b-4085-8e0d-9f3d44c98967","_component":"@budibase/standard-components/screenslot","_instanceName":"Screen slot","_styles":{"normal":{"flex":"1 1 auto","display":"flex","flex-direction":"column","justify-content":"flex-start","align-items":"stretch"},"hover":{},"active":{},"selected":{}},"_children":[]}],"_styles":{"active":{},"hover":{},"normal":{},"selected":{}},"navigation":"None","width":"Large","links":[{"text":"Home","url":"/"}]}},{"_id":"screen_b19c454fa5ae41ab874a8860623ab37c","_rev":"1-02dddd460ad14de50dc885aa362452c6","layoutId":"layout_private_master","props":{"_id":"c87457efbc05a43f39064d9dacc9d4b67","_component":"@budibase/standard-components/container","_styles":{"normal":{},"hover":{},"active":{},"selected":{}},"_children":[],"_instanceName":"New Screen","direction":"column","hAlign":"stretch","vAlign":"top","size":"grow","gap":"M"},"routing":{"route":"/home","roleId":"BASIC","roldId":"BASIC"},"name":"screen-id"},{"_id":"ta_users","_rev":"1-30a4344f056c24cf776d5736eb3c7ed5","type":"table","views":{},"name":"Users","schema":{"email":{"type":"string","constraints":{"type":"string","email":true,"length":{"maximum":""},"presence":true},"fieldName":"email","name":"email"},"firstName":{"name":"firstName","fieldName":"firstName","type":"string","constraints":{"type":"string","presence":false}},"lastName":{"name":"lastName","fieldName":"lastName","type":"string","constraints":{"type":"string","presence":false}},"roleId":{"fieldName":"roleId","name":"roleId","type":"options","constraints":{"type":"string","presence":false,"inclusion":["ADMIN","POWER","BASIC","PUBLIC"]}},"status":{"fieldName":"status","name":"status","type":"options","constraints":{"type":"string","presence":false,"inclusion":["active","inactive"]}}},"primaryDisplay":"email"}]} -{"seq":"11-g1AAAACbeJzLYWBgYMpgTmEQTM4vTc5ISXIwNDLXMwBCwxyQVCJDUv3___-zMpgTWXKBAuxJiebmBkaG2DTgMSaPBUgyNACp_1DT2CGmmaUZWFqmYtOXBQAWQiha"} diff --git a/packages/builder/cypress/fixtures/profile.json b/packages/builder/cypress/fixtures/profile.json deleted file mode 100644 index b6c355ca5c..0000000000 --- a/packages/builder/cypress/fixtures/profile.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "id": 8739, - "name": "Jane", - "email": "jane@example.com" -} \ No newline at end of file diff --git a/packages/builder/cypress/fixtures/users.json b/packages/builder/cypress/fixtures/users.json deleted file mode 100644 index f82fc8dfb2..0000000000 --- a/packages/builder/cypress/fixtures/users.json +++ /dev/null @@ -1,232 +0,0 @@ -[ - { - "id": 1, - "name": "Leanne Graham", - "username": "Bret", - "email": "Sincere@april.biz", - "address": { - "street": "Kulas Light", - "suite": "Apt. 556", - "city": "Gwenborough", - "zipcode": "92998-3874", - "geo": { - "lat": "-37.3159", - "lng": "81.1496" - } - }, - "phone": "1-770-736-8031 x56442", - "website": "hildegard.org", - "company": { - "name": "Romaguera-Crona", - "catchPhrase": "Multi-layered client-server neural-net", - "bs": "harness real-time e-markets" - } - }, - { - "id": 2, - "name": "Ervin Howell", - "username": "Antonette", - "email": "Shanna@melissa.tv", - "address": { - "street": "Victor Plains", - "suite": "Suite 879", - "city": "Wisokyburgh", - "zipcode": "90566-7771", - "geo": { - "lat": "-43.9509", - "lng": "-34.4618" - } - }, - "phone": "010-692-6593 x09125", - "website": "anastasia.net", - "company": { - "name": "Deckow-Crist", - "catchPhrase": "Proactive didactic contingency", - "bs": "synergize scalable supply-chains" - } - }, - { - "id": 3, - "name": "Clementine Bauch", - "username": "Samantha", - "email": "Nathan@yesenia.net", - "address": { - "street": "Douglas Extension", - "suite": "Suite 847", - "city": "McKenziehaven", - "zipcode": "59590-4157", - "geo": { - "lat": "-68.6102", - "lng": "-47.0653" - } - }, - "phone": "1-463-123-4447", - "website": "ramiro.info", - "company": { - "name": "Romaguera-Jacobson", - "catchPhrase": "Face to face bifurcated interface", - "bs": "e-enable strategic applications" - } - }, - { - "id": 4, - "name": "Patricia Lebsack", - "username": "Karianne", - "email": "Julianne.OConner@kory.org", - "address": { - "street": "Hoeger Mall", - "suite": "Apt. 692", - "city": "South Elvis", - "zipcode": "53919-4257", - "geo": { - "lat": "29.4572", - "lng": "-164.2990" - } - }, - "phone": "493-170-9623 x156", - "website": "kale.biz", - "company": { - "name": "Robel-Corkery", - "catchPhrase": "Multi-tiered zero tolerance productivity", - "bs": "transition cutting-edge web services" - } - }, - { - "id": 5, - "name": "Chelsey Dietrich", - "username": "Kamren", - "email": "Lucio_Hettinger@annie.ca", - "address": { - "street": "Skiles Walks", - "suite": "Suite 351", - "city": "Roscoeview", - "zipcode": "33263", - "geo": { - "lat": "-31.8129", - "lng": "62.5342" - } - }, - "phone": "(254)954-1289", - "website": "demarco.info", - "company": { - "name": "Keebler LLC", - "catchPhrase": "User-centric fault-tolerant solution", - "bs": "revolutionize end-to-end systems" - } - }, - { - "id": 6, - "name": "Mrs. Dennis Schulist", - "username": "Leopoldo_Corkery", - "email": "Karley_Dach@jasper.info", - "address": { - "street": "Norberto Crossing", - "suite": "Apt. 950", - "city": "South Christy", - "zipcode": "23505-1337", - "geo": { - "lat": "-71.4197", - "lng": "71.7478" - } - }, - "phone": "1-477-935-8478 x6430", - "website": "ola.org", - "company": { - "name": "Considine-Lockman", - "catchPhrase": "Synchronised bottom-line interface", - "bs": "e-enable innovative applications" - } - }, - { - "id": 7, - "name": "Kurtis Weissnat", - "username": "Elwyn.Skiles", - "email": "Telly.Hoeger@billy.biz", - "address": { - "street": "Rex Trail", - "suite": "Suite 280", - "city": "Howemouth", - "zipcode": "58804-1099", - "geo": { - "lat": "24.8918", - "lng": "21.8984" - } - }, - "phone": "210.067.6132", - "website": "elvis.io", - "company": { - "name": "Johns Group", - "catchPhrase": "Configurable multimedia task-force", - "bs": "generate enterprise e-tailers" - } - }, - { - "id": 8, - "name": "Nicholas Runolfsdottir V", - "username": "Maxime_Nienow", - "email": "Sherwood@rosamond.me", - "address": { - "street": "Ellsworth Summit", - "suite": "Suite 729", - "city": "Aliyaview", - "zipcode": "45169", - "geo": { - "lat": "-14.3990", - "lng": "-120.7677" - } - }, - "phone": "586.493.6943 x140", - "website": "jacynthe.com", - "company": { - "name": "Abernathy Group", - "catchPhrase": "Implemented secondary concept", - "bs": "e-enable extensible e-tailers" - } - }, - { - "id": 9, - "name": "Glenna Reichert", - "username": "Delphine", - "email": "Chaim_McDermott@dana.io", - "address": { - "street": "Dayna Park", - "suite": "Suite 449", - "city": "Bartholomebury", - "zipcode": "76495-3109", - "geo": { - "lat": "24.6463", - "lng": "-168.8889" - } - }, - "phone": "(775)976-6794 x41206", - "website": "conrad.com", - "company": { - "name": "Yost and Sons", - "catchPhrase": "Switchable contextually-based project", - "bs": "aggregate real-time technologies" - } - }, - { - "id": 10, - "name": "Clementina DuBuque", - "username": "Moriah.Stanton", - "email": "Rey.Padberg@karina.biz", - "address": { - "street": "Kattie Turnpike", - "suite": "Suite 198", - "city": "Lebsackbury", - "zipcode": "31428-2261", - "geo": { - "lat": "-38.2386", - "lng": "57.2232" - } - }, - "phone": "024-648-3804", - "website": "ambrose.net", - "company": { - "name": "Hoeger LLC", - "catchPhrase": "Centralized empowering task-force", - "bs": "target end-to-end tables" - } - } -] \ No newline at end of file diff --git a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js b/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js deleted file mode 100644 index f844402958..0000000000 --- a/packages/builder/cypress/integration/addMultiOptionDatatype.spec.js +++ /dev/null @@ -1,45 +0,0 @@ -import filterTests from "../support/filterTests" -const interact = require('../support/interact') - -filterTests(['all'], () => { - xcontext("Add Multi-Option Datatype", () => { - before(() => { - cy.login() - cy.createTestApp() - }) - - it("should create a new table, with data", () => { - cy.createTable("Multi Data") - cy.addColumn("Multi Data", "Test Data", "Multi-select", "1\n2\n3\n4\n5") - cy.addRowMultiValue(["1", "2", "3", "4", "5"]) - }) - - it("should add form with multi select picker, containing 5 options", () => { - cy.navigateToFrontend() - // Add data provider - cy.searchAndAddComponent("Data Provider") - cy.get(interact.DATASOURCE_PROP_CONTROL).click() - cy.get(interact.DROPDOWN).contains("Multi Data").click() - // Add Form with schema to match table - cy.searchAndAddComponent("Form") - cy.get(interact.DATASOURCE_PROP_CONTROL).click() - cy.get(interact.DROPDOWN).contains("Multi Data").click() - // Add multi-select picker to form - cy.searchAndAddComponent("Multi-select Picker").then(componentId => { - cy.get(interact.DATASOURCE_FIELD_CONTROL).type("Test Data").type("{enter}") - cy.wait(1000) - cy.getComponent(componentId).contains("Choose some options").click() - // Check picker has 5 items - cy.getComponent(componentId).find("li").should("have.length", 5) - // Select all items - for (let i = 1; i < 6; i++) { - cy.getComponent(componentId).find("li").contains(i).click() - } - // Check items have been selected - cy.getComponent(componentId) - .find(interact.SPECTRUM_PICKER_LABEL) - .contains("(5)") - }) - }) - }) -}) diff --git a/packages/builder/cypress/integration/addRadioButtons.spec.js b/packages/builder/cypress/integration/addRadioButtons.spec.js deleted file mode 100644 index 3e344c3656..0000000000 --- a/packages/builder/cypress/integration/addRadioButtons.spec.js +++ /dev/null @@ -1,43 +0,0 @@ -import filterTests from "../support/filterTests" -const interact = require('../support/interact') - -filterTests(['all'], () => { - xcontext("Add Radio Buttons", () => { - before(() => { - cy.login() - cy.createTestApp() - }) - - it("should add Radio Buttons options picker on form, add data, and confirm", () => { - cy.navigateToFrontend() - cy.searchAndAddComponent("Form") - cy.searchAndAddComponent("Options Picker").then((componentId) => { - // Provide field setting - cy.get(interact.DATASOURCE_FIELD_CONTROL).type("1") - // Open dropdown and select Radio buttons - cy.get(interact.OPTION_TYPE_PROP_CONTROL).click().then(() => { - cy.get(interact.SPECTRUM_POPOVER).contains('Radio buttons') - .click() - }) - const radioButtonsTotal = 3 - // Add values and confirm total - addRadioButtonData(radioButtonsTotal) - cy.getComponent(componentId).find('[type="radio"]') - .should('have.length', radioButtonsTotal) - }) - }) - - const addRadioButtonData = (totalRadioButtons) => { - cy.get(interact.OPTION_SOURCE_PROP_CONROL).click().then(() => { - cy.get(interact.SPECTRUM_POPOVER).contains('Custom') - .click() - .wait(1000) - }) - cy.addCustomSourceOptions(totalRadioButtons) - } - - after(() => { - cy.deleteAllApps() - }) - }) -}) diff --git a/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js b/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js deleted file mode 100644 index d9eb5a9f25..0000000000 --- a/packages/builder/cypress/integration/adminAndManagement/accountPortals.spec.js +++ /dev/null @@ -1,116 +0,0 @@ -import filterTests from "../../support/filterTests" -const interact = require('../../support/interact') - -filterTests(["smoke", "all"], () => { - xcontext("Account Portals", () => { - - const bbUserEmail = "bbuser@test.com" - - before(() => { - cy.login() - cy.deleteApp("Cypress Tests") - cy.createApp("Cypress Tests", false) - - // Create new user - cy.wait(500) - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - cy.createUser(bbUserEmail) - cy.contains("bbuser").click() - cy.wait(500) - - // Reset password - cy.get(".title").within(() => { - cy.get(interact.SPECTRUM_ICON).click({ force: true }) - }) - cy.get(interact.SPECTRUM_MENU).within(() => { - cy.get(interact.SPECTRUM_MENU_ITEM).contains("Force password reset").click({ force: true }) - }) - - cy.get(interact.SPECTRUM_DIALOG_GRID) - .find(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').as('pwd') - - cy.get(interact.SPECTRUM_BUTTON).contains("Reset password").click({ force: true }) - - // Login as new user and set password - cy.logOut() - cy.get('@pwd').then((pwd) => { - cy.login(bbUserEmail, pwd) - }) - - for (let i = 0; i < 2; i++) { - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("test") - } - cy.get(interact.SPECTRUM_BUTTON).contains("Reset your password").click({ force: true }) - //cy.logoutNoAppGrid() - }) - - xit("should verify Standard Portal", () => { - // Development access should be disabled (Admin access is already disabled) - cy.login() - cy.setUserRole("bbuser", "App User") - bbUserLogin() - - // Verify Standard Portal - cy.get(interact.SPECTRUM_SIDENAV).should('not.exist') // No config sections - cy.get(interact.CREATE_APP_BUTTON).should('not.exist') // No create app button - cy.get(".app").should('not.exist') // No apps -> no roles assigned to user - cy.get(interact.CONTAINER).should('contain', bbUserEmail) // Message containing users email - - cy.logoutNoAppGrid() - }) - - xit("should verify Admin Portal", () => { - cy.login() - // Configure user role - cy.setUserRole("bbuser", "Admin") - bbUserLogin() - - // Verify available options for Admin portal - cy.get(interact.SPECTRUM_SIDENAV) - .should('contain', 'Apps') - //.and('contain', 'Usage') - .and('contain', 'Users') - .and('contain', 'Auth') - .and('contain', 'Email') - .and('contain', 'Organisation') - .and('contain', 'Theming') - .and('contain', 'Update') - //.and('contain', 'Upgrade') - - cy.logOut() - }) - - xit("should verify Development Portal", () => { - // Only Development access should be enabled - cy.login() - cy.setUserRole("bbuser", "Developer") - bbUserLogin() - - // Verify available options for Admin portal - cy.get(interact.SPECTRUM_SIDENAV) - .should('contain', 'Apps') - //.and('contain', 'Usage') - .and('not.contain', 'Users') - .and('not.contain', 'Auth') - .and('not.contain', 'Email') - .and('not.contain', 'Organisation') - .and('contain', 'Theming') - .and('not.contain', 'Update') - .and('not.contain', 'Upgrade') - - cy.logOut() - }) - - const bbUserLogin = () => { - // Login as bbuser - cy.logOut() - cy.login(bbUserEmail, "test") - } - - after(() => { - cy.login() - // Delete BB user - cy.deleteUser(bbUserEmail) - }) - }) -}) diff --git a/packages/builder/cypress/integration/adminAndManagement/authentication.spec.js b/packages/builder/cypress/integration/adminAndManagement/authentication.spec.js deleted file mode 100644 index 140dfb9ff8..0000000000 --- a/packages/builder/cypress/integration/adminAndManagement/authentication.spec.js +++ /dev/null @@ -1,178 +0,0 @@ -import filterTests from "../../support/filterTests" -// const interact = require("../support/interact") - -filterTests(["smoke", "all"], () => { - xcontext("Auth Configuration", () => { - before(() => { - cy.login() - }) - - after(() => { - cy.get(".spectrum-SideNav li").contains("Auth").click() - cy.location().should(loc => { - expect(loc.pathname).to.eq("/builder/portal/manage/auth") - }) - - cy.get("[data-cy=new-scope-input]").clear() - - cy.get("div.content").scrollTo("bottom") - cy.get("[data-cy=oidc-active]").click() - - cy.get("[data-cy=oidc-active]").should('not.be.checked') - - cy.intercept("POST", "/api/global/configs").as("updateAuth") - cy.get("button[data-cy=oidc-save]").contains("Save").click({ force: true }) - cy.wait("@updateAuth") - cy.get("@updateAuth").its("response.statusCode").should("eq", 200) - - cy.get(".spectrum-Toast-content") - .contains("Settings saved") - .should("be.visible") - }) - - it("Should allow updating of the OIDC config", () => { - cy.get(".spectrum-SideNav li").contains("Auth").click() - cy.location().should(loc => { - expect(loc.pathname).to.eq("/builder/portal/manage/auth") - }) - cy.get("div.content").scrollTo("bottom") - cy.get(".spectrum-Toast .spectrum-ClearButton").click() - - cy.get("input[data-cy=configUrl]").type("http://budi-auth.com/v2") - cy.get("input[data-cy=clientID]").type("34ac6a13-f24a-4b52-c70d-fa544ffd11b2") - cy.get("input[data-cy=clientSecret]").type("12A8Q~4nS_DWhOOJ2vWIRsNyDVsdtXPD.Zxa9df_") - - cy.get("button[data-cy=oidc-save]").should("not.be.disabled"); - - cy.intercept("POST", "/api/global/configs").as("updateAuth") - cy.get("button[data-cy=oidc-save]").contains("Save").click({ force: true }) - cy.wait("@updateAuth") - cy.get("@updateAuth").its("response.statusCode").should("eq", 200) - - cy.get(".spectrum-Toast-content") - .contains("Settings saved") - .should("be.visible") - }) - - it("Should display default scopes in advanced config.", () => { - cy.get(".spectrum-SideNav li").contains("Auth").click() - cy.location().should(loc => { - expect(loc.pathname).to.eq("/builder/portal/manage/auth") - }) - cy.get("div.content").scrollTo("bottom") - - cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4) - - cy.get(".spectrum-Tags-item").contains("openid") - cy.get(".spectrum-Tags-item").contains("openid").find(".spectrum-ClearButton").should("not.exist") - - cy.get(".spectrum-Tags-item").contains("offline_access") - cy.get(".spectrum-Tags-item").contains("email") - cy.get(".spectrum-Tags-item").contains("profile") - }) - - it("Add a new scopes", () => { - cy.get(".spectrum-SideNav li").contains("Auth").click() - cy.location().should(loc => { - expect(loc.pathname).to.eq("/builder/portal/manage/auth") - }) - cy.get("div.content").scrollTo("bottom") - - cy.get("[data-cy=new-scope-input]").type("Sample{enter}") - cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 5) - cy.get(".spectrum-Tags-item").contains("Sample") - - cy.get(".auth-form input.spectrum-Textfield-input").type("Another ") - cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 6) - cy.get(".spectrum-Tags-item").contains("Another") - - cy.get("button[data-cy=oidc-save]").should("not.be.disabled"); - - cy.intercept("POST", "/api/global/configs").as("updateAuth") - cy.get("button[data-cy=oidc-save]").contains("Save").click({ force: true }) - cy.wait("@updateAuth") - cy.get("@updateAuth").its("response.statusCode").should("eq", 200) - - cy.reload() - - cy.get("div.content").scrollTo("bottom") - - cy.get(".spectrum-Tags-item").contains("openid") - cy.get(".spectrum-Tags-item").contains("offline_access") - cy.get(".spectrum-Tags-item").contains("email") - cy.get(".spectrum-Tags-item").contains("profile") - cy.get(".spectrum-Tags-item").contains("Sample") - cy.get(".spectrum-Tags-item").contains("Another") - }) - - it("Should allow the removal of auth scopes", () => { - cy.get(".spectrum-SideNav li").contains("Auth").click() - cy.location().should(loc => { - expect(loc.pathname).to.eq("/builder/portal/manage/auth") - }) - cy.get("div.content").scrollTo("bottom") - - cy.get(".spectrum-Tags-item").contains("offline_access").parent().find(".spectrum-ClearButton").click() - cy.get(".spectrum-Tags-item").contains("profile").parent().find(".spectrum-ClearButton").click() - - cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4) - - cy.get(".spectrum-Tags-item").contains("offline_access").should("not.exist") - cy.get(".spectrum-Tags-item").contains("profile").should("not.exist") - - cy.get("button[data-cy=oidc-save]").should("not.be.disabled"); - - cy.intercept("POST", "/api/global/configs").as("updateAuth") - cy.get("button[data-cy=oidc-save]").contains("Save").click({ force: true }) - cy.wait("@updateAuth") - cy.get("@updateAuth").its("response.statusCode").should("eq", 200) - - cy.get(".spectrum-Toast-content") - .contains("Settings saved") - .should("be.visible") - - cy.reload() - - cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4) - - cy.get(".spectrum-Tags-item").contains("offline_access").should("not.exist") - cy.get(".spectrum-Tags-item").contains("profile").should("not.exist") - }) - - it("Should allow auth scopes to be reset to the core defaults.", () => { - cy.get(".spectrum-SideNav li").contains("Auth").click() - - cy.get("div.content").scrollTo("bottom") - - cy.get("[data-cy=restore-oidc-default-scopes]").click({ force: true }) - - cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4) - - cy.get(".spectrum-Tags-item").contains("openid") - cy.get(".spectrum-Tags-item").contains("offline_access") - cy.get(".spectrum-Tags-item").contains("email") - cy.get(".spectrum-Tags-item").contains("profile") - }) - - it("Should not allow invalid characters in the auth scopes", () => { - cy.get("[data-cy=new-scope-input]").type("thisIsInvalid\\{enter}") - cy.get(".spectrum-Form-itemField .error").contains("Auth scopes cannot contain spaces, double quotes or backslashes") - cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4) - - cy.get("[data-cy=new-scope-input]").clear() - - cy.get("[data-cy=new-scope-input]").type("alsoInvalid\"{enter}") - cy.get(".spectrum-Form-itemField .error").contains("Auth scopes cannot contain spaces, double quotes or backslashes") - cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4) - - cy.get("[data-cy=new-scope-input]").clear() - }) - - it("Should not allow duplicate auth scopes", () => { - cy.get("[data-cy=new-scope-input]").type("offline_access{enter}") - cy.get(".spectrum-Form-itemField .error").contains("Auth scope already exists") - cy.get(".spectrum-Tags").find(".spectrum-Tags-item").its("length").should("eq", 4) - }) - - }) -}) \ No newline at end of file diff --git a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js b/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js deleted file mode 100644 index 3d3f5d3956..0000000000 --- a/packages/builder/cypress/integration/adminAndManagement/userManagement.spec.js +++ /dev/null @@ -1,238 +0,0 @@ -import filterTests from "../../support/filterTests" -const interact = require('../../support/interact') - -filterTests(["smoke", "all"], () => { - xcontext("User Management", () => { - before(() => { - cy.login() - cy.deleteApp("Cypress Tests") - cy.createApp("Cypress Tests", false) - }) - - xit("should create a user via basic onboarding", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000}) - cy.createUser("bbuser@test.com") - cy.get(interact.SPECTRUM_TABLE).should("contain", "bbuser") - }) - - xit("should confirm App User role for a New User", () => { - cy.contains("bbuser").click() - cy.get(".spectrum-Form-itemField").eq(3).should('contain', 'App User') - - // User should not have app access - cy.get(".spectrum-Heading").contains("Apps").parent().within(() => { - cy.get(interact.LIST_ITEMS, { timeout: 500 }).should("contain", "This user has access to no apps") - }) - }) - - if (Cypress.env("TEST_ENV")) { - xit("should assign role types", () => { - // 3 apps minimum required - to assign an app to each role type - cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`) - .its("body") - .then(val => { - if (val.length < 3) { - for (let i = 1; i < 3; i++) { - const uuid = () => Cypress._.random(0, 1e6) - const name = uuid() - if(i < 1){ - cy.createApp(name, false) - } else { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000}) - cy.wait(1000) - cy.get(interact.CREATE_APP_BUTTON, { timeout: 2000 }).click({ force: true }) - cy.createAppFromScratch(name) - } - } - } - }) - // Navigate back to the user - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000}) - cy.get(interact.SPECTRUM_SIDENAV).contains("Users").click() - cy.get(interact.SPECTRUM_TABLE, { timeout: 1000 }).contains("bbuser").click() - cy.get(interact.SPECTRUM_HEADING).contains("bbuser", { timeout: 2000}) - for (let i = 0; i < 3; i++) { - cy.get(interact.SPECTRUM_TABLE, { timeout: 3000}) - .eq(1) - .find(interact.SPECTRUM_TABLE_ROW) - .eq(0) - .find(interact.SPECTRUM_TABLE_CELL) - .eq(0) - .click() - cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 1000 }) - .contains("Choose an option") - .click() - .then(() => { - if (i == 0) { - cy.get(interact.SPECTRUM_MENU, { timeout: 2000 }).contains("Admin").click({ force: true }) - } - else if (i == 1) { - cy.get(interact.SPECTRUM_MENU, { timeout: 2000 }).contains("Power").click({ force: true }) - } - else if (i == 2) { - cy.get(interact.SPECTRUM_MENU, { timeout: 2000 }).contains("Basic").click({ force: true }) - } - cy.get(interact.SPECTRUM_BUTTON, { timeout: 2000 }) - .contains("Update role") - .click({ force: true }) - }) - cy.reload() - cy.wait(1000) - } - // Confirm roles exist within Configure roles table - cy.get(interact.SPECTRUM_TABLE, { timeout: 20000 }) - .eq(0) - .within(assginedRoles => { - expect(assginedRoles).to.contain("Admin") - expect(assginedRoles).to.contain("Power") - expect(assginedRoles).to.contain("Basic") - }) - }) - - xit("should unassign role types", () => { - // Set each app within Configure roles table to 'No Access' - cy.get(interact.SPECTRUM_TABLE) - .eq(0) - .find(interact.SPECTRUM_TABLE_ROW) - .its("length") - .then(len => { - for (let i = 0; i < len; i++) { - cy.get(interact.SPECTRUM_TABLE) - .eq(0) - .find(interact.SPECTRUM_TABLE_ROW) - .eq(0) - .find(interact.SPECTRUM_TABLE_CELL) - .eq(0) - .click() - .then(() => { - cy.get(interact.SPECTRUM_PICKER).eq(1).click({ force: true }) - cy.get(interact.SPECTRUM_POPOVER, { timeout: 500 }).contains("No Access").click() - }) - cy.get(interact.SPECTRUM_BUTTON) - .contains("Update role") - .click({ force: true }) - } - }) - // Confirm Configure roles table no longer has any apps in it - cy.get(interact.SPECTRUM_TABLE, { timeout: 1000 }).eq(0).contains("No rows found") - }) - } - - xit("should enable Developer access and verify application access", () => { - // Enable Developer access - cy.get(interact.FIELD) - .eq(4) - .within(() => { - cy.get(interact.SPECTRUM_SWITCH_INPUT).click({ force: true }) - }) - // No Access table should now be empty - cy.get(interact.CONTAINER) - .contains("No Access") - .parent() - .within(() => { - cy.get(interact.SPECTRUM_TABLE).contains("No rows found") - }) - - // Each app within Configure roles should have Admin access - cy.get(interact.SPECTRUM_TABLE) - .eq(0) - .find(interact.SPECTRUM_TABLE_ROW) - .its("length") - .then(len => { - for (let i = 0; i < len; i++) { - cy.get(interact.SPECTRUM_TABLE) - .eq(0) - .find(interact.SPECTRUM_TABLE_ROW) - .eq(i) - .contains("Admin") - cy.wait(500) - } - }) - }) - - xit("should disable Developer access and verify application access", () => { - // Disable Developer access - cy.get(interact.FIELD) - .eq(4) - .within(() => { - cy.get(".spectrum-Switch-input").click({ force: true }) - }) - // Configure roles table should now be empty - cy.get(interact.CONTAINER) - .contains("Configure roles") - .parent() - .within(() => { - cy.get(interact.SPECTRUM_TABLE).contains("No rows found") - }) - }) - - xit("Should edit user details within user details page", () => { - // Add First name - cy.get(interact.FIELD, { timeout: 1000 }).eq(1).within(() => { - cy.wait(500) - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).wait(500).clear().click().type("bb") - }) - // Add Last name - cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => { - cy.wait(500) - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).click().wait(500).clear().type("test") - }) - cy.get(interact.FIELD, { timeout: 1000 }).eq(0).click() - // Reload page - cy.reload() - - // Confirm details have been saved - cy.get(interact.FIELD, { timeout: 20000 }).eq(1).within(() => { - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', "bb") - }) - cy.get(interact.FIELD, { timeout: 1000 }).eq(2).within(() => { - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }).should('have.value', "test") - }) - }) - - xit("should reset the users password", () => { - cy.get(".title").within(() => { - cy.get(interact.SPECTRUM_ICON).click({ force: true }) - }) - cy.get(interact.SPECTRUM_MENU).within(() => { - cy.get(interact.SPECTRUM_MENU_ITEM).contains("Force password reset").click({ force: true }) - }) - - // Reset password modal - cy.get(interact.SPECTRUM_DIALOG_GRID) - .find(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').as('pwd') - cy.get(interact.SPECTRUM_BUTTON).contains("Reset password").click({ force: true }) - cy.get(interact.SPECTRUM_BUTTON).contains("Reset password").should('not.exist') - - // Logout, then login with new password - cy.logOut() - cy.get('@pwd').then((pwd) => { - cy.login("bbuser@test.com", pwd) - }) - - // Reset password screen - for (let i = 0; i < 2; i++) { - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("test") - } - cy.get(interact.SPECTRUM_BUTTON).contains("Reset your password").click({ force: true }) - - // Confirm user logged in afer password change - cy.login("bbuser@test.com", "test") - cy.get(".avatar > .icon").click({ force: true }) - - cy.get(".spectrum-Menu-item").contains("Update user information").click({ force: true }) - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT) - .eq(0) - .invoke('val').should('eq', 'bbuser@test.com') - - // Logout and login as previous user - cy.logoutNoAppGrid() - cy.login() - }) - - xit("should delete a user", () => { - cy.deleteUser("bbuser@test.com") - cy.get(interact.SPECTRUM_TABLE, { timeout: 4000 }).should("not.have.text", "bbuser") - }) - }) -}) diff --git a/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js b/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js deleted file mode 100644 index 18362031c9..0000000000 --- a/packages/builder/cypress/integration/adminAndManagement/userSettings.spec.js +++ /dev/null @@ -1,114 +0,0 @@ -import filterTests from "../../support/filterTests" -const interact = require('../../support/interact') - -filterTests(["smoke", "all"], () => { - context("User Settings Menu", () => { - - before(() => { - cy.login() - }) - - it("should update user information via user settings menu", () => { - const fname = "test" - const lname = "user" - - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.updateUserInformation(fname, lname) - - // Go to user info and confirm name update - cy.contains("Users").click() - cy.contains("test@test.com").click() - - cy.get(interact.FIELD, { timeout: 1000 }).eq(1).within(() => { - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', fname) - }) - cy.get(interact.FIELD).eq(2).within(() => { - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).should('have.value', lname) - }) - }) - - xit("should allow copying of the users API key", () => { - cy.get(".user-dropdown .avatar > .icon", { timeout: 2000 }).click({ force: true }) - cy.get(interact.SPECTRUM_MENU_ITEM).contains("View API key").click({ force: true }) - cy.get(interact.SPECTRUM_DIALOG_CONTENT).within(() => { - cy.get(interact.SPECTRUM_ICON).click({ force: true }) - }) - // There may be timing issues with this on the smoke build - cy.wait(500) - cy.get(".spectrum-Toast-content") - .contains("URL copied to clipboard") - .should("be.visible") - }) - - it("should allow API key regeneration", () => { - cy.get(".user-dropdown .icon", { timeout: 2000 }).click({ force: true }) - cy.get(interact.SPECTRUM_MENU_ITEM).contains("View API key").click({ force: true }) - cy.get(interact.SPECTRUM_DIALOG_CONTENT).within(() => { - cy.get(interact.SPECTRUM_ICON).click({ force: true }) - }) - // Get initial API key value - cy.get(interact.SPECTRUM_DIALOG_CONTENT) - .find(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').as('keyOne') - - // Click re-generate key button - cy.get("button").contains("Regenerate key").click({ force: true }) - - // Verify API key was changed - cy.get(interact.SPECTRUM_DIALOG_CONTENT).within(() => { - cy.get('@keyOne').then((keyOne) => { - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).invoke('val').should('not.eq', keyOne) - }) - }) - cy.closeModal() - }) - - it("should update password", () => { - // Access Update password modal - cy.get(".user-dropdown .icon", { timeout: 2000 }).click({ force: true }) - cy.get(interact.SPECTRUM_MENU_ITEM).contains("Update password").click({ force: true }) - - // Enter new password and update - cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => { - for (let i = 0; i < 2; i++) { - // password set to 'newpwd' - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("newpwd") - } - cy.get("button").contains("Update password").click({ force: true }) - }) - - // Logout & in with new password - //cy.logOut() - cy.login("test@test.com", "newpwd") - }) - - xit("should open and close developer mode", () => { - cy.get(".user-dropdown .icon", { timeout: 2000 }).click({ force: true }) - - // Close developer mode & verify - cy.get(interact.SPECTRUM_MENU_ITEM).contains("Close developer mode").click({ force: true }) - cy.get(interact.SPECTRUM_SIDENAV).should('not.exist') // No config sections - cy.get(interact.CREATE_APP_BUTTON).should('not.exist') // No create app button - cy.get(".app").should('not.exist') // At least one app should be available - - // Open developer mode & verify - cy.get(".avatar > .icon").click({ force: true }) - cy.get(interact.SPECTRUM_MENU_ITEM).contains("Open developer mode").click({ force: true }) - cy.get(".app-table").should('exist') // config sections available - cy.get(interact.CREATE_APP_BUTTON).should('exist') // create app button available - }) - - after(() => { - // Change password back to original value - cy.get(".user-dropdown .icon", { timeout: 2000 }).click({ force: true }) - cy.get(interact.SPECTRUM_MENU_ITEM).contains("Update password").click({ force: true }) - cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => { - for (let i = 0; i < 2; i++) { - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).eq(i).type("test") - } - cy.get("button").contains("Update password").click({ force: true }) - }) - // Remove users name - cy.updateUserInformation() - }) - }) -}) diff --git a/packages/builder/cypress/integration/appOverview.spec.js b/packages/builder/cypress/integration/appOverview.spec.js deleted file mode 100644 index 60d0f2a06d..0000000000 --- a/packages/builder/cypress/integration/appOverview.spec.js +++ /dev/null @@ -1,442 +0,0 @@ -import filterTests from "../support/filterTests" -import clientPackage from "@budibase/client/package.json" - -filterTests(["all"], () => { - xcontext("Application Overview screen", () => { - before(() => { - cy.login() - cy.deleteAllApps() - cy.createApp("Cypress Tests") - }) - - xit("Should be accessible from the applications list", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .title") - .eq(0) - .invoke("attr", "data-cy") - .then($dataCy => { - const dataCy = $dataCy - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .click({ force: true }) - - cy.location().should(loc => { - expect(loc.pathname).to.eq("/builder/portal/overview/" + dataCy) - }) - }) - }) - - // Find a more suitable place for this. - xit("Should allow unlocking in the app list", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - - cy.get(".appTable .lock-status").eq(0).contains("Locked by you").click() - - cy.unlockApp({ owned: true }) - - cy.get(".appTable").should("exist") - cy.get(".lock-status").should("not.be.visible") - }) - - xit("Should allow unlocking in the app overview screen", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - - cy.get(".appTable .app-row-actions button") - .contains("Edit") - .eq(0) - .click({ force: true }) - cy.wait(1000) - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".lock-status").eq(0).contains("Locked by you").click() - - cy.unlockApp({ owned: true }) - - cy.get(".lock-status").should("not.be.visible") - }) - - xit("Should reflect the deploy state of an app that hasn't been published.", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".header-right button.spectrum-Button[data-cy='view-app']").should( - "be.disabled" - ) - - cy.get(".spectrum-Tabs-item.is-selected").contains("Overview") - cy.get(".overview-tab").should("be.visible") - - cy.get(".overview-tab [data-cy='app-status']").within(() => { - cy.get(".status-display").contains("Unpublished") - cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should( - "exist" - ) - cy.get(".status-text").contains("-") - }) - }) - - xit("Should reflect the app deployment state", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - cy.get(".appTable .app-row-actions button") - .contains("Edit") - .eq(0) - .click({ force: true }) - - cy.wait(500) - cy.get(".toprightnav button.spectrum-Button", { timeout: 2000 }) - .contains("Publish") - .click({ force: true }) - cy.get(".spectrum-Modal [data-cy='deploy-app-modal']") - .should("be.visible") - .within(() => { - cy.get(".spectrum-Button").contains("Publish").click({ force: true }) - cy.wait(1000) - }) - - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".header-right button.spectrum-Button[data-cy='view-app']").should( - "not.be.disabled" - ) - - cy.get(".overview-tab [data-cy='app-status']").within(() => { - cy.get(".status-display").contains("Published") - cy.get(".status-display .icon svg[aria-label='GlobeCheck']").should( - "exist" - ) - cy.get(".status-text").contains("Last published a few seconds ago") - }) - }) - - xit("Should reflect an application that has been unpublished", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Edit") - .eq(0) - .click({ force: true }) - - cy.get(".deployment-top-nav svg[aria-label='Globe']").click({ - force: true, - }) - - cy.get("[data-cy='publish-popover-menu']").should("be.visible") - cy.get( - "[data-cy='publish-popover-menu'] [data-cy='publish-popover-action']" - ).click({ force: true }) - - cy.get("[data-cy='unpublish-modal']") - .should("be.visible") - .within(() => { - cy.get(".confirm-wrap button").click({ force: true }) - }) - - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.wait(1000) - cy.get(".appTable .app-row-actions button", { timeout: 10000 }) - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".overview-tab [data-cy='app-status']").within(() => { - cy.get(".status-display").contains("Unpublished") - cy.get(".status-display .icon svg[aria-label='GlobeStrike']").should( - "exist" - ) - cy.get(".status-text").contains("Last published a few seconds ago") - }) - }) - - xit("Should allow the editing of the application icon and colour", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".edit-hover", { timeout: 1000 }).eq(0).click({ force: true }) - // Select random icon - cy.wait(400) - cy.get(".grid").within(() => { - cy.get(".icon-item") - .eq(Math.floor(Math.random() * 23) + 1) - .click() - }) - // Select random colour - cy.get(".fill").click() - cy.get(".colors").within(() => { - cy.get(".color") - .eq(Math.floor(Math.random() * 33) + 1) - .click() - }) - cy.intercept("**/applications/**").as("iconChange") - cy.get(".spectrum-Button").contains("Save").click({ force: true }) - cy.wait("@iconChange") - cy.get("@iconChange").its("response.statusCode").should("eq", 200) - // Confirm icon has changed from default - // Confirm colour has been applied - cy.get(".spectrum-ActionButton-label").contains("Back").click({ force: true }) - cy.get(".appTable", { timeout: 2000 }).within(() => { - cy.get("[aria-label]") - .eq(0) - .children() - .should("have.attr", "xlink:href") - .and("not.contain", "#spectrum-icon-18-Apps") - cy.get(".title") - .children() - .children() - .should("have.attr", "style") - .and("contains", "color") - }) - }) - - xit("Should reflect the last time the application was edited", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".header-right button").contains("Edit").click({ force: true }) - - cy.navigateToFrontend() - - cy.searchAndAddComponent("Headline").then(componentId => { - cy.getComponent(componentId).should("exist") - }) - - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".overview-tab [data-cy='edited-by']").within(() => { - cy.get(".editor-name").contains("You") - cy.get(".last-edit-text").contains("Last edited a few seconds ago") - }) - }) - - xit("Should reflect application version is up-to-date", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".overview-tab [data-cy='app-version']").within(() => { - cy.get(".version-status").contains("You're running the latest!") - }) - }) - - it("Should navigate to the settings tab when clicking the App Version card header", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".spectrum-Tabs-item.is-selected").contains("Overview") - cy.get(".overview-tab").should("be.visible") - - cy.get(".overview-tab [data-cy='app-version'] .dash-card-header").click({ - force: true, - }) - - cy.get(".spectrum-Tabs-item.is-selected").contains("Settings") - cy.get(".settings-tab").should("be.visible") - cy.get(".overview-tab").should("not.exist") - }) - - it("Should allow the upgrading of an application, if available.", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.wait(500) - - cy.location().then(loc => { - const params = loc.pathname.split("/") - const appId = params[params.length - 1] - cy.log(appId) - //Downgrade the app for the test - cy.alterAppVersion(appId, "0.0.1-alpha.0").then(() => { - cy.reload() - cy.log("Current deployment version: " + clientPackage.version) - - cy.get(".version-status a", { timeout: 5000 }).contains("Update").click() - cy.get(".spectrum-Tabs-item.is-selected").contains("Settings") - - cy.get(".version-section .page-action button") - .contains("Update") - .click({ force: true }) - - cy.intercept("POST", "**/applications/**/client/update").as( - "updateVersion" - ) - cy.get(".spectrum-Modal.is-open button") - .contains("Update") - .click({ force: true }) - - cy.wait("@updateVersion") - .its("response.statusCode") - .should("eq", 200) - .then(() => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".spectrum-Tabs-item") - .contains("Overview") - .click({ force: true }) - cy.get(".overview-tab [data-cy='app-version']").within(() => { - cy.get(".spectrum-Heading").contains(clientPackage.version) - cy.get(".version-status").contains("You're running the latest!") - }) - }) - }) - }) - }) - - xit("Should allow editing of the app details.", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".spectrum-Tabs-item").contains("Settings").click() - cy.get(".spectrum-Tabs-item.is-selected").contains("Settings") - cy.get(".settings-tab").should("be.visible") - - cy.get(".details-section .page-action button") - .contains("Edit") - .click({ force: true }) - cy.updateAppName("sample name") - - //publish and check its disabled - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - cy.wait(500) - cy.get(".appTable .app-row-actions button") - .contains("Edit") - .eq(0) - .click({ force: true }) - - cy.get(".toprightnav button.spectrum-Button") - .contains("Publish") - .click({ force: true }) - cy.get(".spectrum-Modal [data-cy='deploy-app-modal']") - .should("be.visible") - .within(() => { - cy.get(".spectrum-Button").contains("Publish").click({ force: true }) - cy.wait(1000) - }) - - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 }) - cy.get(".appTable .app-row-actions button", { timeout: 5000 }) - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".spectrum-Tabs-item").contains("Settings").click() - cy.get(".spectrum-Tabs-item.is-selected").contains("Settings") - - cy.get(".details-section .page-action .spectrum-Button").scrollIntoView() - cy.get(".details-section .page-action .spectrum-Button", { timeout: 1000 }).should( - "be.disabled" - ) - }) - - xit("Should allow copying of the published application Id", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions") - .eq(0) - .within(() => { - cy.get(".spectrum-Button").contains("Edit").click({ force: true }) - }) - - cy.publishApp("sample-name") - - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".app-overview-actions-icon > .icon").click({ force: true }) - - cy.get("[data-cy='app-overview-menu-popover']") - .eq(0) - .within(() => { - cy.get(".spectrum-Menu-item") - .contains("Copy App ID") - .click({ force: true }) - }) - - cy.get(".spectrum-Toast-content") - .contains("App ID copied to clipboard.") - .should("be.visible") - }) - - xit("Should allow unpublishing of the application via the Unpublish link", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - - cy.get(`[data-cy="app-status"]`).within(() => { - cy.contains("Unpublish").click({ force: true }) - }) - - cy.get("[data-cy='unpublish-modal']") - .should("be.visible") - .within(() => { - cy.get(".confirm-wrap button").click({ force: true }) - }) - - cy.get(".overview-tab [data-cy='app-status']").within(() => { - cy.get(".status-display").contains("Unpublished") - cy.get(".status-display .icon svg[aria-label='GlobeStrike']") - .should("exist") - }) - }) - - xit("Should allow deleting of the application", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.get(".appTable .app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - cy.get(".app-overview-actions-icon > .icon").click({ force: true }) - - cy.get("[data-cy='app-overview-menu-popover']") - .eq(0) - .within(() => { - cy.get(".spectrum-Menu-item") - .contains("Delete") - .click({ force: true }) - cy.wait(500) - }) - - //The test application was renamed earlier in the spec - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get("input").type("sample name") - cy.get(".spectrum-Button--warning").click() - }) - - cy.location().should(loc => { - expect(loc.pathname).to.eq("/builder/portal/apps") - }) - - cy.get(".appTable").should("not.exist") - - cy.get(".welcome .container h1").contains("Let's create your first app!") - }) - - after(() => { - cy.deleteAllApps() - }) - }) -}) diff --git a/packages/builder/cypress/integration/appPublishWorkflow.spec.js b/packages/builder/cypress/integration/appPublishWorkflow.spec.js deleted file mode 100644 index 3376db0b2d..0000000000 --- a/packages/builder/cypress/integration/appPublishWorkflow.spec.js +++ /dev/null @@ -1,108 +0,0 @@ -import filterTests from "../support/filterTests" -import { APP_TABLE_APP_NAME, DEPLOY_SUCCESS_MODAL } from "../support/interact"; -const interact = require('../support/interact') - -filterTests(['all'], () => { - xcontext("Publish Application Workflow", () => { - before(() => { - cy.login() - cy.deleteAllApps() - cy.createApp("Cypress Tests", false) - }) - - xit("Should reflect the unpublished status correctly", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - - cy.get(interact.APP_TABLE_STATUS, { timeout: 3000 }).eq(0) - .within(() => { - cy.contains("Unpublished") - cy.get(interact.GLOBESTRIKE).should("exist") - }) - - cy.get(interact.APP_TABLE_ROW_ACTION).eq(0) - .within(() => { - cy.get(interact.SPECTRUM_BUTTON_TEMPLATE).contains("Edit").click({ force: true }) - }) - - cy.get(interact.DEPLOYMENT_TOP_NAV_GLOBESTRIKE).should("exist") - cy.get(interact.DEPLOYMENT_TOP_GLOBE).should("not.exist") - }) - - xit("Should publish an application and correctly reflect that", () => { - //Assuming the previous test was run and the unpublished app is open in edit mode. - cy.get(interact.TOPRIGHTNAV_BUTTON_SPECTRUM).contains("Publish").click({ force: true }) - - cy.get(interact.DEPLOY_APP_MODAL).should("be.visible") - .within(() => { - cy.get(interact.SPECTRUM_BUTTON).contains("Publish").click({ force: true }) - }); - - //Verify that the app url is presented correctly to the user - cy.get(interact.DEPLOY_SUCCESS_MODAL, { timeout: 1000 }) - .should("be.visible") - .within(() => { - let appUrl = Cypress.config().baseUrl + '/app/cypress-tests' - cy.get(interact.DEPLOY_APP_URL_INPUT).should('have.value', appUrl) - cy.get(interact.SPECTRUM_BUTTON).contains("Done").click({ force: true }) - }) - - cy.visit(`${Cypress.config().baseUrl}/builder`) - - cy.get(interact.APP_TABLE_STATUS, { timeout: 3000 }).eq(0) - .within(() => { - cy.contains("Published") - cy.get(interact.GLOBE).should("exist") - }) - - cy.get(interact.APP_TABLE_ROW_ACTION).eq(0) - .within(() => { - cy.get(interact.SPECTRUM_BUTTON).contains("Manage") - cy.get(interact.SPECTRUM_BUTTON).contains("Edit").click({ force: true }) - }) - - cy.get(interact.DEPLOYMENT_TOP_GLOBE).should("exist").click({ force: true }) - - cy.get(interact.PUBLISH_POPOVER_MENU).should("be.visible") - .within(() => { - cy.get(interact.PUBLISH_POPOVER_ACTION).should("exist") - cy.get("button").contains("View app").should("exist") - cy.get(interact.PUBLISH_POPOVER_MESSAGE).should("have.text", "Last published a few seconds ago") - }) - }) - - xit("Should unpublish an application using the link and reflect the status change", () => { - //Assuming the previous test app exists and is published - - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - - cy.get(interact.APP_TABLE_STATUS).eq(0) - .within(() => { - cy.contains("Published") - cy.get("svg[aria-label='Globe']").should("exist") - }) - - cy.get(interact.APP_TABLE).eq(0) - .within(() => { - cy.get(interact.APP_TABLE_APP_NAME).click({ force: true }) - }) - - cy.get(interact.DEPLOYMENT_TOP_GLOBE).should("exist").click({ force: true }) - - cy.get("[data-cy='publish-popover-menu']") - .within(() => { - cy.get(interact.PUBLISH_POPOVER_ACTION).click({ force: true }) - }) - - cy.get(interact.UNPUBLISH_MODAL).should("be.visible") - .within(() => { - cy.get(interact.CONFIRM_WRAP_BUTTON).click({ force: true } - ) - }) - - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 6000 }) - cy.wait(500) - cy.get(interact.APP_TABLE_STATUS, { timeout: 10000 }).eq(0).contains("Unpublished") - - }) - }) -}) diff --git a/packages/builder/cypress/integration/autoScreensUI.spec.js b/packages/builder/cypress/integration/autoScreensUI.spec.js deleted file mode 100644 index 581e5c431b..0000000000 --- a/packages/builder/cypress/integration/autoScreensUI.spec.js +++ /dev/null @@ -1,101 +0,0 @@ -import filterTests from "../support/filterTests" -const interact = require('../support/interact') - -filterTests(['smoke', 'all'], () => { - xcontext("Auto Screens UI", () => { - before(() => { - cy.login() - cy.deleteAllApps() - }) - - it("should disable the autogenerated screen options if no sources are available", () => { - cy.createApp("First Test App", false) - cy.closeModal(); - - cy.navigateToAutogeneratedModal() - cy.get(interact.CONFIRM_WRAP_SPE_BUTTON).should('be.disabled') - - cy.deleteAllApps() - }); - - it("should not display incompatible sources", () => { - cy.createApp("Test App") - - cy.selectExternalDatasource("REST") - cy.selectExternalDatasource("S3") - cy.get(interact.SPECTRUM_MODAL).within(() => { - cy.get(interact.SPECTRUM_BUTTON).contains("Save and continue to query").click({ force : true }) - }) - - cy.navigateToAutogeneratedModal() - - cy.get(interact.DATA_SOURCE_ENTRY).should('have.length', 1) - cy.get(interact.DATA_SOURCE_ENTRY) - - cy.deleteAllApps() - }); - - it("should generate internal table screens", () => { - cy.createTestApp() - // Create Autogenerated screens from the internal table - cy.createDatasourceScreen(["Cypress Tests"]) - // Confirm screens have been auto generated - cy.get(interact.BODY).should('contain', "cypress-tests") - .and('contain', 'cypress-tests/:id') - .and('contain', 'cypress-tests/new/row') - }) - - it("should generate multiple internal table screens at once", () => { - const initialTable = "Cypress Tests" - const secondTable = "Table Two" - // Create a second internal table - cy.createTable(secondTable) - // Create Autogenerated screens from the internal tables - cy.createDatasourceScreen([initialTable, secondTable]) - // Confirm screens have been auto generated - // Previously generated tables are suffixed with numbers - as expected - cy.wait(1000) - cy.get(interact.BODY).should('contain', 'cypress-tests-2') - .and('contain', 'cypress-tests-2/:id') - .and('contain', 'cypress-tests-2/new/row') - .and('contain', 'table-two') - .and('contain', 'table-two/:id') - .and('contain', 'table-two/new/row') - }) - - it("should generate multiple internal table screens with the same screen access level", () => { - //The tables created in the previous step still exist - cy.createTable("Table Three") - cy.createTable("Table Four") - cy.createDatasourceScreen(["Table Three", "Table Four"], "Admin") - - // Filter screens to Admin - cy.filterScreensAccessLevel('Admin') - - cy.get(interact.BODY).should('contain', 'table-three') - .and('contain', 'table-three/:id') - .and('contain', 'table-three/new/row') - .and('contain', 'table-four') - .and('contain', 'table-four/:id') - .and('contain', 'table-four/new/row') - .and('not.contain', 'table-two') - .and('not.contain', 'cypress-tests') - }) - - if (Cypress.env("TEST_ENV")) { - it("should generate datasource screens", () => { - // Using MySQL datasource for testing this - const datasource = "MySQL" - // Select & configure MySQL datasource - cy.selectExternalDatasource(datasource) - cy.addDatasourceConfig(datasource) - // Create Autogenerated screens from a MySQL table - MySQL contains books table - cy.createDatasourceScreen(["books"]) - - cy.get(interact.BODY).should('contain', 'books') - .and('contain', 'books/:id') - .and('contain', 'books/new/row') - }) - } - }) -}) diff --git a/packages/builder/cypress/integration/createApp.spec.js b/packages/builder/cypress/integration/createApp.spec.js deleted file mode 100644 index 897c7f8b91..0000000000 --- a/packages/builder/cypress/integration/createApp.spec.js +++ /dev/null @@ -1,235 +0,0 @@ -import filterTests from '../support/filterTests' -const interact = require('../support/interact') - -filterTests(['smoke', 'all'], () => { - context("Create an Application", () => { - - before(() => { - cy.login() - cy.deleteAllApps() - }) - - if (!(Cypress.env("TEST_ENV"))) { - it.skip("should show the new user UI/UX", () => { - cy.visit(`${Cypress.config().baseUrl}/builder/portal/apps/create`, { timeout: 5000 }) //added /portal/apps/create - cy.wait(1000) - cy.get(interact.CREATE_APP_BUTTON, { timeout: 10000 }).contains('Start from scratch').should("exist") - - cy.get(interact.TEMPLATE_CATEGORY_FILTER).should("exist") - cy.get(interact.TEMPLATE_CATEGORY).should("exist") - - cy.get(interact.APP_TABLE).should("not.exist") - }) - } - - xit("should provide filterable templates", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - cy.wait(500) - - cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`) - .its("body") - .then(val => { - if (val.length > 0) { - cy.get(interact.SPECTRUM_BUTTON).contains("View Templates").click({ force: true }) - } - }) - - cy.get(interact.TEMPLATE_CATEGORY_FILTER).should("exist") - cy.get(interact.TEMPLATE_CATEGORY).should("exist") - - cy.get(interact.TEMPLATE_CATEGORY_ACTIONGROUP).its('length').should('be.gt', 1) - cy.get(interact.TEMPLATE_CATEGORY_FILTER_ACTIONBUTTON).its('length').should('be.gt', 2) - - cy.get(interact.TEMPLATE_CATEGORY_FILTER_ACTIONBUTTON).eq(1).click() - cy.get(interact.TEMPLATE_CATEGORY_ACTIONGROUP).should('have.length', 1) - - cy.get(interact.TEMPLATE_CATEGORY_FILTER_ACTIONBUTTON).eq(0).click() - cy.get(interact.TEMPLATE_CATEGORY_ACTIONGROUP).its('length').should('be.gt', 1) - }) - - it("should enforce a valid url before submission", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 10000 }) - - // Start create app process. If apps already exist, click second button - cy.wait(1000) - cy.get(interact.CREATE_APP_BUTTON, { timeout: 3000 }).click({ force: true }) - - const appName = "Cypress Tests" - cy.get(interact.SPECTRUM_MODAL).within(() => { - - cy.get(interact.APP_NAME_INPUT).eq(0).should('have.focus') - - //Auto fill - cy.get(interact.APP_NAME_INPUT).eq(0).clear() - cy.get(interact.APP_NAME_INPUT).eq(0).type(appName).should("have.value", appName).blur() - cy.get(interact.APP_NAME_INPUT).eq(1).should("have.value", "/cypress-tests") - cy.get(interact.SPECTRUM_BUTTON_GROUP).contains("Create app").should('not.be.disabled') - - //Empty the app url - disabled create - cy.get(interact.APP_NAME_INPUT).eq(1).clear().blur() - cy.get(interact.SPECTRUM_BUTTON_GROUP).contains("Create app").should('be.disabled') - - //Invalid url - cy.get(interact.APP_NAME_INPUT).eq(1).type("/new app-url").blur() - cy.get(interact.SPECTRUM_BUTTON_GROUP).contains("Create app").should('be.disabled') - - //Specifically alter the url - cy.get(interact.APP_NAME_INPUT).eq(1).clear() - cy.get(interact.APP_NAME_INPUT).eq(1).type("another-app-name").blur() - cy.get(interact.APP_NAME_INPUT).eq(1).should("have.value", "/another-app-name") - cy.get(interact.APP_NAME_INPUT).eq(0).should("have.value", appName) - cy.get(interact.SPECTRUM_BUTTON_GROUP).contains("Create app").should('not.be.disabled') - - }) - }) - - it.skip("should create the first application from scratch", () => { - const appName = "Cypress Tests" - cy.createApp(appName, false) - - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - - cy.applicationInAppTable(appName) - cy.deleteApp(appName) - }) - - it.skip("should create the first application from scratch with a default name", () => { - cy.updateUserInformation("", "") - cy.createApp("", false) - cy.applicationInAppTable("My app") - cy.deleteApp("My app") - }) - - it("should create the first application from scratch, using the users first name as the default app name", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - - cy.updateUserInformation("Ted", "Userman") - - cy.createApp("", false) - cy.applicationInAppTable("Teds app") - cy.deleteApp("Teds app") - - // Accomodate names that end in 'S' - cy.updateUserInformation("Chris", "Userman") - - cy.createApp("", false) - cy.applicationInAppTable("Chris app") - cy.deleteApp("Chris app") - - cy.updateUserInformation("", "") - }) - - it("should create an application from an export", () => { - const exportedApp = 'cypress/fixtures/exported-app.txt' - - cy.importApp(exportedApp, "") - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 2000 }) - cy.applicationInAppTable("My app") - cy.get(".app-table .name").eq(0).click() - cy.closeModal() - cy.get(`[aria-label="ShowMenu"]`).click() - cy.get(".spectrum-Menu").within(() => { - cy.contains("Overview").click() - }) - cy.get(".app-overview-actions-icon").within(() => { - cy.get(".spectrum-Icon").click({ force: true }) - }) - cy.get(".spectrum-Menu").contains("Delete").click({ force: true }) - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get("input").type("My app") - }) - cy.get(".spectrum-Button--warning").click() - }) - - it("should create an application from an export, using the users first name as the default app name", () => { - const exportedApp = 'cypress/fixtures/exported-app.txt' - - cy.updateUserInformation("Ted", "Userman") - cy.importApp(exportedApp, "") - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.applicationInAppTable("Teds app") - cy.get(".app-table .name").eq(0).click() - cy.closeModal() - cy.get(`[aria-label="ShowMenu"]`).click() - cy.get(".spectrum-Menu").within(() => { - cy.contains("Overview").click() - }) - cy.get(".app-overview-actions-icon").within(() => { - cy.get(".spectrum-Icon").click({ force: true }) - }) - cy.get(".spectrum-Menu").contains("Delete").click({ force: true }) - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get("input").type("Teds app") - }) - cy.get(".spectrum-Button--warning").click() - cy.updateUserInformation("", "") - }) - - xit("should generate the first application from a template", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.wait(500) - - // Navigate to Create new app section if apps already exist - cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`) - .its("body") - .then(val => { - if (val.length > 0) { - cy.get(interact.CREATE_APP_BUTTON).click({ force: true }) - } - }) - - cy.get(interact.TEMPLATE_CATEGORY_FILTER).should("exist") - cy.get(interact.TEMPLATE_CATEGORY).should("exist") - - // Select template - cy.get(interact.TEMPLATE_CATEGORY_ACTIONGROUP).eq(0).within(() => { - const card = cy.get('.template-card').eq(0).should("exist"); - const cardOverlay = card.get('.template-thumbnail-action-overlay').should("exist") - cardOverlay.invoke("show") - cardOverlay.get("button").contains("Use template").should("exist").click({ force: true }) - }) - - // CMD Create app from theme card - cy.get(".spectrum-Modal").should('be.visible') - - const templateName = cy.get(".spectrum-Modal .template-thumbnail-text") - templateName.invoke('text') - .then(templateNameText => { - const templateNameParsed = "/" + templateNameText.toLowerCase().replace(/\s+/g, "-") - cy.get(interact.SPECTRUM_MODAL_INPUT).eq(0).should("have.value", templateNameText) - cy.get(interact.SPECTRUM_MODAL_INPUT).eq(1).should("have.value", templateNameParsed) - - cy.get(".spectrum-Modal .spectrum-ButtonGroup").contains("Create app").click() - cy.wait(5000) - - cy.visit(`${Cypress.config().baseUrl}/builder`) - cy.wait(2000) - - cy.applicationInAppTable(templateNameText) - cy.deleteApp(templateNameText) - }); - - }) - - it("should display a second application and app filtering", () => { - // Create first app - const appName = "Cypress Tests" - cy.createApp(appName) - - cy.visit(`${Cypress.config().baseUrl}/builder`) - - // Create second app - const secondAppName = "Second App Demo" - cy.createApp(secondAppName) - - cy.visit(`${Cypress.config().baseUrl}/builder`) - - //Both applications should exist and be searchable - cy.searchForApplication(appName) - cy.searchForApplication(secondAppName) - - cy.deleteApp(secondAppName) - }) - - }) -}) diff --git a/packages/builder/cypress/integration/createAutomation.spec.js b/packages/builder/cypress/integration/createAutomation.spec.js deleted file mode 100644 index 6326691d28..0000000000 --- a/packages/builder/cypress/integration/createAutomation.spec.js +++ /dev/null @@ -1,64 +0,0 @@ -import filterTests from "../support/filterTests" -const interact = require('../support/interact') - -filterTests(['smoke', 'all'], () => { - xcontext("Create a automation", () => { - before(() => { - cy.login() - cy.createTestApp() - }) - - xit("should create a automation", () => { - cy.createTestTableWithData() - cy.wait(2000) - cy.contains("Automate").click() - cy.get(interact.SPECTRUM_BUTTON_TEMPLATE).contains("Add automation").click({ force: true }) - cy.get(interact.MODAL_INNER_WRAPPER).within(() => { - cy.get("input").type("Add Row") - cy.contains("Row Created").click({ force: true }) - cy.get(interact.SPECTRUM_BUTTON_CTA, { timeout: 500 }).click() - }) - - // Setup trigger - cy.get(interact.SPECTRUM_PICKER_LABEL).click() - cy.wait(500) - cy.contains("dog").click() - // Create action - cy.get('[aria-label="AddCircle"]', { timeout: 2000 }).click() - cy.get(interact.MODAL_INNER_WRAPPER).within(() => { - cy.wait(1000) - cy.contains("Create Row").trigger('mouseover').click().click() - cy.get(interact.SPECTRUM_BUTTON_CTA).click() - }) - cy.get(interact.SPECTRUM_PICKER_LABEL).eq(1).click() - cy.contains("dog").click() - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT) - .first() - .type("{{ trigger.row.name }}", { parseSpecialCharSequences: false }) - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT) - .eq(1) - .type("11") - cy.contains("Finish and test automation").click() - - cy.get(interact.MODAL_INNER_WRAPPER).within(() => { - cy.get(interact.SPECTRUM_PICKER_LABEL, { timeout: 1000 }).click() - cy.contains("dog").click() - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT, { timeout: 1000 }) - .first() - .type("automationGoodboy") - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT) - .eq(1) - .type("11") - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT) - .eq(2) - .type("123456") - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT) - .eq(3) - .type("123456") - cy.contains("Test").click() - }) - cy.contains("Data").click() - cy.contains("automationGoodboy") - }) - }) -}) diff --git a/packages/builder/cypress/integration/createBinding.spec.js b/packages/builder/cypress/integration/createBinding.spec.js deleted file mode 100644 index 0722d29f1d..0000000000 --- a/packages/builder/cypress/integration/createBinding.spec.js +++ /dev/null @@ -1,66 +0,0 @@ -import filterTests from "../support/filterTests" - -filterTests(['smoke', 'all'], () => { - context("Create Bindings", () => { - before(() => { - cy.login() - cy.createTestApp() - cy.navigateToFrontend() - }) - - it("should add a current user binding", () => { - cy.searchAndAddComponent("Paragraph").then(componentId => { - addSettingBinding("text", ["Current User", "_id"], "Current User._id") - }) - cy.deleteComponentByName("New Paragraph") - }) - - it("should handle an invalid binding", () => { - cy.searchAndAddComponent("Paragraph").then(componentId => { - // Cypress needs to escape curly brackets - cy.get("[data-cy=setting-text] input") - .type("{{}{{}{{} Current User._id {}}{}}") - .blur() - cy.getComponent(componentId).should("have.text", "{{{ [user].[_id] }}") - cy.deleteComponentByName("New Paragraph") - }) - }) - - xit("should add a URL param binding", () => { - const paramName = "foo" - cy.createScreen(`/test/:${paramName}`) - cy.searchAndAddComponent("Paragraph").then(componentId => { - addSettingBinding("text", ["URL", paramName], `URL.${paramName}`) - // The builder preview pages don't have a real URL, so all we can do - // is check that we were able to bind to the property, and that the - // component exists on the page - cy.getComponent(componentId).should("have.text", "New Paragraph") - }) - }) - - it("should add a binding with a handlebars helper", () => { - cy.searchAndAddComponent("Paragraph").then(componentId => { - // Cypress needs to escape curly brackets - cy.get("[data-cy=setting-text] input") - .type("{{}{{} add 1 2 {}}{}}") - .blur() - cy.getComponent(componentId).should("have.text", "3") - }) - }) - }) - - const addSettingBinding = (setting, bindingCategories, bindingText, clickOption = true) => { - cy.get(`[data-cy="setting-${setting}"] [data-cy=text-binding-button]`).click() - cy.get(".category-list li").contains(bindingCategories[0]) - cy.get(".drawer").within(() => { - if (clickOption) { - cy.get(".category-list li").contains(bindingCategories[0]).click() - cy.get("li.binding").contains(bindingCategories[1]).click() - cy.get("textarea").should("have.value", `{{ ${bindingText} }}`) - } else { - cy.get("textarea").type(bindingText) - } - cy.contains("Save").click() - }) - } -}) diff --git a/packages/builder/cypress/integration/createComponents.spec.js b/packages/builder/cypress/integration/createComponents.spec.js deleted file mode 100644 index 7f29466258..0000000000 --- a/packages/builder/cypress/integration/createComponents.spec.js +++ /dev/null @@ -1,275 +0,0 @@ -import filterTests from "../support/filterTests" -const interact = require("../support/interact") - -filterTests(["all"], () => { - xcontext("Create Components", () => { - let headlineId - - before(() => { - cy.login() - cy.createTestApp() - cy.createTable("dog") - cy.addColumn("dog", "name", "Text") - cy.addColumn("dog", "age", "Number") - cy.addColumn("dog", "breed", "Options") - - cy.navigateToFrontend() - cy.wait(1000) //allow the iframe some wiggle room - }) - - //Use the tree to delete a selected component - const deleteSelectedComponent = () => { - cy.get( - ".nav-item.selected .actions > div > .icon" - ).click({ - force: true, - }) - cy.get(".spectrum-Popover.is-open li").contains("Delete").click() - cy.get(".spectrum-Modal button").contains("Delete Component").click({ - force: true, - }) - } - - it("should add a container", () => { - cy.searchAndAddComponent("Container").then(componentId => { - cy.getComponent(componentId).should("exist") - }) - }) - - it("should add a headline", () => { - cy.searchAndAddComponent("Headline").then(componentId => { - headlineId = componentId - cy.getComponent(headlineId).should("exist") - }) - }) - - it("should change the text of the headline", () => { - const text = "Lorem ipsum dolor sit amet." - cy.get("[data-cy=setting-text] input").type(text).blur() - cy.getComponent(headlineId).should("have.text", text) - }) - - it("should change the size of the headline", () => { - cy.get("[data-cy=setting-size]").scrollIntoView().click() - cy.get("[data-cy=setting-size]").within(() => { - cy.get(".spectrum-Form-item li.spectrum-Menu-item") - .contains("3XL") - .click() - }) - - cy.getComponent(headlineId).within(() => { - cy.get(".spectrum-Heading").should("have.css", "font-size", "60px") - }) - }) - - it("should create a form and reset to match schema", () => { - cy.searchAndAddComponent("Form").then(() => { - cy.get("[data-cy=setting-dataSource]").contains("Custom").click() - cy.get(interact.DROPDOWN).contains("dog").click() - cy.wait(500) - cy.searchAndAddComponent("Field Group").then(fieldGroupId => { - cy.contains("Update form fields").click() - cy.get(".spectrum-Modal") - .get(".confirm-wrap .spectrum-Button") - .click() - cy.wait(500) - cy.getComponent(fieldGroupId).within(() => { - cy.contains("name").should("exist") - cy.contains("age").should("exist") - cy.contains("breed").should("exist") - // cy.contains("image").should("exist") - }) - cy.getComponent(fieldGroupId).find("input").should("have.length", 2) - cy.getComponent(fieldGroupId) - .find(interact.SPECTRUM_PICKER) - .should("have.length", 1) - }) - }) - }) - - it("deletes a component", () => { - cy.searchAndAddComponent("Paragraph").then(componentId => { - cy.get("[data-cy=setting-_instanceName] input").type(componentId).blur() - cy.get( - ".nav-item.selected .actions > div > .icon" - ).click({ - force: true, - }) - cy.get(".spectrum-Popover.is-open li").contains("Delete").click() - cy.get(".spectrum-Modal button").contains("Delete Component").click({ - force: true, - }) - cy.getComponent(componentId).should("not.exist") - }) - }) - - it("should clear the iframe place holder when a form field has been set", () => { - cy.searchAndAddComponent("Form").then(formId => { - //For deletion - cy.get("[data-cy=setting-_instanceName] input") - .clear() - .type(formId) - .blur() - cy.get("[data-cy=setting-dataSource]").contains("Custom").click() - cy.get(".dropdown").contains("dog").click() - - const fieldTypeToColumnName = { - "Text Field": "name", - "Number Field": "age", - "Options Picker": "breed", - } - - const componentTypeLabels = Object.keys(fieldTypeToColumnName) - - const testFieldFocusOnCreate = componentLabel => { - cy.log("Adding: " + componentLabel) - return cy.searchAndAddComponent(componentLabel).then(componentId => { - cy.get("[data-cy=setting-field] button.spectrum-Picker").click() - - //Click the first appropriate field. They are filtered by type - cy.get( - "[data-cy=setting-field] .spectrum-Popover.is-open li.spectrum-Menu-item" - ) - .contains(fieldTypeToColumnName[componentLabel]) - .click() - cy.wait(500) - cy.getComponent(componentId) - .find(".component-placeholder") - .should("not.exist") - }) - } - - cy.wait(500) - cy.wrap(componentTypeLabels) - .each(label => { - return testFieldFocusOnCreate(label) - }) - .then(() => { - cy.get(".nav-item") - .contains(formId) - .click({ force: true }) - deleteSelectedComponent() - }) - }) - }) - - it("should populate the provider for charts with a data provider in its path", () => { - cy.searchAndAddComponent("Data Provider").then(providerId => { - //For deletion - cy.get("[data-cy=setting-_instanceName] input") - .clear() - .type(providerId) - .blur() - cy.get("[data-cy=setting-dataSource]") - .contains("Choose an option") - .click() - cy.get(`[data-cy=dataSource-popover-${providerId}] ul li`) - .contains("dog") - .click() - - const chartTypeLabels = [ - "Bar Chart", - "Line Chart", - "Area Chart", - "Pie Chart", - "Donut Chart", - "Candlestick Chart", - ] - - const testFocusOnCreate = chartLabel => { - cy.log("Adding: " + chartLabel) - cy.searchAndAddComponent(chartLabel).then(componentId => { - cy.get( - "[data-cy=dataProvider-prop-control] .spectrum-Picker" - ).should("not.have.class", "is-focused") - - // Pre populated. - cy.get("[data-cy=dataProvider-prop-control] .spectrum-Picker-label") - .contains(providerId) - .should("exist") - }) - } - cy.wait(1000) - cy.wrap(chartTypeLabels) - .each(label => { - return testFocusOnCreate(label) - }) - .then(() => { - cy.get(".nav-item") - .contains(providerId) - .click({ force: true }) - deleteSelectedComponent() - }) - }) - }) - - it("should replace the placeholder when a url is set on an image", () => { - cy.searchAndAddComponent("Image").then(imageId => { - cy.get("[data-cy=setting-_instanceName] input") - .clear() - .type(imageId) - .blur() - //return $("New Data Provider.Rows")[0]["Attachment"][0]["url"] - //No minio, so just enter something local that will not reslove - cy.get("[data-cy=url-prop-control] input[type=text]") - .type("cypress/fixtures/ghost.png") - .blur() - cy.getComponent(imageId) - .find(".component-placeholder") - .should("not.exist") - cy.getComponent(imageId).find(`img[alt=${imageId}]`).should("exist") - cy.get(".nav-item") - .contains(imageId) - .click({ force: true }) - deleteSelectedComponent() - }) - }) - - it("should add a markdown component.", () => { - cy.searchAndAddComponent("Markdown Viewer").then(markdownId => { - cy.get("[data-cy=setting-_instanceName] input") - .clear() - .type(markdownId) - .blur() - cy.get( - "[data-cy=value-prop-control] input[type=text].spectrum-Textfield-input" - ) - .type("# Hi") - .blur() - cy.getComponent(markdownId) - .find(".component-placeholder") - .should("not.exist") - cy.getComponent(markdownId) - .find(".editor-preview-full h1") - .contains("Hi") - cy.get(".nav-item") - .contains(markdownId) - .click({ force: true }) - deleteSelectedComponent() - }) - }) - - it("should direct the user when adding an Icon component.", () => { - cy.searchAndAddComponent("Icon").then(iconId => { - cy.get("[data-cy=setting-_instanceName] input") - .clear() - .type(iconId) - .blur() - cy.get("[data-cy=icon-prop-control] .spectrum-ActionButton").click() - cy.get("[data-cy=icon-popover].spectrum-Popover.is-open").within(() => { - cy.get(".search-input input").type("save").blur() - cy.get(".search-input button").click({ force: true }) - cy.get(".icon-area .icon-container").eq(0).click({ force: true }) - }) - cy.getComponent(iconId) - .find(".component-placeholder") - .should("not.exist") - cy.getComponent(iconId).find("i.ri-save-fill").should("exist") - cy.get(".nav-item") - .contains(iconId) - .click({ force: true }) - deleteSelectedComponent() - }) - }) - }) -}) diff --git a/packages/builder/cypress/integration/createScreen.spec.js b/packages/builder/cypress/integration/createScreen.spec.js deleted file mode 100644 index 09d8485386..0000000000 --- a/packages/builder/cypress/integration/createScreen.spec.js +++ /dev/null @@ -1,54 +0,0 @@ -import filterTests from "../support/filterTests" -const interact = require('../support/interact') - -filterTests(["smoke", "all"], () => { - xcontext("Screen Tests", () => { - before(() => { - cy.login() - cy.createTestApp() - cy.navigateToFrontend() - }) - - it.skip("Should successfully create a screen", () => { - cy.createScreen("test") - cy.get(interact.BODY).within(() => { - cy.contains("/test").should("exist") - }) - }) - - it("Should update the url", () => { - cy.createScreen("test with spaces") - cy.get(interact.BODY).within(() => { - cy.contains("/test-with-spaces").should("exist") - }) - }) - - it.skip("should delete all screens then create first screen via button", () => { - cy.deleteAllScreens() - - cy.contains("Create first screen").click() - cy.get(interact.BODY, { timeout: 2000 }).should('contain', '/home') - }) - - it("Should create and filter screens by access level", () => { - const accessLevels = ["Basic", "Admin", "Public", "Power"] - - for (const access of accessLevels) { - // Create screen with specified access level - cy.createScreen(access, access) - // Filter by access level and confirm screen visible - cy.filterScreensAccessLevel(access) - cy.get(interact.BODY).within(() => { - cy.get(interact.NAV_ITEM).should('contain', access.toLowerCase()) - }) - } - - // Filter by All screens - Confirm all screens visible - cy.filterScreensAccessLevel("All screens") - cy.get(interact.BODY).should('contain', accessLevels[0]) - .and('contain', accessLevels[1]) - .and('contain', accessLevels[2]) - .and('contain', accessLevels[3]) - }) - }) -}) diff --git a/packages/builder/cypress/integration/createTable.spec.js b/packages/builder/cypress/integration/createTable.spec.js deleted file mode 100644 index 1c3e69a36b..0000000000 --- a/packages/builder/cypress/integration/createTable.spec.js +++ /dev/null @@ -1,112 +0,0 @@ -import filterTests from "../support/filterTests" -const interact = require('../support/interact') - -filterTests(["smoke", "all"], () => { - xcontext("Create a Table", () => { - before(() => { - cy.login() - cy.createTestApp() - }) - - it("should create a new Table", () => { - cy.createTable("dog") - // Check if Table exists - cy.get(interact.TABLE_TITLE_H1, { timeout: 1000 }).should("have.text", "dog") - }) - - it("adds a new column to the table", () => { - cy.addColumn("dog", "name", "Text") - cy.contains("name").should("be.visible") - }) - - it("creates a row in the table", () => { - cy.addRow(["Rover"]) - cy.contains("Rover").should("be.visible") - }) - - it("updates a column on the table", () => { - cy.get(interact.TABLE_TITLE).click() - cy.get(interact.SPECTRUM_TABLE_EDIT).click() - cy.get(interact.MODAL_INNER_WRAPPER).within(() => { - - cy.get("input").eq(0).type("updated", { force: true }) - // Unset table display column - cy.get(interact.SPECTRUM_SWITCH_INPUT).eq(1).click() - cy.contains("Save Column").click() - }) - cy.contains("nameupdated ").should("contain", "nameupdated") - }) - - it("edits a row", () => { - cy.contains("button", "Edit").click({ force: true }) - cy.wait(500) - cy.get(interact.SPECTRUM_MODAL_INPUT).clear() - cy.get(interact.SPECTRUM_MODAL_INPUT).type("Updated") - cy.contains("Save").click() - cy.contains("Updated").should("have.text", "Updated") - }) - - it("deletes a row", () => { - cy.get(interact.SPECTRUM_CHECKBOX_INPUT).check({ force: true }) - cy.contains("Delete 1 row").click() - cy.get(interact.SPECTRUM_MODAL).contains("Delete").click() - cy.contains("RoverUpdated").should("not.exist") - }) - - if (Cypress.env("TEST_ENV")) { - // No Pagination in CI - Test env only for the next two tests - xit("Adds 15 rows and checks pagination", () => { - // 10 rows per page, 15 rows should create 2 pages within table - const totalRows = 16 - for (let i = 1; i < totalRows; i++) { - cy.addRow([i]) - } - cy.reload() - cy.get(interact.SPECTRUM_PAGINATION, { timeout: 2000 }).within(() => { - cy.get(interact.SPECTRUM_ACTION_BUTTON).eq(1).click() - }) - cy.get(interact.SPECTRUM_PAGINATION).within(() => { - cy.get(interact.SPECTRUM_BODY_SECOND).contains("Page 2") - }) - }) - - xit("Deletes rows and checks pagination", () => { - // Delete rows, removing second page from table - cy.get(interact.SPECTRUM_CHECKBOX_INPUT).check({ force: true }) - cy.get(interact.POPOVERS).within(() => { - cy.get(interact.SPECTRUM_BUTTON).click({ force: true }) - }) - cy.get(interact.SPECTRUM_DIALOG_GRID).contains("Delete").click({ force: true }) - - // Confirm table only has one page - cy.get(interact.SPECTRUM_PAGINATION, { timeout: 1000 }).within(() => { - cy.get(interact.SPECTRUM_ACTION_BUTTON).eq(1).should("not.be.enabled") - }) - }) - } - - it("deletes a column", () => { - const columnName = "nameupdated" - cy.get(interact.TABLE_TITLE).click() - cy.get(interact.SPECTRUM_TABLE_EDIT).click() - cy.contains("Delete").click() - cy.get(interact.DELETE_COLUMN_CONFIRM).type(columnName) - cy.contains("Delete Column").click() - cy.contains("nameupdated").should("not.exist") - }) - - it("deletes a table", () => { - cy.get(interact.NAV_ITEM) - .contains("dog") - .parents(interact.NAV_ITEM) - .first() - .within(() => { - cy.get(interact.ACTION_SPECTRUM_ICON).click({ force: true }) - }) - cy.get(interact.SPECTRUM_MENU_CHILD2).click() - cy.get(interact.DELETE_TABLE_CONFIRM).type("dog") - cy.contains("Delete Table").click() - cy.contains("dog").should("not.exist") - }) - }) -}) diff --git a/packages/builder/cypress/integration/createView.spec.js b/packages/builder/cypress/integration/createView.spec.js deleted file mode 100644 index c1494b6756..0000000000 --- a/packages/builder/cypress/integration/createView.spec.js +++ /dev/null @@ -1,161 +0,0 @@ -import filterTests from "../support/filterTests" -const interact = require('../support/interact') - -filterTests(['smoke', 'all'], () => { - xcontext("Create a View", () => { - before(() => { - cy.login() - cy.createTestApp() - cy.createTable("data") - cy.addColumn("data", "group", "Text") - cy.addColumn("data", "age", "Number") - cy.addColumn("data", "rating", "Number") - - // 6 Rows - cy.addRow(["Students", 25, 1]) - cy.addRow(["Students", 20, 3]) - cy.addRow(["Students", 18, 6]) - cy.addRow(["Students", 25, 2]) - cy.addRow(["Teachers", 49, 5]) - cy.addRow(["Teachers", 36, 3]) - }) - - xit("creates a view", () => { - cy.contains("Create view").click() - cy.get(interact.MODAL_INNER_WRAPPER).within(() => { - cy.get("input").type("Test View") - cy.get("button").contains("Create View").click({ force: true }) - }) - cy.contains(interact.TABLE_TITLE_H1, "Test View", { timeout: 10000 }) - cy.get(".table-wrapper").within(() => { - cy.get(interact.TITLE).then($headers => { - expect($headers).to.have.length(3) - const headers = Array.from($headers).map(header => - header.textContent.trim() - ) - expect(removeSpacing(headers)).to.deep.eq(["group", "age", "rating"]) - }) - }) - }) - - xit("filters the view by age over 10", () => { - cy.contains("Filter").click() - cy.contains("Add Filter").click() - - cy.get(interact.MODAL_INNER_WRAPPER).within(() => { - cy.get(interact.SPECTRUM_PICKER_LABEL).eq(0).click() - cy.contains("age").click({ force: true }) - - cy.get(interact.SPECTRUM_PICKER_LABEL).eq(1).click() - cy.contains("More Than").click({ force: true }) - - cy.get("input").type(18) - cy.contains("Save").click() - }) - - cy.get(interact.SPECTRUM_TABLE_ROW).get($values => { - expect($values).to.have.length(5) - }) - }) - - xit("creates a stats calculation view based on age", () => { - cy.wait(1000) - cy.contains("Calculate").click() - cy.get(interact.MODAL_INNER_WRAPPER).within(() => { - cy.get(interact.SPECTRUM_PICKER_LABEL).eq(0).click() - cy.contains("Statistics").click() - - cy.get(interact.SPECTRUM_PICKER_LABEL).eq(1).click() - cy.contains("age").click({ force: true }) - - cy.get(interact.SPECTRUM_BUTTON).contains("Save").click({ force: true }) - }) - - cy.wait(1000) - cy.get(".table-wrapper").within(() => { - cy.get(interact.TITLE).then($headers => { - expect($headers).to.have.length(7) - const headers = Array.from($headers).map(header => - header.textContent.trim() - ) - expect(removeSpacing(headers)).to.deep.eq([ - "field", - "sum", - "min", - "max", - "count", - "sumsqr", - "avg", - ]) - }) - }) - cy.get(interact.SPECTRUM_TABLE_CELL).then($values => { - let values = Array.from($values).map(header => header.textContent.trim()) - expect(values).to.deep.eq(["age", "155", "20", "49", "5", "5347", "31"]) - }) - }) - - xit("groups the view by group", () => { - cy.contains("Group by").click() - cy.get(interact.MODAL_INNER_WRAPPER).within(() => { - cy.get(interact.SPECTRUM_PICKER_LABEL).eq(0).click() - cy.contains("group").click() - cy.contains("Save").click() - }) - cy.wait(1000) - cy.contains("Students").should("be.visible") - cy.contains("Teachers").should("be.visible") - - cy.get(interact.SPECTRUM_TABLE_CELL).then($values => { - let values = Array.from($values).map(header => header.textContent.trim()) - expect(values).to.deep.eq([ - "Students", - "70", - "20", - "25", - "3", - "1650", - "23.333333333333332", - "Teachers", - "85", - "36", - "49", - "2", - "3697", - "42.5", - ]) - }) - }) - - xit("renames a view", () => { - cy.contains(interact.NAV_ITEM, "Test View") - .find(".actions .icon.open-popover") - .click({ force: true }) - cy.get(interact.SPECTRUM_MENU_ITEM_LABEL).contains("Edit").click() - cy.get(interact.MODAL_INNER_WRAPPER).within(() => { - cy.get("input").type(" Updated") - cy.contains("Save").click() - }) - cy.wait(1000) - cy.contains("Test View Updated").should("be.visible") - }) - - it("deletes a view", () => { - cy.contains(interact.NAV_ITEM, "Test View Updated") - .find(".actions .icon.open-popover") - .click({ force: true }) - cy.contains("Delete").click() - cy.contains("Delete View").click() - cy.wait(500) - cy.contains("TestView Updated").should("not.exist") - }) - }) - - function removeSpacing(headers) { - let newHeaders = [] - for (let header of headers) { - newHeaders.push(header.replace(/\s\s+/g, " ")) - } - return newHeaders - } -}) diff --git a/packages/builder/cypress/integration/customThemingProperties.spec.js b/packages/builder/cypress/integration/customThemingProperties.spec.js deleted file mode 100644 index e9de0985d0..0000000000 --- a/packages/builder/cypress/integration/customThemingProperties.spec.js +++ /dev/null @@ -1,86 +0,0 @@ -import filterTests from "../support/filterTests" - -filterTests(['all'], () => { - xcontext("Custom Theming Properties", () => { - before(() => { - cy.login() - cy.createTestApp() - cy.navigateToFrontend() - }) - - /* Default Values: - Button roundness = Large - Accent colour = Blue 600 - Accent colour (hover) = Blue 500 - Navigation bar background colour = Gray 100 - Navigation bar text colour = Gray 800 */ - it("should reset the color property values", () => { - // Open Theme modal and change colours - cy.get(".spectrum-ActionButton-label").contains("Theme").click() - cy.get(".spectrum-Picker").contains("Large").click() - .parents() - .get(".spectrum-Menu-itemLabel").contains("None").click() - changeThemeColors() - // Reset colours - cy.get(".spectrum-Button-label").contains("Reset").click({force: true}) - // Check values have reset - checkThemeColorDefaults() - }) - - /* Button Roundness Values: - None = 0 - Small = 4px - Medium = 8px - Large = 16px */ - it("should test button roundness", () => { - const buttonRoundnessValues = ["0", "4px", "8px", "16px"] - // Add button, change roundness and confirm value - cy.addComponent("Button", null).then((componentId) => { - buttonRoundnessValues.forEach(function (item, index){ - cy.get(".spectrum-ActionButton-label").contains("Theme").click() - cy.get(".setting").contains("Button roundness").parent() - .get(".select-wrapper").click() - cy.get(".spectrum-Popover").find('li').eq(index).click() - cy.get(".spectrum-Button").contains("View changes").click({force: true}) - cy.reload() - cy.getComponent(componentId) - .parents(".svelte-xiqd1c").eq(0).should('have.attr', 'style').and('contains', `--buttonBorderRadius:${item}`) - }) - }) - }) - - const changeThemeColors = () => { - // Changes the theme colours - cy.get(".spectrum-FieldLabel").contains("Accent color") - .parent().find(".container.svelte-z3cm5a").click() - .find('[title="Red 400"]').click() - cy.get(".spectrum-FieldLabel").contains("Accent color (hover)") - .parent().find(".container.svelte-z3cm5a").click() - .find('[title="Orange 400"]').click() - cy.get(".spectrum-FieldLabel").contains("Navigation bar background color") - .parent().find(".container.svelte-z3cm5a").click() - .find('[title="Yellow 400"]').click() - cy.get(".spectrum-FieldLabel").contains("Navigation bar text color") - .parent().find(".container.svelte-z3cm5a").click() - .find('[title="Green 400"]').click() - } - - const checkThemeColorDefaults = () => { - cy.get(".spectrum-FieldLabel").contains("Accent color") - .parent().find(".container.svelte-z3cm5a").click() - .get('[title="Blue 600"]').children().find('[aria-label="Checkmark"]') - cy.get(".spectrum-Dialog-grid").click() - cy.get(".spectrum-FieldLabel").contains("Accent color (hover)") - .parent().find(".container.svelte-z3cm5a").click() - .get('[title="Blue 500"]').children().find('[aria-label="Checkmark"]') - cy.get(".spectrum-Dialog-grid").click() - cy.get(".spectrum-FieldLabel").contains("Navigation bar background color") - .parent().find(".container.svelte-z3cm5a").click() - .get('[title="Gray 100"]').children().find('[aria-label="Checkmark"]') - cy.get(".spectrum-Dialog-grid").click() - cy.get(".spectrum-FieldLabel").contains("Navigation bar text color") - .parent().find(".container.svelte-z3cm5a").click() - .get('[title="Gray 800"]').children().find('[aria-label="Checkmark"]') - } - }) -}) diff --git a/packages/builder/cypress/integration/datasources/datasourceWizard.spec.js b/packages/builder/cypress/integration/datasources/datasourceWizard.spec.js deleted file mode 100644 index 837a433951..0000000000 --- a/packages/builder/cypress/integration/datasources/datasourceWizard.spec.js +++ /dev/null @@ -1,42 +0,0 @@ -import filterTests from "../../support/filterTests" - -filterTests(['all'], () => { - xcontext("Datasource Wizard", () => { - if (Cypress.env("TEST_ENV")) { - before(() => { - cy.login() - cy.createTestApp() - }) - - it("should navigate in and out of a datasource via wizard", () => { - // Select PostgreSQL and add config (without fetch) - const datasource = "Oracle" - cy.selectExternalDatasource(datasource) - cy.addDatasourceConfig(datasource, true) - - // Navigate back within datasource wizard - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Button").contains("Back").click({ force: true }) - }) - - // Select PostgreSQL datasource again - cy.get(".item-list", { timeout: 1000 }).contains(datasource).click() - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Button").contains("Continue").click({ force: true }) - }) - - // Fetch tables after selection - // Previously entered config should not have been saved - // Config is back to default values - // Modal will close and provide 500 error - cy.intercept('**/datasources').as('datasourceConnection') - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Button").contains("Save and fetch tables").click({ force: true }) - }) - cy.wait("@datasourceConnection") - cy.get("@datasourceConnection").its('response.body') - .should('have.property', 'status', 500) - }) - } - }) -}) diff --git a/packages/builder/cypress/integration/datasources/mySql.spec.js b/packages/builder/cypress/integration/datasources/mySql.spec.js deleted file mode 100644 index 11370a9bf3..0000000000 --- a/packages/builder/cypress/integration/datasources/mySql.spec.js +++ /dev/null @@ -1,229 +0,0 @@ -import filterTests from "../../support/filterTests" - -filterTests(["all"], () => { - xcontext("MySQL Datasource Testing", () => { - if (Cypress.env("TEST_ENV")) { - before(() => { - cy.login() - cy.createTestApp() - }) - const datasource = "MySQL" - const queryName = "Cypress Test Query" - const queryRename = "CT Query Rename" - - it("Should add MySQL datasource without configuration", () => { - // Select MySQL datasource - cy.selectExternalDatasource(datasource) - // Attempt to fetch tables without applying configuration - cy.intercept("**/datasources").as("datasource") - cy.get(".spectrum-Button") - .contains("Save and fetch tables") - .click({ force: true }) - cy.wait(500) - // Intercept Request after button click & apply assertions - cy.wait("@datasource") - cy.get("@datasource") - .its("response.body") - .should( - "have.property", - "message", - "connect ECONNREFUSED 127.0.0.1:3306" - ) - cy.get("@datasource") - .its("response.body") - .should("have.property", "status", 500) - cy.get(".spectrum-Button").contains("Skip table fetch").click({ force: true }) - }) - - it("should add MySQL datasource and fetch tables", () => { - // Add & configure MySQL datasource - cy.selectExternalDatasource(datasource) - cy.intercept("**/datasources").as("datasource") - cy.addDatasourceConfig(datasource) - // Check response from datasource after adding configuration - cy.wait("@datasource") - cy.get("@datasource").its("response.statusCode").should("eq", 200) - // Confirm fetch tables was successful - cy.get(".spectrum-Table") - .eq(0) - .find(".spectrum-Table-row") - .its("length") - .should("be.gt", 0) - }) - - it("should check table fetching error", () => { - // MySQL test datasource contains tables without primary keys - cy.get(".spectrum-InLineAlert") - .should("contain", "Error fetching tables") - .and("contain", "No primary key constraint found") - }) - - it("should define a One relationship type", () => { - // Select relationship type & configure - cy.get(".spectrum-Button") - .contains("Define relationship") - .click({ force: true }) - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Picker").eq(0).click() - cy.get(".spectrum-Popover").contains("One").click() - cy.get(".spectrum-Picker").eq(1).click() - cy.get(".spectrum-Popover").contains("REGIONS").click() - cy.get(".spectrum-Picker").eq(2).click() - cy.get(".spectrum-Popover").contains("REGION_ID").click() - cy.get(".spectrum-Picker").eq(3).click() - cy.get(".spectrum-Popover").contains("COUNTRIES").click() - cy.get(".spectrum-Picker").eq(4).click() - cy.get(".spectrum-Popover").contains("REGION_ID").click() - }) - // Save relationship & reload page - cy.get(".spectrum-ButtonGroup").within(() => { - cy.get(".spectrum-Button").contains("Save").click({ force: true }) - }) - cy.reload() - - // Confirm table length & column name - cy.get(".spectrum-Table") - .eq(1) - .find(".spectrum-Table-row") - .its("length") - .should("eq", 1) - cy.get(".spectrum-Table-cell").should("contain", "COUNTRIES to REGIONS") - }) - - it("should define a Many relationship type", () => { - // Select relationship type & configure - cy.get(".spectrum-Button") - .contains("Define relationship") - .click({ force: true }) - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Picker").eq(0).click() - cy.get(".spectrum-Popover").contains("Many").click() - cy.get(".spectrum-Picker").eq(1).click() - cy.get(".spectrum-Popover").contains("LOCATIONS").click() - cy.get(".spectrum-Picker").eq(2).click() - cy.get(".spectrum-Popover").contains("REGIONS").click() - cy.get(".spectrum-Picker").eq(3).click() - cy.get(".spectrum-Popover").contains("COUNTRIES").click() - cy.get(".spectrum-Picker").eq(4).click() - cy.get(".spectrum-Popover").contains("COUNTRY_ID").click() - cy.get(".spectrum-Picker").eq(5).click() - cy.get(".spectrum-Popover").contains("REGION_ID").click() - // Save relationship & reload page - cy.get(".spectrum-Button").contains("Save").click({ force: true }) - cy.reload() - cy.wait(1000) - }) - // Confirm table length & relationship name - cy.get(".spectrum-Table", { timeout: 1000 }) - .eq(1) - .find(".spectrum-Table-row") - .its("length") - .should("eq", 2) - cy.get(".spectrum-Table-cell").should( - "contain", - "LOCATIONS through COUNTRIES → REGIONS" - ) - }) - - it("should delete relationships", () => { - // Delete both relationships - cy.get(".spectrum-Table") - .eq(1) - .find(".spectrum-Table-row") - .its("length") - .then(len => { - for (let i = 0; i < len; i++) { - cy.get(".spectrum-Table") - .eq(1) - .within(() => { - cy.get(".spectrum-Table-cell").eq(0).click({ force: true }) - }) - cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => { - cy.get(".spectrum-Button") - .contains("Delete") - .click({ force: true }) - }) - cy.reload() - cy.wait(500) - } - // Confirm relationships no longer exist - cy.get(".spectrum-Body").should( - "contain", - "No relationships configured" - ) - }) - }) - - it("should add a query", () => { - // Add query - cy.get(".spectrum-Button").contains("Add query").click({ force: true }) - cy.get(".spectrum-Form-item") - .eq(0) - .within(() => { - cy.get("input").type(queryName) - }) - // Insert Query within Fields section - cy.get(".CodeMirror textarea") - .eq(0) - .type("SELECT * FROM books", { force: true }) - // Intercept query execution - cy.intercept("**/queries/preview").as("query") - cy.get(".spectrum-Button").contains("Run Query").click({ force: true }) - cy.wait(500) - cy.wait("@query") - // Assert against Status Code & Body - cy.get("@query").its("response.statusCode").should("eq", 200) - cy.get("@query").its("response.body").should("not.be.empty") - // Save query - cy.intercept("POST", "**/queries").as("saveQuery") - cy.get(".spectrum-Button").contains("Save Query").click({ force: true }) - cy.wait("@saveQuery") - cy.get("@saveQuery").its("response.statusCode").should("eq", 200) - cy.get(".nav-item").should("contain", queryName) - }) - - it("should duplicate a query", () => { - /// Get query nav item - QueryName - cy.get(".nav-item") - .contains(queryName) - .parent() - .within(() => { - cy.get(".spectrum-Icon").eq(1).click({ force: true }) - }) - // Select and confirm duplication - cy.get(".spectrum-Menu").contains("Duplicate").click() - cy.get(".nav-item").should("contain", queryName + " (1)") - }) - - it("should edit a query name", () => { - // Rename query - cy.get(".spectrum-Form-item") - .eq(0) - .within(() => { - cy.get("input").clear().type(queryRename) - }) - // Click on a nav item - cy.get(".nav-item").first().click() - // Confirm name change - cy.get(".nav-item").should("contain", queryRename) - }) - - it("should delete a query", () => { - // Get query nav item - QueryName - cy.get(".nav-item") - .contains(queryRename) - .parent() - .within(() => { - cy.get(".spectrum-Icon").eq(1).click({ force: true }) - }) - // Select Delete - cy.get(".spectrum-Menu").contains("Delete").click() - cy.get(".spectrum-Button") - .contains("Delete Query") - .click({ force: true }) - // Confirm deletion - cy.get(".nav-item", { timeout: 1000 }).should("not.contain", queryRename) - }) - } - }) -}) diff --git a/packages/builder/cypress/integration/datasources/oracle.spec.js b/packages/builder/cypress/integration/datasources/oracle.spec.js deleted file mode 100644 index ae1ca5cd75..0000000000 --- a/packages/builder/cypress/integration/datasources/oracle.spec.js +++ /dev/null @@ -1,229 +0,0 @@ -import filterTests from "../../support/filterTests" - -filterTests(["all"], () => { - xcontext("Oracle Datasource Testing", () => { - if (Cypress.env("TEST_ENV")) { - before(() => { - cy.login() - cy.createTestApp() - }) - const datasource = "Oracle" - const queryName = "Cypress Test Query" - const queryRename = "CT Query Rename" - - it("Should add Oracle datasource and skip table fetch", () => { - // Select Oracle datasource - cy.selectExternalDatasource(datasource) - // Skip table fetch - no config added - cy.get(".spectrum-Button") - .contains("Skip table fetch") - .click({ force: true }) - cy.wait(500) - // Confirm config contains localhost - cy.get(".spectrum-Textfield-input", { timeout: 500 }) - .eq(1) - .should("have.value", "localhost") - // Add another Oracle datasource, configure & skip table fetch - cy.selectExternalDatasource(datasource) - cy.addDatasourceConfig(datasource, true) - // Confirm config and no tables - cy.get(".spectrum-Textfield-input") - .eq(1) - .should("have.value", Cypress.env("oracle").HOST) - cy.get(".spectrum-Body").eq(2).should("contain", "No tables found.") - }) - - it("Should add Oracle datasource and fetch tables without configuration", () => { - // Select Oracle datasource - cy.selectExternalDatasource(datasource) - // Attempt to fetch tables without applying configuration - cy.intercept("**/datasources").as("datasource") - cy.get(".spectrum-Button") - .contains("Save and fetch tables") - .click({ force: true }) - // Intercept Request after button click & apply assertions - cy.wait("@datasource") - cy.get("@datasource") - .its("response.body") - .should("have.property", "status", 500) - cy.get(".spectrum-Button").contains("Skip table fetch").click({ force: true }) - }) - - xit("should add Oracle datasource and fetch tables", () => { - // Add & configure Oracle datasource - cy.selectExternalDatasource(datasource) - cy.intercept("**/datasources").as("datasource") - cy.addDatasourceConfig(datasource) - // Check response from datasource after adding configuration - cy.wait("@datasource") - cy.get("@datasource").its("response.statusCode").should("eq", 200) - // Confirm fetch tables was successful - cy.get(".spectrum-Table") - .eq(0) - .find(".spectrum-Table-row") - .its("length") - .should("be.gt", 0) - }) - - xit("should define a One relationship type", () => { - // Select relationship type & configure - cy.get(".spectrum-Button") - .contains("Define relationship") - .click({ force: true }) - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Picker").eq(0).click() - cy.get(".spectrum-Popover").contains("One").click() - cy.get(".spectrum-Picker").eq(1).click() - cy.get(".spectrum-Popover").contains("REGIONS").click() - cy.get(".spectrum-Picker").eq(2).click() - cy.get(".spectrum-Popover").contains("REGION_ID").click() - cy.get(".spectrum-Picker").eq(3).click() - cy.get(".spectrum-Popover").contains("COUNTRIES").click() - cy.get(".spectrum-Picker").eq(4).click() - cy.get(".spectrum-Popover").contains("REGION_ID").click() - // Save relationship & reload page - cy.get(".spectrum-Button").contains("Save").click({ force: true }) - cy.reload() - }) - // Confirm table length & column name - cy.get(".spectrum-Table") - .eq(1) - .find(".spectrum-Table-row") - .its("length") - .should("eq", 1) - cy.get(".spectrum-Table-cell").should("contain", "COUNTRIES to REGIONS") - }) - - xit("should define a Many relationship type", () => { - // Select relationship type & configure - cy.get(".spectrum-Button") - .contains("Define relationship") - .click({ force: true }) - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Picker").eq(0).click() - cy.get(".spectrum-Popover").contains("Many").click() - cy.get(".spectrum-Picker").eq(1).click() - cy.get(".spectrum-Popover").contains("LOCATIONS").click() - cy.get(".spectrum-Picker").eq(2).click() - cy.get(".spectrum-Popover").contains("REGIONS").click() - cy.get(".spectrum-Picker").eq(3).click() - cy.get(".spectrum-Popover").contains("COUNTRIES").click() - cy.get(".spectrum-Picker").eq(4).click() - cy.get(".spectrum-Popover").contains("COUNTRY_ID").click() - cy.get(".spectrum-Picker").eq(5).click() - cy.get(".spectrum-Popover").contains("REGION_ID").click() - // Save relationship & reload page - cy.get(".spectrum-Button").contains("Save").click({ force: true }) - cy.reload() - }) - // Confirm table length & relationship name - cy.get(".spectrum-Table") - .eq(1) - .find(".spectrum-Table-row") - .its("length") - .should("eq", 2) - cy.get(".spectrum-Table-cell").should( - "contain", - "LOCATIONS through COUNTRIES → REGIONS" - ) - }) - - xit("should delete relationships", () => { - // Delete both relationships - cy.get(".spectrum-Table") - .eq(1) - .find(".spectrum-Table-row") - .its("length") - .then(len => { - for (let i = 0; i < len; i++) { - cy.get(".spectrum-Table") - .eq(1) - .within(() => { - cy.get(".spectrum-Table-row").eq(0).click() - }) - cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => { - cy.get(".spectrum-Button") - .contains("Delete") - .click({ force: true }) - }) - cy.reload() - } - // Confirm relationships no longer exist - cy.get(".spectrum-Body").should( - "contain", - "No relationships configured" - ) - }) - }) - - xit("should add a query", () => { - // Add query - cy.get(".spectrum-Button").contains("Add query").click({ force: true }) - cy.get(".spectrum-Form-item") - .eq(0) - .within(() => { - cy.get("input").type(queryName) - }) - // Insert Query within Fields section - cy.get(".CodeMirror textarea") - .eq(0) - .type("SELECT * FROM JOBS", { force: true }) - // Intercept query execution - cy.intercept("**/queries/preview").as("query") - cy.get(".spectrum-Button").contains("Run Query").click({ force: true }) - cy.wait(500) - cy.wait("@query") - // Assert against Status Code & Body - cy.get("@query").its("response.statusCode").should("eq", 200) - cy.get("@query").its("response.body").should("not.be.empty") - // Save query - cy.get(".spectrum-Button").contains("Save Query").click({ force: true }) - cy.get(".nav-item").should("contain", queryName) - }) - - xit("should duplicate a query", () => { - // Get query nav item - cy.get(".nav-item") - .contains(queryName) - .parent() - .within(() => { - cy.get(".spectrum-Icon").eq(1).click({ force: true }) - }) - // Select and confirm duplication - cy.get(".spectrum-Menu").contains("Duplicate").click() - cy.get(".nav-item").should("contain", queryName + " (1)") - }) - - xit("should edit a query name", () => { - // Rename query - cy.get(".spectrum-Form-item") - .eq(0) - .within(() => { - cy.get("input").clear().type(queryRename) - }) - // Save query - cy.get(".spectrum-Button").contains("Save Query").click({ force: true }) - cy.get(".nav-item").should("contain", queryRename) - }) - - xit("should delete a query", () => { - // Get query nav item - QueryName - cy.get(".nav-item") - .contains(queryName) - .parent() - .within(() => { - cy.get(".spectrum-Icon").eq(1).click({ force: true }) - }) - - // Select Delete - cy.get(".spectrum-Menu").contains("Delete").click() - cy.get(".spectrum-Button") - .contains("Delete Query") - .click({ force: true }) - - // Confirm deletion - cy.get(".nav-item", { timeout: 1000 }).should("not.contain", queryName) - }) - } - }) -}) diff --git a/packages/builder/cypress/integration/datasources/postgreSql.spec.js b/packages/builder/cypress/integration/datasources/postgreSql.spec.js deleted file mode 100644 index e1aa0ff128..0000000000 --- a/packages/builder/cypress/integration/datasources/postgreSql.spec.js +++ /dev/null @@ -1,283 +0,0 @@ -import filterTests from "../../support/filterTests" - -filterTests(["all"], () => { - xcontext("PostgreSQL Datasource Testing", () => { - if (Cypress.env("TEST_ENV")) { - before(() => { - cy.login() - cy.createTestApp() - }) - const datasource = "PostgreSQL" - const queryName = "Cypress Test Query" - const queryRename = "CT Query Rename" - - xit("Should add PostgreSQL datasource without configuration", () => { - // Select PostgreSQL datasource - cy.selectExternalDatasource(datasource) - // Attempt to fetch tables without applying configuration - cy.intercept("**/datasources").as("datasource") - cy.get(".spectrum-Button") - .contains("Save and fetch tables") - .click({ force: true }) - // Intercept Request after button click & apply assertions - cy.wait("@datasource") - cy.get("@datasource") - .its("response.body") - .should("have.property", "status", 500) - cy.get(".spectrum-Button").contains("Skip table fetch").click({ force: true }) - }) - - it("should add PostgreSQL datasource and fetch tables", () => { - // Add & configure PostgreSQL datasource - cy.selectExternalDatasource(datasource) - cy.intercept("**/datasources").as("datasource") - cy.addDatasourceConfig(datasource) - // Check response from datasource after adding configuration - cy.wait("@datasource") - cy.get("@datasource").its("response.statusCode").should("eq", 200) - cy.wait(2000) - // Confirm fetch tables was successful - cy.get(".spectrum-Table") - .eq(0) - .find(".spectrum-Table-row") - .its("length") - .should("be.gt", 0) - }) - - it("should define a One relationship type", () => { - // Select relationship type & configure - cy.get(".spectrum-Button") - .contains("Define relationship") - .click({ force: true }) - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Picker").eq(0).click() - cy.get(".spectrum-Popover").contains("One").click() - cy.get(".spectrum-Picker").eq(1).click() - cy.get(".spectrum-Popover").contains("REGIONS").click() - cy.get(".spectrum-Picker").eq(2).click() - cy.get(".spectrum-Popover").contains("REGION_ID").click() - cy.get(".spectrum-Picker").eq(3).click() - cy.get(".spectrum-Popover").contains("COUNTRIES").click() - cy.get(".spectrum-Picker").eq(4).click() - cy.get(".spectrum-Popover").contains("REGION_ID").click() - // Save relationship & reload page - cy.get(".spectrum-Button").contains("Save").click({ force: true }) - cy.reload() - }) - // Confirm table length & column name - cy.get(".spectrum-Table") - .eq(1) - .find(".spectrum-Table-row") - .its("length") - .should("eq", 1) - cy.get(".spectrum-Table-cell").should("contain", "COUNTRIES to REGIONS") - }) - - it("should define a Many relationship type", () => { - // Select relationship type & configure - cy.get(".spectrum-Button") - .contains("Define relationship") - .click({ force: true }) - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Picker").eq(0).click() - cy.get(".spectrum-Popover").contains("Many").click() - cy.get(".spectrum-Picker").eq(1).click() - cy.get(".spectrum-Popover").contains("LOCATIONS").click() - cy.get(".spectrum-Picker").eq(2).click() - cy.get(".spectrum-Popover").contains("REGIONS").click() - cy.get(".spectrum-Picker").eq(3).click() - cy.get(".spectrum-Popover").contains("COUNTRIES").click() - cy.get(".spectrum-Picker").eq(4).click() - cy.get(".spectrum-Popover").contains("COUNTRY_ID").click() - cy.get(".spectrum-Picker").eq(5).click() - cy.get(".spectrum-Popover").contains("REGION_ID").click() - // Save relationship & reload page - cy.get(".spectrum-Button").contains("Save").click({ force: true }) - cy.reload() - }) - // Confirm table length & relationship name - cy.get(".spectrum-Table") - .eq(1) - .find(".spectrum-Table-row") - .its("length") - .should("eq", 2) - cy.get(".spectrum-Table-cell").should( - "contain", - "LOCATIONS through COUNTRIES → REGIONS" - ) - }) - - it("should delete a relationship", () => { - cy.get(".hierarchy-items-container").contains("PostgreSQL").click({ force: true }) - cy.reload() - // Delete one relationship - cy.get(".spectrum-Table") - .eq(1) - .within(() => { - cy.get(".spectrum-Table-cell").eq(0).click({ force: true }) - }) - cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => { - cy.get(".spectrum-Button").contains("Delete").click({ force: true }) - }) - cy.reload() - cy.wait(500) - // Confirm relationship was deleted - cy.get(".spectrum-Table") - .eq(1) - .find(".spectrum-Table-row") - .its("length") - .should("eq", 1) - }) - - it("should add a query", () => { - // Add query - cy.get(".spectrum-Button").contains("Add query").click({ force: true }) - cy.get(".spectrum-Form-item") - .eq(0) - .within(() => { - cy.get("input").type(queryName) - }) - // Insert Query within Fields section - cy.get(".CodeMirror textarea") - .eq(0) - .type("SELECT * FROM books", { force: true }) - // Intercept query execution - cy.intercept("**/queries/preview").as("query") - cy.get(".spectrum-Button").contains("Run Query").click({ force: true }) - cy.wait(500) - cy.wait("@query") - // Assert against Status Code & Body - cy.get("@query").its("response.statusCode").should("eq", 200) - cy.get("@query").its("response.body").should("not.be.empty") - // Save query - cy.intercept("**/queries").as("saveQuery") - cy.get(".spectrum-Button").contains("Save Query").click({ force: true }) - cy.wait("@saveQuery") - cy.get(".spectrum-Tabs-content", { timeout: 2000 }).should("contain", queryName) - }) - - it("should switch to schema with no tables", () => { - // Switch Schema - To one without any tables - cy.get(".hierarchy-items-container").contains("PostgreSQL").click({ force: true }) - switchSchema("randomText") - - // No tables displayed - cy.get(".spectrum-Body", { timeout: 10000 }).eq(2, { timeout: 10000 }).should("contain", "No tables found") - - // Previously created query should be visible - cy.get(".spectrum-Table").should("contain", queryName) - }) - - it("should switch schemas", () => { - // Switch schema - To one with tables - switchSchema("1") - - // Confirm tables exist - Check for specific one - cy.get(".spectrum-Table", { timeout: 20000 }).eq(0).should("contain", "test") - cy.get(".spectrum-Table") - .eq(0) - .find(".spectrum-Table-row") - .its("length") - .should("eq", 1) - - // Confirm specific table visible within left nav bar - cy.get(".hierarchy-items-container").should("contain", "test") - - // Switch back to public schema - switchSchema("public") - - // Confirm tables exist - again - cy.get(".spectrum-Table", { timeout: 20000 }).eq(0).should("contain", "REGIONS") - cy.get(".spectrum-Table") - .eq(0) - .find(".spectrum-Table-row") - .its("length") - .should("be.gt", 1) - - // Confirm specific table visible within left nav bar - cy.get(".hierarchy-items-container").should("contain", "REGIONS") - - // No relationships and one query - cy.get(".spectrum-Body") - .eq(3) - .should("contain", "No relationships configured.") - cy.get(".spectrum-Table").eq(1).should("contain", queryName) - }) - - it("should duplicate a query", () => { - // Locate previously created query - cy.get(".nav-item") - .contains(queryName) - .siblings(".actions") - .within(() => { - cy.get(".spectrum-Icon").click({ force: true }) - }) - // Select and confirm duplication - cy.get(".spectrum-Menu").contains("Duplicate").click() - cy.get(".nav-item").should("contain", queryName + " (1)") - }) - - it("should edit a query name", () => { - // Access query - cy.get(".hierarchy-items-container", { timeout: 2000 }) - //.contains(queryName + " (1)") - .contains(queryName) - .click({ force: true }) - - // Rename query - cy.wait(1000) - cy.get(".spectrum-Form-item", { timeout: 2000 }) - .eq(0) - .within(() => { - cy.get("input").clear().type(queryRename) - }) - - // Click on a nav item and confirm name change - cy.get(".nav-item").first().click() - // Confirm name change - cy.get(".nav-item").should("contain", queryRename) - }) - - it("should delete a query", () => { - // Get query nav item - QueryName - cy.get(".nav-item") - .contains(queryRename) - .parent() - .within(() => { - cy.get(".spectrum-Icon").eq(1).click({ force: true }) - }) - // Select Delete - cy.get(".spectrum-Menu").contains("Delete").click() - cy.get(".spectrum-Button") - .contains("Delete Query") - .click({ force: true }) - // Confirm deletion - cy.reload() - cy.get(".nav-item", { timeout: 30000 }).contains(datasource).click({ force: true }) - cy.get(".nav-item", { timeout: 1000 }).should("not.contain", queryRename) - }) - - const switchSchema = schema => { - // Edit configuration - Change Schema - cy.get(".spectrum-Textfield") - .eq(6) - .within(() => { - cy.get("input").clear().type(schema) - }) - // Save configuration & fetch - cy.get(".spectrum-Button").contains("Save").click({ force: true }) - cy.get(".spectrum-Button") - .contains("Fetch tables") - .click({ force: true }) - // Click fetch tables again within modal - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Button") - .contains("Fetch tables") - .click({ force: true }) - }) - cy.reload() - cy.wait(1000) - } - } - }) -}) diff --git a/packages/builder/cypress/integration/datasources/rest.spec.js b/packages/builder/cypress/integration/datasources/rest.spec.js deleted file mode 100644 index 7f715ae50c..0000000000 --- a/packages/builder/cypress/integration/datasources/rest.spec.js +++ /dev/null @@ -1,45 +0,0 @@ -import filterTests from "../../support/filterTests" - -filterTests(["smoke", "all"], () => { - xcontext("REST Datasource Testing", () => { - before(() => { - cy.login() - cy.createTestApp() - }) - - const datasource = "REST" - const restUrl = "https://api.openbrewerydb.org/breweries" - - it("Should add REST datasource with incorrect API", () => { - // Select REST datasource - cy.selectExternalDatasource(datasource) - // Enter incorrect api & attempt to send query - cy.get(".query-buttons", { timeout: 1000 }).contains("Add query").click({ force: true }) - cy.intercept("**/preview").as("queryError") - cy.get("input").clear().type("random text") - cy.get(".spectrum-Button").contains("Send").click({ force: true }) - // Intercept Request after button click & apply assertions - cy.wait("@queryError") - cy.get("@queryError") - .its("response.body") - .should("have.property", "message", "Invalid URL: http://random text") - cy.get("@queryError") - .its("response.body") - .should("have.property", "status", 400) - }) - - it("should add and configure a REST datasource", () => { - // Select REST datasource and create query - cy.selectExternalDatasource(datasource) - cy.wait(500) - // createRestQuery confirms query creation - cy.createRestQuery("GET", restUrl, "/breweries") - // Confirm status code response within REST datasource - cy.get(".stats", { timeout: 1000 }).within(() => { - cy.get(".spectrum-FieldLabel") - .eq(0) - .should("contain", 200) - }) - }) - }) -}) diff --git a/packages/builder/cypress/integration/queryLevelTransformers.spec.js b/packages/builder/cypress/integration/queryLevelTransformers.spec.js deleted file mode 100644 index 7357bbe905..0000000000 --- a/packages/builder/cypress/integration/queryLevelTransformers.spec.js +++ /dev/null @@ -1,147 +0,0 @@ -import filterTests from "../support/filterTests" -const interact = require("../support/interact") - -filterTests(["smoke", "all"], () => { - context("Query Level Transformers", () => { - before(() => { - cy.login() - cy.createTestApp() - }) - - it("should write a transformer function", () => { - // Add REST datasource - contains API for breweries - const datasource = "REST" - const restUrl = "https://api.openbrewerydb.org/breweries" - cy.selectExternalDatasource(datasource) - cy.createRestQuery("GET", restUrl, "breweries") - cy.reload() - cy.contains(".nav-item-content", "breweries", { timeout: 20000 }).click() - cy.contains(interact.SPECTRUM_TABS_ITEM, "Transformer", { timeout: 5000 }).click({ force: true }) - // Get Transformer Function from file - cy.readFile("cypress/support/queryLevelTransformerFunction.js").then( - transformerFunction => { - cy.get(interact.CODEMIRROR_TEXTAREA, { timeout: 5000 }) - // Highlight current text and overwrite with file contents - .type(Cypress.platform === "darwin" ? "{cmd}a" : "{ctrl}a", { - force: true, - }) - .type(transformerFunction, { parseSpecialCharSequences: false }) - } - ) - // Send Query - cy.intercept("**/queries/preview").as("query") - cy.get(interact.SPECTRUM_BUTTON).contains("Save").click({ force: true }) - cy.get(interact.SPECTRUM_BUTTON).contains("Send").click({ force: true }) - cy.wait("@query") - // Assert against Status Code, body, & body rows - cy.get("@query").its("response.statusCode").should("eq", 200) - cy.get("@query").its("response.body").should("not.be.empty") - cy.get("@query").its("response.body.rows").should("not.be.empty") - }) - - it("should add data to the previous query", () => { - // Add REST datasource - contains API for breweries - const datasource = "REST" - const restUrl = "https://api.openbrewerydb.org/breweries" - cy.selectExternalDatasource(datasource) - cy.createRestQuery("GET", restUrl, "breweries") - cy.reload() - cy.contains(".nav-item-content", "breweries", { timeout: 2000 }).click() - cy.contains(interact.SPECTRUM_TABS_ITEM, "Transformer", { timeout: 5000 }).click({ force: true }) - // Get Transformer Function with Data from file - cy.readFile( - "cypress/support/queryLevelTransformerFunctionWithData.js" - ).then(transformerFunction => { - //console.log(transformerFunction[1]) - cy.get(interact.CODEMIRROR_TEXTAREA) - // Highlight current text and overwrite with file contents - .type(Cypress.platform === "darwin" ? "{cmd}a" : "{ctrl}a", { - force: true, - }) - .type(transformerFunction, { parseSpecialCharSequences: false }) - }) - // Send Query - cy.intercept("**/queries/preview").as("query") - cy.get(interact.SPECTRUM_BUTTON).contains("Send").click({ force: true }) - cy.wait("@query") - // Assert against Status Code, body, & body rows - cy.get("@query").its("response.statusCode").should("eq", 200) - cy.get("@query").its("response.body").should("not.be.empty") - cy.get("@query").its("response.body.rows").should("not.be.empty") - }) - - it("should run an invalid query within the transformer section", () => { - // Add REST datasource - contains API for breweries - const datasource = "REST" - const restUrl = "https://api.openbrewerydb.org/breweries" - cy.selectExternalDatasource(datasource) - cy.createRestQuery("GET", restUrl, "breweries") - cy.reload() - cy.contains(".nav-item-content", "breweries", { timeout: 10000 }).click() - cy.contains(interact.SPECTRUM_TABS_ITEM, "Transformer", { timeout: 5000 }).click({ force: true }) - // Clear the code box and add "test" - cy.get(interact.CODEMIRROR_TEXTAREA) - .type(Cypress.platform === "darwin" ? "{cmd}a" : "{ctrl}a", { - force: true, - }) - .type("test") - // Run Query and intercept - cy.intercept("**/preview").as("queryError") - cy.get(interact.SPECTRUM_BUTTON).contains("Send").click({ force: true }) - cy.wait("@queryError") - cy.wait(500) - // Assert against message and status for the query error - cy.get("@queryError") - .its("response.body") - .should("have.property", "message", "test is not defined") - cy.get("@queryError") - .its("response.body") - .should("have.property", "status", 400) - }) - - xit("should run an invalid query via POST request", () => { - // POST request with transformer as null - cy.request({ - method: "POST", - url: `${Cypress.config().baseUrl}/api/queries/`, - body: { - fields: { headers: {}, queryString: null, path: null }, - parameters: [], - schema: {}, - name: "test", - queryVerb: "read", - transformer: null, - datasourceId: "test", - }, - // Expected 400 error - Transformer must be a string - failOnStatusCode: false, - }).then(response => { - expect(response.status).to.equal(400) - expect(response.body.message).to.include( - 'Invalid body - "transformer" must be a string' - ) - }) - }) - - xit("should run an empty query", () => { - // POST request with Transformer as an empty string - cy.request({ - method: "POST", - url: `${Cypress.config().baseUrl}/api/queries/preview`, - body: { - fields: { headers: {}, queryString: null, path: null }, - queryVerb: "read", - transformer: "", - datasourceId: "test", - }, - // Expected 400 error - Transformer is not allowed to be empty - failOnStatusCode: false, - }).then(response => { - expect(response.status).to.equal(400) - expect(response.body.message).to.include( - 'Invalid body - "transformer" is not allowed to be empty' - ) - }) - }) - }) -}) diff --git a/packages/builder/cypress/integration/renameAnApplication.spec.js b/packages/builder/cypress/integration/renameAnApplication.spec.js deleted file mode 100644 index 6e432e476b..0000000000 --- a/packages/builder/cypress/integration/renameAnApplication.spec.js +++ /dev/null @@ -1,112 +0,0 @@ -import filterTests from "../support/filterTests" -const interact = require("../support/interact") - -filterTests(["all"], () => { - xcontext("Rename an App", () => { - beforeEach(() => { - cy.login() - cy.createTestApp() - }) - - it("should rename an unpublished application", () => { - const appName = "Cypress Tests" - const appRename = "Cypress Renamed" - // Rename app, Search for app, Confirm name was changed - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - renameApp(appName, appRename) - cy.reload() - cy.searchForApplication(appRename) - cy.get(interact.APP_TABLE).find(interact.TITLE).should("have.length", 1) - cy.applicationInAppTable(appRename) - // Set app name back to Cypress Tests - cy.reload() - renameApp(appRename, appName) - }) - - xit("Should rename a published application", () => { - // It is not possible to rename a published application - const appName = "Cypress Tests" - const appRename = "Cypress Renamed" - // Publish the app - cy.get(interact.TOP_RIGHT_NAV) - cy.get(interact.SPECTRUM_BUTTON) - .contains("Publish") - .click({ force: true }) - cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => { - // Click publish again within the modal - cy.get(interact.SPECTRUM_BUTTON) - .contains("Publish") - .click({ force: true }) - }) - // Rename app, Search for app, Confirm name was changed - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - renameApp(appName, appRename, true) - cy.get(interact.APP_TABLE).find(interact.WRAPPER).should("have.length", 1) - cy.applicationInAppTable(appRename) - }) - - it("Should try to rename an application to have no name", () => { - const appName = "Cypress Tests" - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - renameApp(appName, " ", false, true) - // Close modal and confirm name has not been changed - cy.get(interact.SPECTRUM_DIALOG_GRID, { timeout: 1000 }).contains("Cancel").click() - cy.applicationInAppTable(appName) - }) - - xit("Should create two applications with the same name", () => { - // It is not possible to have applications with the same name - const appName = "Cypress Tests" - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - cy.get(interact.SPECTRUM_BUTTON), { timeout: 500 } - .contains("Create app") - .click({ force: true }) - cy.contains(/Start from scratch/).click() - cy.get(interact.SPECTRUM_MODAL).within(() => { - cy.get("input").eq(0).type(appName) - cy.get(interact.SPECTRUM_BUTTON_GROUP) - .contains("Create app") - .click({ force: true }) - cy.get(interact.ERROR).should( - "have.text", - "Another app with the same name already exists" - ) - }) - }) - - it("should validate application names", () => { - // App name must be letters, numbers and spaces only - // This test checks numbers and special characters specifically - const appName = "Cypress Tests" - const numberName = 12345 - const specialCharName = "£$%^" - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 5000 }) - renameApp(appName, numberName) - cy.applicationInAppTable(numberName) - renameApp(numberName, specialCharName) - cy.get(interact.ERROR).should( - "have.text", - "App name must be letters, numbers and spaces only" - ) - // Set app name back to Cypress Tests - renameApp(numberName, appName) - }) - - const renameApp = (originalName, changedName, published, noName) => { - cy.searchForApplication(originalName) - cy.get(interact.APP_TABLE, { timeout: 1000 }).within(() => { - cy.get(".app-row-actions button") - .contains("Manage") - .eq(0) - .click({ force: true }) - }) - cy.get(".spectrum-Tabs-item").contains("Settings").click() - cy.get(".spectrum-Tabs-item.is-selected").contains("Settings") - cy.get(".settings-tab").should("be.visible") - cy.get(".details-section .page-action button") - .contains("Edit") - .click({ force: true }) - cy.updateAppName(changedName, noName) - } - }) -}) diff --git a/packages/builder/cypress/integration/revertApp.spec.js b/packages/builder/cypress/integration/revertApp.spec.js deleted file mode 100644 index 2cd806b02c..0000000000 --- a/packages/builder/cypress/integration/revertApp.spec.js +++ /dev/null @@ -1,75 +0,0 @@ -import filterTests from "../support/filterTests" -const interact = require('../support/interact') - -filterTests(['smoke', 'all'], () => { - xcontext("Revert apps", () => { - before(() => { - cy.login() - cy.createTestApp() - }) - - it("should try to revert an unpublished app", () => { - // Click revert icon - cy.get(interact.TOP_RIGHT_NAV).within(() => { - cy.get(interact.AREA_LABEL_REVERT).click({ force: true }) - }) - cy.get(interact.SPECTRUM_MODAL).within(() => { - // Enter app name before revert - cy.get(interact.SPECTRUM_TEXTFIELD_INPUT).type("Cypress Tests") - cy.intercept('**/revert').as('revertApp') - // Click Revert - cy.get(interact.SPECTRUM_BUTTON).contains("Revert").click({ force: true }) - // Intercept Request after button click & apply assertions - cy.wait("@revertApp") - cy.get("@revertApp").its('response.body').should('have.property', 'message', "App has not yet been deployed") - cy.get("@revertApp").its('response.body').should('have.property', 'status', 400) - }) - }) - - it("should revert a published app", () => { - cy.navigateToFrontend() - - // Add initial component - Paragraph - cy.searchAndAddComponent("Paragraph") - // Publish app - cy.get(interact.SPECTRUM_BUTTON).contains("Publish").click({ force: true }) - cy.get(interact.SPECTRUM_BUTTON_GROUP).within(() => { - cy.get(interact.SPECTRUM_BUTTON).contains("Publish").click({ force: true }) - }) - cy.wait(1000) // Wait for next modal to finish loading - cy.get(interact.SPECTRUM_BUTTON_GROUP, { timeout: 1000 }).within(() => { - cy.get(interact.SPECTRUM_BUTTON).contains("Done").click({ force: true }) - }) - - // Add second component - Button - cy.searchAndAddComponent("Button") - // Click Revert - cy.get(interact.TOP_RIGHT_NAV).within(() => { - cy.get(interact.AREA_LABEL_REVERT).click({ force: true }) - }) - cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => { - cy.get("input").type("Cypress Tests") - // Click Revert - cy.get(interact.SPECTRUM_BUTTON).contains("Revert").click({ force: true }) - cy.wait(2000) // Wait for app to finish reverting - }) - // Confirm Paragraph component is still visible - cy.get(interact.ROOT, { timeout: 1000 }).contains("New Paragraph") - // Confirm Button component is not visible - cy.get(interact.ROOT, { timeout: 1000 }).should("not.have.text", "New Button") - }) - - it("should enter incorrect app name when reverting", () => { - // Click Revert - cy.get(interact.TOP_RIGHT_NAV, { timeout: 1000 }).within(() => { - cy.get(interact.AREA_LABEL_REVERT).click({ force: true }) - }) - // Enter incorrect app name - cy.get(interact.SPECTRUM_DIALOG_GRID).within(() => { - cy.get("input").type("Cypress Tests") - // Revert button within modal should be disabled - cy.get(interact.SPECTRUM_BUTTON).eq(1).should('be.disabled') - }) - }) - }) -}) diff --git a/packages/builder/cypress/plugins/index.js b/packages/builder/cypress/plugins/index.js deleted file mode 100644 index 771ba886b5..0000000000 --- a/packages/builder/cypress/plugins/index.js +++ /dev/null @@ -1,23 +0,0 @@ -/// -// *********************************************************** -// This example plugins/index.js can be used to load plugins -// -// You can change the location of this file or turn off loading -// the plugins file with the 'pluginsFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/plugins-guide -// *********************************************************** - -// This function is called when a project is opened or re-opened (e.g. due to -// the project's config changing) - -/** - * @type {Cypress.PluginConfig} - */ -// eslint-disable-next-line no-unused-vars -module.exports = (on, config) => { - // `on` is used to hook into various events Cypress emits - // `config` is the resolved Cypress config - require("cypress-terminal-report/src/installLogsPrinter")(on) -} diff --git a/packages/builder/cypress/setup.js b/packages/builder/cypress/setup.js deleted file mode 100644 index 0e2f25b028..0000000000 --- a/packages/builder/cypress/setup.js +++ /dev/null @@ -1,45 +0,0 @@ -const cypressConfig = require("../cypress.json") - -// normal development system -const SERVER_PORT = cypressConfig.env.PORT -const WORKER_PORT = cypressConfig.env.WORKER_PORT - -if (!process.env.NODE_ENV) { - process.env.NODE_ENV = "cypress" -} -process.env.ENABLE_ANALYTICS = "0" -process.env.JWT_SECRET = cypressConfig.env.JWT_SECRET -process.env.SELF_HOSTED = 1 -process.env.WORKER_URL = `http://localhost:${WORKER_PORT}/` -process.env.APPS_URL = `http://localhost:${SERVER_PORT}/` -process.env.MINIO_URL = `http://localhost:4004` -process.env.MINIO_ACCESS_KEY = "budibase" -process.env.MINIO_SECRET_KEY = "budibase" -process.env.COUCH_DB_USER = "budibase" -process.env.COUCH_DB_PASSWORD = "budibase" -process.env.INTERNAL_API_KEY = "budibase" -process.env.ALLOW_DEV_AUTOMATIONS = 1 - -// Stop info logs polluting test outputs -process.env.LOG_LEVEL = "error" - -exports.run = ( - serverLoc = "../../server/dist", - workerLoc = "../../worker/dist" -) => { - // require("dotenv").config({ path: resolve(dir, ".env") }) - // don't make this a variable or top level require - // it will cause environment module to be loaded prematurely - - // override the port with the worker port temporarily - process.env.PORT = WORKER_PORT - require(workerLoc) - - // override the port with the server port - process.env.PORT = SERVER_PORT - require(serverLoc) -} - -if (require.main === module) { - exports.run() -} diff --git a/packages/builder/cypress/support/commands.js b/packages/builder/cypress/support/commands.js deleted file mode 100644 index e63fd41591..0000000000 --- a/packages/builder/cypress/support/commands.js +++ /dev/null @@ -1,945 +0,0 @@ -Cypress.on("uncaught:exception", () => { - return false -}) - -// ACCOUNTS & USERS -Cypress.Commands.add("login", (email, password) => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 }) - cy.url() - .should("include", "/builder/") - .then(url => { - if (url.includes("builder/admin")) { - // create admin user - cy.get("input").first().type("test@test.com") - cy.get('input[type="password"]').first().type("test") - cy.get('input[type="password"]').eq(1).type("test") - cy.contains("Create super admin user").click({ force: true }) - } - if (url.includes("builder/auth") || url.includes("builder/admin")) { - // login - cy.contains("Sign in to Budibase").then(() => { - if (email == null) { - cy.get("input").first().type("test@test.com") - cy.get('input[type="password"]').type("test") - } else { - cy.get("input").first().type(email) - cy.get('input[type="password"]').type(password) - } - cy.get("button").first().click({ force: true }) - cy.wait(1000) - }) - } - }) -}) - -Cypress.Commands.add("logOut", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 }) - cy.get(".user-dropdown .avatar > .icon").click({ force: true }) - cy.get(".spectrum-Popover[data-cy='user-menu']").within(() => { - cy.get("li[data-cy='user-logout']").click({ force: true }) - }) - cy.wait(2000) -}) - -Cypress.Commands.add("logoutNoAppGrid", () => { - // Logs user out when app grid is not present - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 }) - cy.get(".avatar > .icon").click({ force: true }) - cy.get(".spectrum-Popover[data-cy='user-menu']").within(() => { - cy.get(".spectrum-Menu-item").contains("Log out").click({ force: true }) - }) - cy.wait(2000) -}) - -Cypress.Commands.add("createUser", (email, permission) => { - cy.contains("Users").click() - cy.get(`[data-cy="add-user"]`).click() - cy.get(".spectrum-Dialog-grid").within(() => { - // Enter email - cy.get(".spectrum-Textfield-input").clear().click().type(email) - - // Select permission, if applicable - // Default is App User - if (permission != null) { - cy.get(".spectrum-Picker-label").click() - cy.get(".spectrum-Menu").within(() => { - cy.get(".spectrum-Menu-item") - .contains(permission) - .click({ force: true }) - }) - } - // Add user - cy.get(".spectrum-Button").contains("Add users").click({ force: true }) - cy.get(".spectrum-ActionButton").contains("Add email").should("not.exist") - }) - // Onboarding modal - cy.get(".spectrum-Dialog-grid", { timeout: 5000 }).contains( - "Choose your onboarding" - ) - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".onboarding-type").eq(1).click() - cy.get(".spectrum-Button").contains("Done").click({ force: true }) - cy.get(".spectrum-Button").contains("Cancel").should("not.exist") - }) - - // Accounts created modal - Click Done button - cy.get(".spectrum-Button").contains("Done").click({ force: true }) -}) - -Cypress.Commands.add("deleteUser", email => { - // Assumes user has access to Users section - cy.contains("Users", { timeout: 2000 }).click() - cy.contains(email).click() - - cy.get(".title").within(() => { - cy.get(".spectrum-Icon").click({ force: true }) - }) - cy.get(".spectrum-Menu").within(() => { - cy.get(".spectrum-Menu-item").contains("Delete").click({ force: true }) - }) - cy.get(".spectrum-Dialog-grid").contains("Delete user").click({ force: true }) -}) - -Cypress.Commands.add("updateUserInformation", (firstName, lastName) => { - cy.get(".user-dropdown .icon", { timeout: 2000 }).click({ - force: true, - }) - - cy.get(".spectrum-Popover[data-cy='user-menu']").within(() => { - cy.get("li[data-cy='user-info']").click({ force: true }) - }) - - cy.get(".spectrum-Modal.is-open").within(() => { - cy.get("[data-cy='user-first-name']").clear() - - if (!firstName || firstName == "") { - cy.get("[data-cy='user-first-name']").invoke("val").should("be.empty") - } else { - cy.get("[data-cy='user-first-name']") - .type(firstName) - .should("have.value", firstName) - .blur() - } - - cy.get("[data-cy='user-last-name']").clear() - - if (!lastName || lastName == "") { - cy.get("[data-cy='user-last-name']").invoke("val").should("be.empty") - } else { - cy.get("[data-cy='user-last-name']") - .type(lastName) - .should("have.value", lastName) - .blur() - } - cy.get(".confirm-wrap").within(() => { - cy.get("button").contains("Save").click({ force: true }) - }) - cy.get(".spectrum-Dialog-grid").should("not.exist") - }) -}) - -Cypress.Commands.add("setUserRole", (user, role) => { - cy.contains("Users").click() - cy.contains(user).click() - - // Set Role - cy.wait(500) - cy.get(".spectrum-Form-itemField") - .eq(3) - .within(() => { - cy.get(".spectrum-Picker-label").click({ force: true }) - }) - cy.get(".spectrum-Menu").within(() => { - cy.get(".spectrum-Menu-itemLabel").contains(role).click({ force: true }) - }) - cy.get(".spectrum-Form-itemField").eq(3).should("contain", role) -}) - -// APPLICATIONS -Cypress.Commands.add("createTestApp", () => { - const appName = "Cypress Tests" - cy.deleteApp(appName) - cy.createApp(appName, "This app is used for Cypress testing.") -}) - -Cypress.Commands.add("createApp", (name, addDefaultTable) => { - const shouldCreateDefaultTable = - typeof addDefaultTable != "boolean" ? true : addDefaultTable - - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 }) - cy.url({ timeout: 30000 }).should("include", "/apps") - cy.get(`[data-cy="create-app-btn"]`, { timeout: 5000 }).click({ force: true }) - - // If apps already exist - cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`, { - timeout: 5000, - }) - .its("body") - .then(val => { - if (val.length > 0) { - cy.get(`[data-cy="create-app-btn"]`, { timeout: 5000 }).click({ - force: true, - }) - } - }) - - cy.get(".spectrum-Modal").within(() => { - cy.get("input").eq(0).should("have.focus") - if (name && name != "") { - cy.get("input").eq(0).clear() - cy.get("input").eq(0).type(name).should("have.value", name).blur() - } - cy.get(".spectrum-ButtonGroup") - .contains("Create app") - .click({ force: true }) - cy.wait(2000) - }) - if (shouldCreateDefaultTable) { - cy.createTable("Cypress Tests", true) - } -}) - -Cypress.Commands.add("deleteApp", name => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 }) - cy.wait(2000) - cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`) - .its("body") - .then(val => { - const findAppName = val.some(val => val.name == name) - if (findAppName) { - if (val.length > 0) { - const appId = val.reduce((acc, app) => { - if (name === app.name) { - acc = app.appId - } - return acc - }, "") - - if (appId == "") { - return - } - - // Go to app overview - const appIdParsed = appId.split("_").pop() - const actionEleId = `[data-cy=row_actions_${appIdParsed}]` - cy.get(actionEleId).click() - cy.get(`[aria-label="ShowMenu"]`).click() - cy.get(".spectrum-Menu").within(() => { - cy.contains("Overview").click() - }) - - cy.wait(500) - - // Unpublish first if needed - cy.get(`[data-cy="app-status"]`).then($status => { - if ($status.text().includes("- Unpublish")) { - // Exact match for Unpublish - cy.contains("Unpublish").click({ force: true }) - cy.get(".spectrum-Modal").within(() => { - cy.contains("Unpublish app").click({ force: true }) - }) - } - }) - - // Delete app - cy.get(".app-overview-actions-icon").within(() => { - cy.get(".spectrum-Icon").click({ force: true }) - }) - cy.get(".spectrum-Menu").contains("Delete").click({ force: true }) - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get("input").type(name) - }) - cy.get(".spectrum-Button--warning").click() - } else { - return - } - } else { - return - } - }) -}) - -Cypress.Commands.add("deleteAllApps", () => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 }) - cy.wait(500) - cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`, { - timeout: 5000, - }) - .its("body") - .then(val => { - for (let i = 0; i < val.length; i++) { - cy.deleteApp(val[i].name) - cy.reload() - } - }) -}) - -Cypress.Commands.add("unlockApp", unlock_config => { - let config = { ...unlock_config } - - cy.get(".spectrum-Modal .spectrum-Dialog[data-cy='app-lock-modal']") - .should("be.visible") - .within(() => { - if (config.owned) { - cy.get(".spectrum-Dialog-heading").contains("Locked by you") - cy.get(".lock-expiry-body").contains( - "This lock will expire in 10 minutes from now" - ) - - cy.intercept("**/lock").as("unlockApp") - cy.get(".spectrum-Button") - .contains("Release Lock") - .click({ force: true }) - cy.wait("@unlockApp") - cy.get("@unlockApp").its("response.statusCode").should("eq", 200) - cy.get("@unlockApp").its("response.body").should("deep.equal", { - message: "Lock released successfully.", - }) - } else { - //Show the name ? - cy.get(".lock-expiry-body").should("not.be.visible") - cy.get(".spectrum-Button").contains("Done") - } - }) -}) - -Cypress.Commands.add("updateAppName", (changedName, noName) => { - cy.get(".spectrum-Modal").within(() => { - if (noName == true) { - cy.get("input").clear() - cy.get(".spectrum-Dialog-grid") - .click() - .contains("App name must be letters, numbers and spaces only") - return cy - } - cy.get("input").clear() - cy.get("input") - .eq(0) - .type(changedName) - .should("have.value", changedName) - .blur() - cy.get(".spectrum-ButtonGroup").contains("Save").click({ force: true }) - cy.wait(500) - }) -}) - -Cypress.Commands.add("publishApp", resolvedAppPath => { - // Assumes you have navigated to an application first - cy.get(".toprightnav button.spectrum-Button") - .contains("Publish") - .click({ force: true }) - - cy.get(".spectrum-Modal [data-cy='deploy-app-modal']") - .should("be.visible") - .within(() => { - cy.get(".spectrum-Button").contains("Publish").click({ force: true }) - cy.wait(1000) - }) - - // Verify that the app url is presented correctly to the user - cy.get(".spectrum-Modal [data-cy='deploy-app-success-modal']") - .should("be.visible") - .within(() => { - let appUrl = Cypress.config().baseUrl + "/app/" + resolvedAppPath - cy.get("[data-cy='deployed-app-url'] input").should("have.value", appUrl) - cy.get(".spectrum-Button").contains("Done").click({ force: true }) - }) -}) - -Cypress.Commands.add("alterAppVersion", (appId, version) => { - return cy - .request("put", `${Cypress.config().baseUrl}/api/applications/${appId}`, { - version: version || "0.0.1-alpha.0", - }) - .then(resp => { - expect(resp.status).to.eq(200) - }) -}) - -Cypress.Commands.add("importApp", (exportFilePath, name) => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 }) - - cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`) - .its("body") - .then(val => { - if (val.length > 0) { - cy.get(`[data-cy="create-app-btn"]`).click({ force: true }) - } - cy.wait(500) - cy.get(`[data-cy="import-app-btn"]`).click({ - force: true, - }) - }) - - cy.get(".spectrum-Modal").within(() => { - cy.get("input").eq(1).should("have.focus") - - cy.get(".spectrum-Dropzone").selectFile(exportFilePath, { - action: "drag-drop", - }) - - cy.get(".gallery .filename").contains("exported-app.txt") - - if (name && name != "") { - cy.get("input").eq(0).type(name).should("have.value", name).blur() - } - cy.get(".confirm-wrap button") - .should("not.be.disabled") - .click({ force: true }) - cy.wait(3000) - }) -}) - -// Filters visible with 1 or more -Cypress.Commands.add("searchForApplication", appName => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 }) - cy.wait(2000) - - // No app filter functionality if only 1 app exists - cy.request(`${Cypress.config().baseUrl}/api/applications?status=all`) - .its("body") - .then(val => { - if (val.length < 2) { - return - } else { - // Searches for the app - cy.get(".spectrum-Search").then(() => { - cy.get(".spectrum-Textfield").within(() => { - cy.get("input").eq(0).clear({ force: true }) - cy.get("input").eq(0).type(appName, { force: true }) - }) - }) - } - }) -}) - -// Assumes there are no others -Cypress.Commands.add("applicationInAppTable", appName => { - cy.visit(`${Cypress.config().baseUrl}/builder`, { timeout: 30000 }) - cy.get(".app-table", { timeout: 30000 }).within(() => { - cy.get(".title").contains(appName).should("exist") - }) -}) - -Cypress.Commands.add("createAppFromScratch", appName => { - cy.get(`[data-cy="create-app-btn"]`) - .contains("Start from scratch") - .click({ force: true }) - cy.get(".spectrum-Modal").within(() => { - cy.get("input") - .eq(0) - .clear() - .type(appName) - .should("have.value", appName) - .blur() - cy.get(".spectrum-ButtonGroup").contains("Create app").click() - cy.wait(10000) - }) - cy.createTable("Cypress Tests", true) -}) - -// TABLES -Cypress.Commands.add("createTable", (tableName, initialTable) => { - // Creates an internal Budibase DB table - if (!initialTable) { - cy.navigateToDataSection() - } - cy.get(`[data-cy="new-datasource"]`, { timeout: 20000 }).click() - cy.wait(2000) - cy.get(".item", { timeout: 2000 }) - .contains("Budibase DB") - .click({ force: true }) - .then(() => { - cy.get(".spectrum-Button", { timeout: 2000 }) - .contains("Continue") - .click({ force: true }) - }) - cy.get(".spectrum-Modal").contains("Create Table", { timeout: 10000 }) - cy.get(".spectrum-Modal", { timeout: 2000 }).within(() => { - cy.get("input", { timeout: 2000 }).first().type(tableName).blur() - cy.get(".spectrum-ButtonGroup").contains("Create").click() - }) - // Ensure modal has closed and table is created - cy.get(".spectrum-Modal", { timeout: 2000 }).should("not.exist") - cy.get(".nav-item", { timeout: 2000 }) - .contains("Budibase DB") - .click({ force: true }) - cy.get(".nav-item-content", { timeout: 2000 }).should("contain", tableName) -}) - -Cypress.Commands.add("createTestTableWithData", () => { - cy.createTable("dog") - cy.addColumn("dog", "name", "Text") - cy.addColumn("dog", "age", "Number") -}) - -Cypress.Commands.add( - "addColumn", - (tableName, columnName, type, multiOptions = null) => { - // Select Table - cy.selectTable(tableName) - cy.contains(".nav-item", tableName).click() - cy.contains("Create column").click() - - // Configure column - cy.get(".spectrum-Modal").within(() => { - cy.get("input").first().type(columnName) - - // Unset table display column - cy.contains("display column").click({ force: true }) - cy.get(".spectrum-Picker-label").click() - cy.contains(type).click() - - // Add options for Multi-select Type - if (multiOptions !== null) { - cy.get(".spectrum-Textfield-input").eq(1).type(multiOptions) - } - - cy.contains("Save Column").click() - }) - } -) - -Cypress.Commands.add("addRow", values => { - cy.contains("Create row").click() - cy.get(".spectrum-Modal").within(() => { - for (let i = 0; i < values.length; i++) { - cy.get("input").eq(i).type(values[i]).blur() - } - cy.get(".spectrum-ButtonGroup").contains("Create").click() - }) -}) - -Cypress.Commands.add("addRowMultiValue", values => { - cy.contains("Create row").click() - cy.get(".spectrum-Modal").within(() => { - cy.get(".spectrum-Form-itemField") - .click() - .then(() => { - cy.get(".spectrum-Popover").within(() => { - for (let i = 0; i < values.length; i++) { - cy.get(".spectrum-Menu-item").eq(i).click() - } - }) - cy.get(".spectrum-Dialog-grid").click("top") - cy.get(".spectrum-ButtonGroup").contains("Create").click() - }) - }) -}) - -Cypress.Commands.add("selectTable", tableName => { - cy.get(".nav-item").contains("Budibase DB").click() - cy.contains(".nav-item", tableName).click() -}) - -Cypress.Commands.add("addCustomSourceOptions", totalOptions => { - cy.get('[data-cy="customOptions-prop-control"]').within(() => { - cy.get(".spectrum-ActionButton-label").click({ force: true }) - }) - for (let i = 0; i < totalOptions; i++) { - // Add radio button options - cy.get(".spectrum-Button-label", { timeout: 1000 }) - .contains("Add Option") - .click({ force: true }) - .then(() => { - cy.get("[placeholder='Label']", { timeout: 500 }).eq(i).type(i) - cy.get("[placeholder='Value']").eq(i).type(i) - }) - } - // Save options - cy.get(".spectrum-Button").contains("Save").click({ force: true }) -}) - -// DESIGN SECTION -Cypress.Commands.add("searchAndAddComponent", component => { - // Open component menu - cy.get(".icon-side-nav").within(() => { - cy.get(".icon-side-nav-item").eq(1).click() - }) - cy.get(".add-component > .spectrum-Button") - .contains("Add component") - .click({ force: true }) - cy.get(".container", { timeout: 1000 }).within(() => { - cy.get(".title").should("contain", "Add component") - - // Search and add component - cy.get(".spectrum-Textfield-input").clear().type(component) - cy.get(".body").within(() => { - cy.get(".component") - .contains(new RegExp("^" + component + "$"), { timeout: 3000 }) - .click({ force: true }) - }) - }) - cy.wait(1000) - cy.location().then(loc => { - const params = loc.pathname.split("/") - const componentId = params[params.length - 1] - cy.getComponent(componentId, { timeout: 3000 }).should("exist") - return cy.wrap(componentId) - }) -}) - -Cypress.Commands.add("deleteComponentByName", componentName => { - cy.get(".body") - .eq(0) - .contains(componentName) - .siblings(".actions") - .within(() => { - cy.get(".spectrum-Icon").click({ force: true }) - }) - cy.get(".spectrum-Menu").contains("Delete").click() - cy.get(".spectrum-Dialog").contains("Delete Component").click() -}) - -Cypress.Commands.add("addComponent", (category, component) => { - if (category) { - cy.get(`[data-cy="category-${category}"]`, { timeout: 3000 }).click({ - force: true, - }) - } - cy.wait(500) - if (component) { - cy.get(`[data-cy="component-${component}"]`, { timeout: 3000 }).click({ - force: true, - }) - } - cy.wait(1000) - cy.location().then(loc => { - const params = loc.pathname.split("/") - const componentId = params[params.length - 1] - cy.getComponent(componentId, { timeout: 3000 }).should("exist") - return cy.wrap(componentId) - }) -}) - -Cypress.Commands.add("getComponent", componentId => { - return cy - .get("iframe") - .its("0.contentDocument") - .should("exist") - .its("body") - .should("not.be.undefined") - .then(cy.wrap) - .find(`[data-id='${componentId}']`) -}) - -Cypress.Commands.add("createScreen", (route, accessLevelLabel) => { - // Blank Screen - cy.contains("Design").click() - cy.get(".spectrum-Button").contains("Add screen").click({ force: true }) - cy.get(".spectrum-Modal").within(() => { - cy.get("[data-cy='blank-screen']").click() - cy.get(".spectrum-Button").contains("Continue").click({ force: true }) - }) - cy.wait(500) - cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => { - cy.get(".spectrum-Form-itemField").eq(0).type(route) - cy.get(".confirm-wrap").contains("Continue").click({ force: true }) - }) - - cy.get(".spectrum-Modal", { timeout: 1000 }).within(() => { - if (accessLevelLabel) { - cy.get(".spectrum-Picker-label").click() - cy.wait(500) - cy.contains(accessLevelLabel).click() - } - cy.get(".spectrum-Button").contains("Done").click({ force: true }) - }) -}) - -Cypress.Commands.add( - "createDatasourceScreen", - (datasourceNames, accessLevelLabel) => { - cy.contains("Design").click() - cy.get(".spectrum-Button").contains("Add screen").click({ force: true }) - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get("[data-cy='autogenerated-screens']").click() - cy.intercept("**/api/datasources").as("autoScreens") - cy.get(".spectrum-Button").contains("Continue").click({ force: true }) - cy.wait("@autoScreens") - cy.wait(5000) - }) - cy.get("[data-cy='autogenerated-screens']").should("not.exist") - cy.get("[data-cy='data-source-modal']", { timeout: 10000 }).within(() => { - for (let i = 0; i < datasourceNames.length; i++) { - cy.get(".data-source-entry") - .contains(datasourceNames[i], { timeout: 20000 }) - .click({ force: true }) - // Ensure the check mark is visible - cy.get(".data-source-entry") - .contains(datasourceNames[i]) - .get(".data-source-check", { timeout: 20000 }) - .should("exist") - } - - cy.get(".spectrum-Button").contains("Confirm").click({ force: true }) - }) - - cy.get(".spectrum-Modal", { timeout: 10000 }).within(() => { - if (accessLevelLabel) { - cy.get(".spectrum-Picker-label", { timeout: 10000 }).click() - cy.contains(accessLevelLabel).click() - } - cy.get(".spectrum-Button").contains("Done").click({ force: true }) - }) - - cy.contains("Design").click() - } -) - -Cypress.Commands.add( - "createAutogeneratedScreens", - (screenNames, accessLevelLabel) => { - cy.navigateToAutogeneratedModal() - - for (let i = 0; i < screenNames.length; i++) { - cy.get(".data-source-entry").contains(screenNames[i]).click() - } - - cy.get(".spectrum-Modal").within(() => { - if (accessLevelLabel) { - cy.get(".spectrum-Picker-label").click() - cy.wait(500) - cy.contains(accessLevelLabel).click() - } - cy.get(".spectrum-Button").contains("Confirm").click({ force: true }) - cy.wait(4000) - }) - } -) - -Cypress.Commands.add("filterScreensAccessLevel", accessLevel => { - // Filters screens by access level dropdown - cy.get(".body").within(() => { - cy.get(".spectrum-Form-item").eq(1).click() - }) - cy.get(".spectrum-Menu").within(() => { - cy.contains(accessLevel).click() - }) -}) - -Cypress.Commands.add("deleteScreen", screen => { - // Navigates to Design section and deletes specified screen - cy.contains("Design").click() - cy.get(".body").within(() => { - cy.contains(screen) - .siblings(".actions") - .within(() => { - cy.get(".spectrum-Icon").click({ force: true }) - }) - }) - cy.get(".spectrum-Menu > .spectrum-Menu-item > .spectrum-Menu-itemLabel") - .contains("Delete") - .click() - - cy.get( - ".spectrum-Dialog-grid > .spectrum-ButtonGroup > .confirm-wrap > .spectrum-Button" - ).click({ force: true }) - cy.get(".spectrum-Dialog-grid", { timeout: 10000 }).should("not.exist") -}) - -Cypress.Commands.add("deleteAllScreens", () => { - // Deletes all screens - cy.get(".body") - .find(".nav-item") - .its("length") - .then(len => { - for (let i = 0; i < len; i++) { - cy.get(".body > .nav-item") - .eq(0) - .invoke("text") - .then(text => { - cy.deleteScreen(text.trim()) - }) - } - }) -}) - -// NAVIGATION -Cypress.Commands.add("navigateToFrontend", () => { - // Clicks on Design tab and then the Home nav item - cy.wait(500) - cy.intercept("**/preview").as("preview") - cy.contains("Design").click() - cy.wait("@preview") - cy.get("@preview").then(res => { - if (res.statusCode != 200) { - cy.reload() - } - }) - cy.get(".spectrum-Search", { timeout: 20000 }).type("/") - cy.get(".nav-item", { timeout: 2000 }).contains("home").click({ force: true }) -}) - -Cypress.Commands.add("navigateToDataSection", () => { - // Clicks on the Data tab - cy.wait(500) - cy.contains("Data").click() -}) - -Cypress.Commands.add("navigateToAutogeneratedModal", () => { - // Screen name must already exist within datasource - cy.contains("Design").click() - cy.get(".spectrum-Button").contains("Add screen").click({ force: true }) - cy.get(".spectrum-Modal").within(() => { - cy.get(".item", { timeout: 2000 }) - .contains("Autogenerated screens") - .click({ force: true }) - cy.get(".spectrum-Button").contains("Continue").click({ force: true }) - cy.wait(500) - }) -}) - -// DATASOURCES -Cypress.Commands.add("selectExternalDatasource", datasourceName => { - // Navigates to Data Section - cy.navigateToDataSection() - // Open Datasource modal - cy.get(".container").within(() => { - cy.get("[data-cy='new-datasource']").click() - }) - // Clicks specified datasource & continue - cy.get(".item-list", { timeout: 1000 }).contains(datasourceName).click() - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Button").contains("Continue").click({ force: true }) - }) - cy.wait(500) -}) - -Cypress.Commands.add("addDatasourceConfig", (datasource, skipFetch) => { - // selectExternalDatasource should be called prior to this - // Adds the config for specified datasource & fetches tables - // Currently supports MySQL, PostgreSQL, Oracle - // Host IP Address - cy.get(".spectrum-Dialog-grid", { timeout: 500 }).within(() => { - cy.get(".form-row") - .eq(0) - .within(() => { - cy.get(".spectrum-Textfield").within(() => { - if (datasource == "Oracle") { - cy.get("input").clear().type(Cypress.env("oracle").HOST) - } else { - cy.get("input") - .clear({ force: true }) - .type(Cypress.env("HOST_IP"), { force: true }) - } - }) - }) - }) - // Database Name - cy.get(".spectrum-Dialog-grid").within(() => { - if (datasource == "MySQL") { - cy.get(".form-row") - .eq(4) - .within(() => { - cy.get("input").clear().type(Cypress.env("mysql").DATABASE) - }) - } else { - cy.get(".form-row") - .eq(2) - .within(() => { - if (datasource == "PostgreSQL") { - cy.get("input").clear().type(Cypress.env("postgresql").DATABASE) - } - if (datasource == "Oracle") { - cy.get("input").clear().type(Cypress.env("oracle").DATABASE) - } - }) - } - }) - // User - cy.get(".spectrum-Dialog-grid").within(() => { - if (datasource == "MySQL") { - cy.get(".form-row") - .eq(2) - .within(() => { - cy.get("input").clear().type(Cypress.env("mysql").USER) - }) - } else { - cy.get(".form-row") - .eq(3) - .within(() => { - if (datasource == "PostgreSQL") { - cy.get("input").clear().type(Cypress.env("postgresql").USER) - } - if (datasource == "Oracle") { - cy.get("input").clear().type(Cypress.env("oracle").USER) - } - }) - } - }) - // Password - cy.get(".spectrum-Dialog-grid").within(() => { - if (datasource == "MySQL") { - cy.get(".form-row") - .eq(3) - .within(() => { - cy.get("input").clear().type(Cypress.env("mysql").PASSWORD) - }) - } else { - cy.get(".form-row") - .eq(4) - .within(() => { - if (datasource == "PostgreSQL") { - cy.get("input").clear().type(Cypress.env("postgresql").PASSWORD) - } - if (datasource == "Oracle") { - cy.get("input").clear().type(Cypress.env("oracle").PASSWORD) - } - }) - } - }) - // Click to fetch tables - if (skipFetch) { - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Button") - .contains("Skip table fetch") - .click({ force: true }) - }) - } else { - cy.intercept("**/tables").as("datasourceTables") - cy.get(".spectrum-Dialog-grid").within(() => { - cy.get(".spectrum-Button") - .contains("Save and fetch tables") - .click({ force: true }) - }) - // Wait for tables to be fetched - cy.wait("@datasourceTables", { timeout: 60000 }) - } -}) - -Cypress.Commands.add("createRestQuery", (method, restUrl, queryPrettyName) => { - // addExternalDatasource should be called prior to this - // Configures REST datasource & sends query - cy.get(".spectrum-Button", { timeout: 1000 }) - .contains("Add query") - .click({ force: true }) - // Select Method & add Rest URL - cy.get(".spectrum-Picker-label").eq(1).click() - cy.get(".spectrum-Menu").contains(method).click() - cy.get("input").clear().type(restUrl) - // Send query - cy.get(".spectrum-Button").contains("Send").click({ force: true }) - cy.get(".spectrum-Button", { timeout: 500 }) - .contains("Save") - .click({ force: true }) - cy.get(".hierarchy-items-container") - .should("contain", method) - .and("contain", queryPrettyName) -}) - -// MISC -Cypress.Commands.add("closeModal", () => { - cy.get(".spectrum-Modal", { timeout: 2000 }).within(() => { - cy.get(".close-icon").click() - }) - // Confirm modal has closed - cy.get(".spectrum-Modal", { timeout: 10000 }).should("not.exist") -}) - -Cypress.Commands.add("expandBudibaseConnection", () => { - if (Cypress.$(".nav-item > .content > .opened").length === 0) { - // expand the Budibase DB connection string - cy.get(".icon.arrow").eq(0).click() - } -}) diff --git a/packages/builder/cypress/support/cookies.js b/packages/builder/cypress/support/cookies.js deleted file mode 100644 index 3e2fba6481..0000000000 --- a/packages/builder/cypress/support/cookies.js +++ /dev/null @@ -1,3 +0,0 @@ -Cypress.Cookies.defaults({ - preserve: "budibase:auth", -}) diff --git a/packages/builder/cypress/support/filterTests.js b/packages/builder/cypress/support/filterTests.js deleted file mode 100644 index 074fd05d33..0000000000 --- a/packages/builder/cypress/support/filterTests.js +++ /dev/null @@ -1,16 +0,0 @@ -const filterTests = (testTags, runTest) => { - // testTags is an array of tags - // runTest is all tests - if (Cypress.env("TEST_TAGS")) { - const tags = Cypress.env("TEST_TAGS").split("/") - const found = testTags.some($testTags => tags.includes($testTags)) - - if (found) { - runTest() - } - } else { - runTest() - } -} - -export default filterTests diff --git a/packages/builder/cypress/support/index.js b/packages/builder/cypress/support/index.js deleted file mode 100644 index acd53a1592..0000000000 --- a/packages/builder/cypress/support/index.js +++ /dev/null @@ -1,22 +0,0 @@ -// *********************************************************** -// This example support/index.js is processed and -// loaded automatically before your test files. -// -// This is a great place to put global configuration and -// behavior that modifies Cypress. -// -// You can change the location of this file or turn off -// automatically serving support files with the -// 'supportFile' configuration option. -// -// You can read more here: -// https://on.cypress.io/configuration -// *********************************************************** - -// Import commands.js using ES2015 syntax: -import "./commands" -import "./cookies" - -// Alternatively you can use CommonJS syntax: -// require('./commands') -require("cypress-terminal-report/src/installLogsCollector")() diff --git a/packages/builder/cypress/support/interact.js b/packages/builder/cypress/support/interact.js deleted file mode 100644 index 4f2451ce4b..0000000000 --- a/packages/builder/cypress/support/interact.js +++ /dev/null @@ -1,136 +0,0 @@ -// createApp test -export const CREATE_APP_BUTTON = '[data-cy="create-app-btn"]' -export const TEMPLATE_CATEGORY_FILTER = ".template-category-filters" -export const TEMPLATE_CATEGORY = ".template-categories" -export const APP_TABLE = ".appTable" -export const SPECTRUM_BUTTON_TEMPLATE = ".spectrum-Button" -export const TEMPLATE_CATEGORY_ACTIONGROUP = ".template-category" -export const TEMPLATE_CATEGORY_FILTER_ACTIONBUTTON = - ".template-category-filters .spectrum-ActionButton" -export const SPECTRUM_MODAL = ".spectrum-Modal" -export const APP_NAME_INPUT = "input" // we need to update this with atribute cy-data; -export const SPECTRUM_BUTTON_GROUP = ".spectrum-ButtonGroup" -export const SPECTRUM_MODAL_INPUT = ".spectrum-Modal input" - -//AddMultiOptionDatatype -export const CATEGORY_DATA = '[data-cy="category-Data"]' -export const COMPONENT_DATA_PROVIDER = '[data-cy="component-Data Provider"]' -export const DATASOURCE_PROP_CONTROL = '[data-cy="dataSource-prop-control"]' -export const DROPDOWN = ".dropdown" -export const SPECTRUM_PICKER_LABEL = ".spectrum-Picker-label" -export const DATASOURCE_FIELD_CONTROL = '[data-cy="field-prop-control"]' -export const OPTION_TYPE_PROP_CONTROL = '[data-cy="optionsType-prop-control' - -//AddRadioButtons -export const SPECTRUM_POPOVER = ".spectrum-Popover" -export const OPTION_SOURCE_PROP_CONROL = '[data-cy="optionsSource-prop-control' -export const APP_TABLE_STATUS = ".appTable .app-status" -export const APP_TABLE_ROW_ACTION = ".appTable .app-row-actions" -export const APP_TABLE_APP_NAME = '[data-cy="app-name-link"]' -export const DEPLOYMENT_TOP_NAV_GLOBESTRIKE = - ".deployment-top-nav svg[aria-label=GlobeStrike]" -export const DEPLOYMENT_TOP_GLOBE = ".deployment-top-nav svg[aria-label=Globe]" -export const PUBLISH_POPOVER_MENU = '[data-cy="publish-popover-menu"]' -export const PUBLISH_POPOVER_ACTION = '[data-cy="publish-popover-action"]' -export const PUBLISH_POPOVER_MESSAGE = ".publish-popover-message" -export const SPECTRUM_BUTTON = ".spectrum-Button" -export const SPECTRUM_LINK = ".spectrum-Link" -export const TOPRIGHTNAV_BUTTON_SPECTRUM = ".toprightnav button.spectrum-Button" - -//createComponents -export const SETTINGS = "[data-cy=Settings]" -export const SETTINGS_INPUT = "[data-cy=setting-text] input" -export const DESIGN = "[data-cy=Design]" -export const FONT_SIZE_PROP_CONTROL = "[data-cy=font-size-prop-control]" -export const DATA_CY_DATASOURCE = "[data-cy=setting-dataSource]" -export const DROPDOWN_CONTAINER = ".dropdown-container" -export const SPECTRUM_PICKER = ".spectrum-Picker" - -//autoScreens -export const LABEL_ADD_CIRCLE = "[aria-label=AddCircle]" -export const ITEM_DISABLED = ".item.disabled" -export const CONFIRM_WRAP_SPE_BUTTON = ".confirm-wrap .spectrum-Button" -export const DATA_SOURCE_ENTRY = ".data-source-entry" -export const BODY = ".body" - -//publishWorkFlow -export const DEPLOY_APP_MODAL = ".spectrum-Modal [data-cy=deploy-app-modal]" -export const DEPLOY_SUCCESS_MODAL = - ".spectrum-Modal [data-cy=deploy-app-success-modal]" -export const DEPLOY_APP_URL_INPUT = "[data-cy=deployed-app-url] input" -export const GLOBESTRIKE = "svg[aria-label=GlobeStrike]" -export const GLOBE = "svg[aria-label=Globe]" -export const UNPUBLISH_MODAL = "[data-cy=unpublish-modal]" -export const CONFIRM_WRAP_BUTTON = ".confirm-wrap button" -export const DEPLOYMENT_TOP_NAV = ".deployment-top-nav" - -//changeAppiconAndColour -export const APP_ROW_ACTION = ".app-row-actions-icon" -export const SPECTRUM_MENU = ".spectrum-Menu" -export const ICON_ITEM = ".icon-item" -export const FILL = ".fill" -export const COLOURSS = ".colors" -export const AREA_LABEL = "[aria-label]" -export const TITLE = ".title" -export const GRID = ".grid" -export const COLOUR = ".color" - -//createAutomation -export const ADD_BUTTON_SPECTRUM = ".add-button .spectrum-Icon" -export const MODAL_INNER_WRAPPER = ".modal-inner-wrapper" -export const SPECTRUM_BUTTON_CTA = ".spectrum-Button--cta" -export const SPECTRUM_TEXTFIELD_INPUT = ".spectrum-Textfield-input" - -//createTable -export const TABLE_TITLE_H1 = ".table-title h1" -export const TABLE_TITLE = ".title" -export const SPECTRUM_TABLE_EDIT = ".spectrum-Table-editIcon > use" -export const SPECTRUM_SWITCH_INPUT = ".spectrum-Switch-input" -export const SPECTRUM_CHECKBOX_INPUT = ".spectrum-Checkbox-input" -export const SPECTRUM_PAGINATION = ".spectrum-Pagination" -export const SPECTRUM_ACTION_BUTTON = ".spectrum-ActionButton" -export const SPECTRUM_BODY_SECOND = ".spectrum-Body--secondary" -export const POPOVERS = ".popovers" -export const SPECTRUM_DIALOG_GRID = ".spectrum-Dialog-grid" -export const DELETE_COLUMN_CONFIRM = '[data-cy="delete-column-confirm"]' -export const NAV_ITEM = ".nav-item" -export const ACTION_SPECTRUM_ICON = ".actions .spectrum-Icon" -export const SPECTRUM_MENU_CHILD2 = ".spectrum-Menu > :nth-child(2)" -export const DELETE_TABLE_CONFIRM = '[data-cy="delete-table-confirm"]' - -//adminAndManagement Folder -export const SPECTRUM_TABLE = ".spectrum-Table" -export const SPECTRUM_SIDENAV = ".spectrum-SideNav" -export const SPECTRUM_TABLE_ROW = ".spectrum-Table-row" -export const SPECTRUM_TABLE_CELL = ".spectrum-Table-cell" -export const FIELD = ".field" -export const CONTAINER = ".container" -export const REGENERATE = ".regenerate" -export const SPECTRUM_DIALOG_CONTENT = ".spectrum-Dialog-content" -export const SPECTRUM_ICON = ".spectrum-Icon" -export const SPECTRUM_HEADING = ".spectrum-Heading" -export const SPECTRUM_FORM_ITEMFIELD = ".spectrum-Form-itemField" -export const LIST_ITEMS = ".list-items" - -//createView -export const SPECTRUM_MENU_ITEM_LABEL = ".spectrum-Menu-itemLabel" - -//revertApp -export const TOP_RIGHT_NAV = ".toprightnav" -export const AREA_LABEL_REVERT = "[aria-label=Revert]" -export const ROOT = ".root" - -//queryLevelTransformers -export const SPECTRUM_TABS_ITEM = ".spectrum-Tabs-itemLabel" -export const CODEMIRROR_TEXTAREA = ".CodeMirror textarea" - -//renameApplication -export const WRAPPER = ".wrapper" -export const ERROR = ".error" -export const AREA_LABEL_MORE = "[aria-label=More]" -export const APP_ROW_ACTION_MENU_POPOVER = - '[data-cy="app-row-actions-menu-popover"]' -export const SPECTRUM_MENU_ITEM = ".spectrum-Menu-item" - -//commands -export const HOME_LOGO = ".home-logo" diff --git a/packages/builder/cypress/support/queryLevelTransformerFunction.js b/packages/builder/cypress/support/queryLevelTransformerFunction.js deleted file mode 100644 index 7dc05018f8..0000000000 --- a/packages/builder/cypress/support/queryLevelTransformerFunction.js +++ /dev/null @@ -1,14 +0,0 @@ -/* eslint-disable */ -const breweries = data -const totals = {} - -for (let brewery of breweries) - {const state = brewery.state - if (totals[state] == null) - {totals[state] = 1 - } else - {totals[state]++ - } -} -const entries = Object.entries(totals) -return entries.map(([state, count]) => ({ state, count })) diff --git a/packages/builder/cypress/support/queryLevelTransformerFunctionWithData.js b/packages/builder/cypress/support/queryLevelTransformerFunctionWithData.js deleted file mode 100644 index fcf50b4412..0000000000 --- a/packages/builder/cypress/support/queryLevelTransformerFunctionWithData.js +++ /dev/null @@ -1,31 +0,0 @@ -/* eslint-disable */ -const breweries = data -const totals = {} -for (let brewery of breweries) - {const state = brewery.state - if (totals[state] == null) - {totals[state] = 1 - } else - {totals[state]++ - } -} -const stateCodes = - {texas: "tx", - colorado: "co", - florida: "fl", - iwoa: "ia", - louisiana: "la", - california: "ca", - pennsylvania: "pa", - georgia: "ga", - "new hampshire": "nh", - virginia: "va", - michigan: "mi", - maryland: "md", - ohio: "oh", -} -const entries = Object.entries(totals) -return entries.map(([state, count]) => - {stateCodes[state.toLowerCase()] - return { state, count, flag: "http://flags.ox3.in/svg/us/${stateCode}.svg" } -}) diff --git a/packages/builder/cypress/ts/setup.ts b/packages/builder/cypress/ts/setup.ts deleted file mode 100644 index b6b12bf730..0000000000 --- a/packages/builder/cypress/ts/setup.ts +++ /dev/null @@ -1,4 +0,0 @@ -// @ts-ignore -import { run } from "../setup" - -run("../../server/src/index", "../../worker/src/index") From e90a3b08f4e67d9932f90dbdc32a78f6a096322c Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Tue, 31 Jan 2023 16:51:00 +0000 Subject: [PATCH 341/387] Updating builder/package.json Removing lines related to Cypress that we no longer need --- packages/builder/package.json | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/packages/builder/package.json b/packages/builder/package.json index 27ee30f56d..21e016ea09 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -9,20 +9,7 @@ "dev:builder": "routify -c dev:vite", "dev:vite": "vite --host 0.0.0.0", "rollup": "rollup -c -w", - "test": "jest", - "cy:setup": "ts-node ./cypress/ts/setup.ts", - "cy:setup:ci": "node ./cypress/setup.js", - "cy:open": "cypress open", - "cy:run": "cypress run", - "cy:run:ci": "cypress run --headed --browser chrome --spec cypress/integration/createApp.spec.js", - "cy:run:ci:record": "xvfb-run cypress run --headed --browser chrome --record", - "cy:test": "start-server-and-test cy:setup http://localhost:4100/builder cy:run", - "cy:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci", - "cy:ci:record": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:run:ci:record; npm run cy:ci:report", - "cy:ci:report": "mochawesome-merge cypress/reports/*.json > cypress/reports/testReport.json && marge cypress/reports/testReport.json --reportDir cypress/reports --inline", - "cy:ci:notify": "node scripts/cypressResultsWebhook", - "cy:debug": "start-server-and-test cy:setup http://localhost:4100/builder cy:open", - "cy:debug:ci": "start-server-and-test cy:setup:ci http://localhost:4100/builder cy:open" + "test": "jest" }, "jest": { "globals": { @@ -124,4 +111,4 @@ "vite": "^3.0.8" }, "gitHead": "115189f72a850bfb52b65ec61d932531bf327072" -} +} \ No newline at end of file From abdd658012183b1e78509cb6ce49761bdb057557 Mon Sep 17 00:00:00 2001 From: adrinr Date: Tue, 31 Jan 2023 16:51:08 +0000 Subject: [PATCH 342/387] Prepopulate dbs --- .../server/src/tests/utilities/TestConfiguration.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index e6f8ac9c68..6726de5bca 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -11,7 +11,7 @@ mocks.licenses.useUnlimited() import { init as dbInit } from "../../db" dbInit() import env from "../../environment" -import { env as coreEnv } from "@budibase/backend-core" +import { db, env as coreEnv, StaticDatabases } from "@budibase/backend-core" import { basicTable, basicRow, @@ -151,7 +151,16 @@ class TestConfiguration { this.defaultUserValues = this.populateDefaultUserValues() if (context.isMultiTenant()) { this.tenantId = `tenant-${newid()}` - context.updateTenantId(this.tenantId) + } + + try { + // Prepopulate dbs to avoid race conditions + await db.getDB(StaticDatabases.PLATFORM_INFO.name).checkSetup() + await db.getDB(StaticDatabases.PLATFORM_INFO.docs.install).checkSetup() + } catch (err: any) { + if (err.status !== 409) { + throw err + } } if (!this.started) { From a8656c0f10d602aef896b3435269ac5aa95c834c Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 31 Jan 2023 16:55:07 +0000 Subject: [PATCH 343/387] v2.2.12-alpha.51 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 0360b2e821..b24e3bc52c 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 81898f6d0b..f891756772 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.50", + "@budibase/types": "2.2.12-alpha.51", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 18092ae2a5..e3281c05fd 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.50", + "@budibase/string-templates": "2.2.12-alpha.51", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 27ee30f56d..a099c7324b 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.50", - "@budibase/client": "2.2.12-alpha.50", - "@budibase/frontend-core": "2.2.12-alpha.50", - "@budibase/string-templates": "2.2.12-alpha.50", + "@budibase/bbui": "2.2.12-alpha.51", + "@budibase/client": "2.2.12-alpha.51", + "@budibase/frontend-core": "2.2.12-alpha.51", + "@budibase/string-templates": "2.2.12-alpha.51", "@sentry/browser": "5.19.1", "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 19fb9e4df8..627e80225d 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.50", - "@budibase/string-templates": "2.2.12-alpha.50", - "@budibase/types": "2.2.12-alpha.50", + "@budibase/backend-core": "2.2.12-alpha.51", + "@budibase/string-templates": "2.2.12-alpha.51", + "@budibase/types": "2.2.12-alpha.51", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 79016b204e..992e107b63 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.50", - "@budibase/frontend-core": "2.2.12-alpha.50", - "@budibase/string-templates": "2.2.12-alpha.50", + "@budibase/bbui": "2.2.12-alpha.51", + "@budibase/frontend-core": "2.2.12-alpha.51", + "@budibase/string-templates": "2.2.12-alpha.51", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 3821337599..cb94e37af0 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.50", + "@budibase/bbui": "2.2.12-alpha.51", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 5b91148966..a0f714cd88 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 94b5f563cf..5eba6f75d4 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.50", - "@budibase/client": "2.2.12-alpha.50", + "@budibase/backend-core": "2.2.12-alpha.51", + "@budibase/client": "2.2.12-alpha.51", "@budibase/pro": "2.2.12-alpha.50", - "@budibase/string-templates": "2.2.12-alpha.50", - "@budibase/types": "2.2.12-alpha.50", + "@budibase/string-templates": "2.2.12-alpha.51", + "@budibase/types": "2.2.12-alpha.51", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 21ca20ad27..e268e5bd2a 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index d7b648264e..cc30804846 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index cb98ce525b..e3a5d43928 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.50", + "version": "2.2.12-alpha.51", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.50", + "@budibase/backend-core": "2.2.12-alpha.51", "@budibase/pro": "2.2.12-alpha.50", - "@budibase/string-templates": "2.2.12-alpha.50", - "@budibase/types": "2.2.12-alpha.50", + "@budibase/string-templates": "2.2.12-alpha.51", + "@budibase/types": "2.2.12-alpha.51", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 4ed237ed836b19458e615616a2ca23e281d490af Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 31 Jan 2023 16:58:46 +0000 Subject: [PATCH 344/387] Update pro version to 2.2.12-alpha.51 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index 5eba6f75d4..98a5c50463 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.51", "@budibase/client": "2.2.12-alpha.51", - "@budibase/pro": "2.2.12-alpha.50", + "@budibase/pro": "2.2.12-alpha.51", "@budibase/string-templates": "2.2.12-alpha.51", "@budibase/types": "2.2.12-alpha.51", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index bdf6187969..16bddaef18 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.50": - version "2.2.12-alpha.50" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.50.tgz#39f228904cf39de2dbb51900df4494267ac72381" - integrity sha512-ysVJ6Eul7o+LZRoilFr7bk1/gkoxSqM30yBbRhKxIhH2IOk0qd9LAaNQiTnwn4ZzU+tJWSkyAsJAQdTnX8/i9g== +"@budibase/backend-core@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.51.tgz#086dd2566be016683e5e3ae4ce8e8996aec35f7b" + integrity sha512-XWsiELOdi+292nTBT2rWz4vc2gs8YfRKKC2TE6a/4cc7kzuX/Sj88cY6l8wHYb1TVlMG+i9gLHRIxaI+w3cb9Q== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.50" + "@budibase/types" "2.2.12-alpha.51" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.50": - version "2.2.12-alpha.50" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.50.tgz#599edc75363b323f613a0d56e5173150582b13bb" - integrity sha512-eeKY9P4Zi81AlU6vYWVcffMwkyUrNv6PcNjdKZZNBuIgNfOVejy9vmpIukx43LpHUOsk6FKxHFNVDN1txnYRkg== +"@budibase/pro@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.51.tgz#a0b5dd3d5c023d147f008b0eda05bfa1bcdca56c" + integrity sha512-jBV92QxtQuABLACiLT7iWI9S/yesm+OUKqPAz5hSc9EfqRS4L8jP/OOxoEkhj9lK8vi7qbeHijlarna6JqNnRA== dependencies: - "@budibase/backend-core" "2.2.12-alpha.50" - "@budibase/types" "2.2.12-alpha.50" + "@budibase/backend-core" "2.2.12-alpha.51" + "@budibase/types" "2.2.12-alpha.51" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1406,10 +1406,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.50": - version "2.2.12-alpha.50" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.50.tgz#ef07d4593c1ea0da6a6b75004d1319d7621cd910" - integrity sha512-LU+G7gQffBvnLvWfzpxUNcrCZFP/ZNQqAjB2KJxgq9pfeynU3MWAwut1tjKpp8eduuu7GnfBT1uvet9jM87FKA== +"@budibase/types@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.51.tgz#2595094cb737397091744515e9b0a9141de5cba9" + integrity sha512-mzsPC8BLaUQwayfqLlv+Q2E986Axh429o+x3r2OhkfaoHyioiE3TBtI7hLHoBExGHm1tKycRQojkRnwcuWHbWQ== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index e3a5d43928..cc39afd0d0 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.51", - "@budibase/pro": "2.2.12-alpha.50", + "@budibase/pro": "2.2.12-alpha.51", "@budibase/string-templates": "2.2.12-alpha.51", "@budibase/types": "2.2.12-alpha.51", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index d0a31fc49f..353fe2a698 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.50": - version "2.2.12-alpha.50" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.50.tgz#39f228904cf39de2dbb51900df4494267ac72381" - integrity sha512-ysVJ6Eul7o+LZRoilFr7bk1/gkoxSqM30yBbRhKxIhH2IOk0qd9LAaNQiTnwn4ZzU+tJWSkyAsJAQdTnX8/i9g== +"@budibase/backend-core@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.51.tgz#086dd2566be016683e5e3ae4ce8e8996aec35f7b" + integrity sha512-XWsiELOdi+292nTBT2rWz4vc2gs8YfRKKC2TE6a/4cc7kzuX/Sj88cY6l8wHYb1TVlMG+i9gLHRIxaI+w3cb9Q== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.50" + "@budibase/types" "2.2.12-alpha.51" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,13 +521,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.50": - version "2.2.12-alpha.50" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.50.tgz#599edc75363b323f613a0d56e5173150582b13bb" - integrity sha512-eeKY9P4Zi81AlU6vYWVcffMwkyUrNv6PcNjdKZZNBuIgNfOVejy9vmpIukx43LpHUOsk6FKxHFNVDN1txnYRkg== +"@budibase/pro@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.51.tgz#a0b5dd3d5c023d147f008b0eda05bfa1bcdca56c" + integrity sha512-jBV92QxtQuABLACiLT7iWI9S/yesm+OUKqPAz5hSc9EfqRS4L8jP/OOxoEkhj9lK8vi7qbeHijlarna6JqNnRA== dependencies: - "@budibase/backend-core" "2.2.12-alpha.50" - "@budibase/types" "2.2.12-alpha.50" + "@budibase/backend-core" "2.2.12-alpha.51" + "@budibase/types" "2.2.12-alpha.51" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -535,10 +535,10 @@ lru-cache "^7.14.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.50": - version "2.2.12-alpha.50" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.50.tgz#ef07d4593c1ea0da6a6b75004d1319d7621cd910" - integrity sha512-LU+G7gQffBvnLvWfzpxUNcrCZFP/ZNQqAjB2KJxgq9pfeynU3MWAwut1tjKpp8eduuu7GnfBT1uvet9jM87FKA== +"@budibase/types@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.51.tgz#2595094cb737397091744515e9b0a9141de5cba9" + integrity sha512-mzsPC8BLaUQwayfqLlv+Q2E986Axh429o+x3r2OhkfaoHyioiE3TBtI7hLHoBExGHm1tKycRQojkRnwcuWHbWQ== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 0164ca443b8de77b7bc67b381ad7aef5b7c52d86 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Tue, 31 Jan 2023 17:05:41 +0000 Subject: [PATCH 345/387] Update smoke_test.yaml Removing Cypress from smoke_test.yaml file - No longer needed --- .github/workflows/smoke_test.yaml | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/.github/workflows/smoke_test.yaml b/.github/workflows/smoke_test.yaml index cffb914aaf..29c7f5f85a 100644 --- a/.github/workflows/smoke_test.yaml +++ b/.github/workflows/smoke_test.yaml @@ -18,30 +18,18 @@ jobs: - run: yarn - run: yarn bootstrap - run: yarn build - - name: Pull cypress.env.yaml from budibase-infra + - name: Pull from budibase-infra run: | curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \ -H 'Accept: application/vnd.github.v3.raw' \ - -o packages/builder/cypress.env.json \ - -L https://api.github.com/repos/budibase/budibase-infra/contents/test/cypress.env.json - wc -l packages/builder/cypress.env.json - - - name: Cypress run - id: cypress - continue-on-error: true - uses: cypress-io/github-action@v2 - with: - record: true - install: false - tag: nightly - command: yarn test:e2e:ci:record - env: - CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} + -o + -L + wc -l - uses: actions/upload-artifact@v3 with: name: Test Reports - path: packages/builder/cypress/reports/testReport.html + path: # TODO: enable once running in QA test env # - name: Configure AWS Credentials @@ -54,11 +42,3 @@ jobs: # - name: Upload test results HTML # uses: aws-actions/configure-aws-credentials@v1 # run: aws s3 cp packages/builder/cypress/reports/testReport.html s3://{{ secrets.BUDI_QA_REPORTS_BUCKET_NAME }}/$GITHUB_RUN_ID/index.html - - - name: Cypress Discord Notify - run: yarn test:e2e:ci:notify - env: - CYPRESS_WEBHOOK_URL: ${{ secrets.BUDI_QA_WEBHOOK }} - CYPRESS_OUTCOME: ${{ steps.cypress.outcome }} - CYPRESS_DASHBOARD_URL: ${{ steps.cypress.outputs.dashboardUrl }} - GITHUB_RUN_URL: $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID From 09ed767d0b28b3b85bc26e7bff3cfe58ffbbb986 Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Tue, 31 Jan 2023 17:18:22 +0000 Subject: [PATCH 346/387] New Help Menu (#9371) * New Help Menu * design PR feedback * Feedback updates * Feedback updates, font awesome enhancement, upgrade button hidden if licensing is disabled --------- Co-authored-by: Dean --- packages/builder/package.json | 3 + packages/builder/src/App.svelte | 2 - .../components/common/FontAwesomeIcon.svelte | 31 + .../src/components/common/HelpIcon.svelte | 42 - .../src/components/common/HelpMenu.svelte | 182 + .../portal/_components/UpgradeButton.svelte | 43 +- .../src/pages/builder/portal/_layout.svelte | 2 + packages/builder/yarn.lock | 4337 +++++++++++------ 8 files changed, 3091 insertions(+), 1551 deletions(-) create mode 100644 packages/builder/src/components/common/FontAwesomeIcon.svelte delete mode 100644 packages/builder/src/components/common/HelpIcon.svelte create mode 100644 packages/builder/src/components/common/HelpMenu.svelte diff --git a/packages/builder/package.json b/packages/builder/package.json index a099c7324b..2fa8c23776 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -75,6 +75,9 @@ "@budibase/client": "2.2.12-alpha.51", "@budibase/frontend-core": "2.2.12-alpha.51", "@budibase/string-templates": "2.2.12-alpha.51", + "@fortawesome/fontawesome-svg-core": "^6.2.1", + "@fortawesome/free-brands-svg-icons": "^6.2.1", + "@fortawesome/free-solid-svg-icons": "^6.2.1", "@sentry/browser": "5.19.1", "@spectrum-css/accordion": "^3.0.24", "@spectrum-css/page": "^3.0.1", diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte index 04846e01bf..f31f45bb84 100644 --- a/packages/builder/src/App.svelte +++ b/packages/builder/src/App.svelte @@ -3,7 +3,6 @@ import { routes } from "../.routify/routes" import { NotificationDisplay, BannerDisplay } from "@budibase/bbui" import { parse, stringify } from "qs" - import HelpIcon from "components/common/HelpIcon.svelte" import LicensingOverlays from "components/portal/licensing/LicensingOverlays.svelte" const queryHandler = { parse, stringify } @@ -15,7 +14,6 @@
- diff --git a/packages/builder/src/components/common/HelpIcon.svelte b/packages/builder/src/components/common/HelpIcon.svelte deleted file mode 100644 index 50434b7b16..0000000000 --- a/packages/builder/src/components/common/HelpIcon.svelte +++ /dev/null @@ -1,42 +0,0 @@ - - - -
- - -
- - - diff --git a/packages/builder/src/components/common/HelpMenu.svelte b/packages/builder/src/components/common/HelpMenu.svelte new file mode 100644 index 0000000000..c06efecdfa --- /dev/null +++ b/packages/builder/src/components/common/HelpMenu.svelte @@ -0,0 +1,182 @@ + + +
+ + + + +
+ + diff --git a/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte b/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte index 5b02bb1e84..d8481efc41 100644 --- a/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte +++ b/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte @@ -2,26 +2,29 @@ import { Button } from "@budibase/bbui" import { goto } from "@roxi/routify" import { auth, admin } from "stores/portal" + import { isEnabled, TENANT_FEATURE_FLAGS } from "helpers/featureFlags" -{#if $admin.cloud && $auth?.user?.accountPortalAccess} - -{:else if !$admin.cloud && $auth.isAdmin} - +{#if isEnabled(TENANT_FEATURE_FLAGS.LICENSING)} + {#if $admin.cloud && $auth?.user?.accountPortalAccess} + + {:else if !$admin.cloud && $auth.isAdmin} + + {/if} {/if} diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 3cb60e26cf..71aec61465 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -7,6 +7,7 @@ import MobileMenu from "./_components/MobileMenu.svelte" import Logo from "./_components/Logo.svelte" import UserDropdown from "./_components/UserDropdown.svelte" + import HelpMenu from "components/common/HelpMenu.svelte" let loaded = false let mobileMenuVisible = false @@ -46,6 +47,7 @@ {#if $auth.user && loaded} +
diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index a491d14404..cc6d28b11f 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -2,403 +2,428 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" - integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== - dependencies: - "@babel/highlight" "^7.16.0" +"@adobe/css-tools@^4.0.1": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.1.0.tgz#417fef4a143f4396ad0b3b4351fee21323f15aa8" + integrity sha512-mMVJ/j/GbZ/De4ZHWbQAQO1J6iVnjtZLc9WEdkUQb8S/Bu2cAF2bETXUgMAdvMG3/ngtKmcNBe+Zms9bg6jnQQ== -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.0", "@babel/compat-data@^7.16.4": - version "7.16.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.16.4.tgz#081d6bbc336ec5c2435c6346b2ae1fb98b5ac68e" - integrity sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q== +"@adobe/spectrum-css-workflow-icons@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4" + integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w== + +"@ampproject/remapping@^2.1.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" + integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== + dependencies: + "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/trace-mapping" "^0.3.9" + +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" + integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== + dependencies: + "@babel/highlight" "^7.18.6" + +"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1", "@babel/compat-data@^7.20.5": + version "7.20.14" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.14.tgz#4106fc8b755f3e3ee0a0a7c27dde5de1d2b2baf8" + integrity sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw== "@babel/core@^7.1.0", "@babel/core@^7.12.14", "@babel/core@^7.12.3", "@babel/core@^7.7.5": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.0.tgz#c4ff44046f5fe310525cc9eb4ef5147f0c5374d4" - integrity sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ== + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d" + integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg== dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.0" - "@babel/helper-compilation-targets" "^7.16.0" - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helpers" "^7.16.0" - "@babel/parser" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.20.7" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helpers" "^7.20.7" + "@babel/parser" "^7.20.7" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.12" + "@babel/types" "^7.20.7" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.1.2" + json5 "^2.2.2" semver "^6.3.0" - source-map "^0.5.0" -"@babel/generator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.0.tgz#d40f3d1d5075e62d3500bccb67f3daa8a95265b2" - integrity sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew== +"@babel/generator@^7.20.7": + version "7.20.14" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.14.tgz#9fa772c9f86a46c6ac9b321039400712b96f64ce" + integrity sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.20.7" + "@jridgewell/gen-mapping" "^0.3.2" jsesc "^2.5.1" - source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" - integrity sha512-ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg== +"@babel/helper-annotate-as-pure@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" + integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.18.6" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.0.tgz#f1a686b92da794020c26582eb852e9accd0d7882" - integrity sha512-9KuleLT0e77wFUku6TUkqZzCEymBdtuQQ27MhEKzf9UOOJu3cYj98kyaDAzxpC7lV6DGiZFuC8XqDsq8/Kl6aQ== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb" + integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw== dependencies: - "@babel/helper-explode-assignable-expression" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/helper-explode-assignable-expression" "^7.18.6" + "@babel/types" "^7.18.9" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.0", "@babel/helper-compilation-targets@^7.16.3": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz#5b480cd13f68363df6ec4dc8ac8e2da11363cbf0" - integrity sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA== +"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" + integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== dependencies: - "@babel/compat-data" "^7.16.0" - "@babel/helper-validator-option" "^7.14.5" - browserslist "^4.17.5" + "@babel/compat-data" "^7.20.5" + "@babel/helper-validator-option" "^7.18.6" + browserslist "^4.21.3" + lru-cache "^5.1.1" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.0.tgz#090d4d166b342a03a9fec37ef4fd5aeb9c7c6a4b" - integrity sha512-XLwWvqEaq19zFlF5PTgOod4bUA+XbkR4WLQBct1bkzmxJGB0ZEJaoKF4c8cgH9oBtCDuYJ8BP5NB9uFiEgO5QA== +"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.20.5", "@babel/helper-create-class-features-plugin@^7.20.7": + version "7.20.12" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.12.tgz#4349b928e79be05ed2d1643b20b99bb87c503819" + integrity sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-member-expression-to-functions" "^7.16.0" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/helper-replace-supers" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-member-expression-to-functions" "^7.20.7" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/helper-replace-supers" "^7.20.7" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" + "@babel/helper-split-export-declaration" "^7.18.6" -"@babel/helper-create-regexp-features-plugin@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz#06b2348ce37fccc4f5e18dcd8d75053f2a7c44ff" - integrity sha512-3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA== +"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz#5ea79b59962a09ec2acf20a963a01ab4d076ccca" + integrity sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - regexpu-core "^4.7.1" + "@babel/helper-annotate-as-pure" "^7.18.6" + regexpu-core "^5.2.1" -"@babel/helper-define-polyfill-provider@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz#c5b10cf4b324ff840140bb07e05b8564af2ae971" - integrity sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg== +"@babel/helper-define-polyfill-provider@^0.3.3": + version "0.3.3" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a" + integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww== 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" semver "^6.1.2" -"@babel/helper-explode-assignable-expression@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz#753017337a15f46f9c09f674cff10cee9b9d7778" - integrity sha512-Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ== +"@babel/helper-environment-visitor@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" + integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== + +"@babel/helper-explode-assignable-expression@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" + integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.18.6" -"@babel/helper-function-name@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz#b7dd0797d00bbfee4f07e9c4ea5b0e30c8bb1481" - integrity sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog== +"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" + integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== dependencies: - "@babel/helper-get-function-arity" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/template" "^7.18.10" + "@babel/types" "^7.19.0" -"@babel/helper-get-function-arity@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz#0088c7486b29a9cb5d948b1a1de46db66e089cfa" - integrity sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ== +"@babel/helper-hoist-variables@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" + integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.18.6" -"@babel/helper-hoist-variables@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a" - integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg== +"@babel/helper-member-expression-to-functions@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.20.7.tgz#a6f26e919582275a93c3aa6594756d71b0bb7f05" + integrity sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.20.7" -"@babel/helper-member-expression-to-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4" - integrity sha512-bsjlBFPuWT6IWhl28EdrQ+gTvSvj5tqVP5Xeftp07SEuz5pLnsXZuDkDD3Rfcxy0IsHmbZ+7B2/9SHzxO0T+sQ== +"@babel/helper-module-imports@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" + integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.18.6" -"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3" - integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg== +"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0" + integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg== dependencies: - "@babel/types" "^7.16.0" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.10" + "@babel/types" "^7.20.7" -"@babel/helper-module-transforms@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.0.tgz#1c82a8dd4cb34577502ebd2909699b194c3e9bb5" - integrity sha512-My4cr9ATcaBbmaEa8M0dZNA74cfI6gitvUAskgDtAFmAqyFKDSHQo5YstxPbN+lzHl2D9l/YOEFqb2mtUh4gfA== +"@babel/helper-optimise-call-expression@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" + integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA== dependencies: - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-replace-supers" "^7.16.0" - "@babel/helper-simple-access" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/helper-validator-identifier" "^7.15.7" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/types" "^7.18.6" -"@babel/helper-optimise-call-expression@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338" - integrity sha512-SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" + integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== + +"@babel/helper-remap-async-to-generator@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519" + integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA== dependencies: - "@babel/types" "^7.16.0" + "@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-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" - integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== - -"@babel/helper-remap-async-to-generator@^7.16.0", "@babel/helper-remap-async-to-generator@^7.16.4": - version "7.16.4" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.4.tgz#5d7902f61349ff6b963e07f06a389ce139fbfe6e" - integrity sha512-vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA== +"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331" + integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-wrap-function" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-member-expression-to-functions" "^7.20.7" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/helper-replace-supers@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.0.tgz#73055e8d3cf9bcba8ddb55cad93fedc860f68f17" - integrity sha512-TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA== +"@babel/helper-simple-access@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" + integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== dependencies: - "@babel/helper-member-expression-to-functions" "^7.16.0" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/types" "^7.20.2" -"@babel/helper-simple-access@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz#21d6a27620e383e37534cf6c10bba019a6f90517" - integrity sha512-o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw== +"@babel/helper-skip-transparent-expression-wrappers@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684" + integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.20.0" -"@babel/helper-skip-transparent-expression-wrappers@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" - integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw== +"@babel/helper-split-export-declaration@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" + integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== dependencies: - "@babel/types" "^7.16.0" + "@babel/types" "^7.18.6" -"@babel/helper-split-export-declaration@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz#29672f43663e936df370aaeb22beddb3baec7438" - integrity sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw== +"@babel/helper-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== + +"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" + integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== + +"@babel/helper-validator-option@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" + integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== + +"@babel/helper-wrap-function@^7.18.9": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3" + integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q== dependencies: - "@babel/types" "^7.16.0" + "@babel/helper-function-name" "^7.19.0" + "@babel/template" "^7.18.10" + "@babel/traverse" "^7.20.5" + "@babel/types" "^7.20.5" -"@babel/helper-validator-identifier@^7.15.7": - version "7.15.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389" - integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w== - -"@babel/helper-validator-option@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" - integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== - -"@babel/helper-wrap-function@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.0.tgz#b3cf318afce774dfe75b86767cd6d68f3482e57c" - integrity sha512-VVMGzYY3vkWgCJML+qVLvGIam902mJW0FvT7Avj1zEe0Gn7D93aWdLblYARTxEw+6DhZmtzhBM2zv0ekE5zg1g== +"@babel/helpers@^7.20.7": + version "7.20.13" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.13.tgz#e3cb731fb70dc5337134cadc24cbbad31cc87ad2" + integrity sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg== dependencies: - "@babel/helper-function-name" "^7.16.0" - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.0" - "@babel/types" "^7.16.0" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.13" + "@babel/types" "^7.20.7" -"@babel/helpers@^7.16.0": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.16.3.tgz#27fc64f40b996e7074dc73128c3e5c3e7f55c43c" - integrity sha512-Xn8IhDlBPhvYTvgewPKawhADichOsbkZuzN7qz2BusOM0brChsyXMDJvldWaYMMUNiCQdQzNEioXTp3sC8Nt8w== +"@babel/highlight@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" + integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== dependencies: - "@babel/template" "^7.16.0" - "@babel/traverse" "^7.16.3" - "@babel/types" "^7.16.0" - -"@babel/highlight@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.0.tgz#6ceb32b2ca4b8f5f361fb7fd821e3fddf4a1725a" - integrity sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g== - dependencies: - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-validator-identifier" "^7.18.6" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.0", "@babel/parser@^7.16.3": - version "7.16.4" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.4.tgz#d5f92f57cf2c74ffe9b37981c0e72fee7311372e" - integrity sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.13", "@babel/parser@^7.20.7": + version "7.20.13" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.13.tgz#ddf1eb5a813588d2fb1692b70c6fce75b945c088" + integrity sha512-gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw== -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.2": - version "7.16.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz#2977fca9b212db153c195674e57cfab807733183" - integrity sha512-h37CvpLSf8gb2lIJ2CgC3t+EjFbi0t8qS7LCS1xcJIlEXE4czlofwaW7W1HA8zpgOCzI9C1nmoqNR1zWkk0pQg== +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" + integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz#358972eaab006f5eb0826183b0c93cbcaf13e1e2" - integrity sha512-4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1" + integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.0" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" + "@babel/plugin-proposal-optional-chaining" "^7.20.7" -"@babel/plugin-proposal-async-generator-functions@^7.16.4": - version "7.16.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.4.tgz#e606eb6015fec6fa5978c940f315eae4e300b081" - integrity sha512-/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg== +"@babel/plugin-proposal-async-generator-functions@^7.20.1": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326" + integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-remap-async-to-generator" "^7.16.4" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-remap-async-to-generator" "^7.18.9" "@babel/plugin-syntax-async-generators" "^7.8.4" -"@babel/plugin-proposal-class-properties@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.0.tgz#c029618267ddebc7280fa286e0f8ca2a278a2d1a" - integrity sha512-mCF3HcuZSY9Fcx56Lbn+CGdT44ioBMMvjNVldpKtj8tpniETdLjnxdHI1+sDWXIM1nNt+EanJOZ3IG9lzVjs7A== +"@babel/plugin-proposal-class-properties@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" + integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-class-static-block@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.0.tgz#5296942c564d8144c83eea347d0aa8a0b89170e7" - integrity sha512-mAy3sdcY9sKAkf3lQbDiv3olOfiLqI51c9DR9b19uMoR2Z6r5pmGl7dfNFqEvqOyqbf1ta4lknK4gc5PJn3mfA== +"@babel/plugin-proposal-class-static-block@^7.18.6": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.20.7.tgz#92592e9029b13b15be0f7ce6a7aedc2879ca45a7" + integrity sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.20.7" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-class-static-block" "^7.14.5" -"@babel/plugin-proposal-dynamic-import@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.0.tgz#783eca61d50526202f9b296095453977e88659f1" - integrity sha512-QGSA6ExWk95jFQgwz5GQ2Dr95cf7eI7TKutIXXTb7B1gCLTCz5hTjFTQGfLFBBiC5WSNi7udNwWsqbbMh1c4yQ== +"@babel/plugin-proposal-dynamic-import@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94" + integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.0.tgz#9c01dee40b9d6b847b656aaf4a3976a71740f222" - integrity sha512-CjI4nxM/D+5wCnhD11MHB1AwRSAYeDT+h8gCdcVJZ/OK7+wRzFsf7PFPWVpVpNRkHMmMkQWAHpTq+15IXQ1diA== +"@babel/plugin-proposal-export-namespace-from@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203" + integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.9" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.0.tgz#cae35a95ed1d2a7fa29c4dc41540b84a72e9ab25" - integrity sha512-kouIPuiv8mSi5JkEhzApg5Gn6hFyKPnlkO0a9YSzqRurH8wYzSlf6RJdzluAsbqecdW5pBvDJDfyDIUR/vLxvg== +"@babel/plugin-proposal-json-strings@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b" + integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.0.tgz#a711b8ceb3ffddd3ef88d3a49e86dbd3cc7db3fd" - integrity sha512-pbW0fE30sVTYXXm9lpVQQ/Vc+iTeQKiXlaNRZPPN2A2VdlWyAtsUrsQ3xydSlDW00TFMK7a8m3cDTkBF5WnV3Q== +"@babel/plugin-proposal-logical-assignment-operators@^7.18.9": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83" + integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.0.tgz#44e1cce08fe2427482cf446a91bb451528ed0596" - integrity sha512-3bnHA8CAFm7cG93v8loghDYyQ8r97Qydf63BeYiGgYbjKKB/XP53W15wfRC7dvKfoiJ34f6Rbyyx2btExc8XsQ== +"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" + integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" -"@babel/plugin-proposal-numeric-separator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.0.tgz#5d418e4fbbf8b9b7d03125d3a52730433a373734" - integrity sha512-FAhE2I6mjispy+vwwd6xWPyEx3NYFS13pikDBWUAFGZvq6POGs5eNchw8+1CYoEgBl9n11I3NkzD7ghn25PQ9Q== +"@babel/plugin-proposal-numeric-separator@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75" + integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.0.tgz#5fb32f6d924d6e6712810362a60e12a2609872e6" - integrity sha512-LU/+jp89efe5HuWJLmMmFG0+xbz+I2rSI7iLc1AlaeSMDMOGzWlc5yJrMN1d04osXN4sSfpo4O+azkBNBes0jg== +"@babel/plugin-proposal-object-rest-spread@^7.20.2": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a" + integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg== dependencies: - "@babel/compat-data" "^7.16.0" - "@babel/helper-compilation-targets" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/compat-data" "^7.20.5" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.16.0" + "@babel/plugin-transform-parameters" "^7.20.7" -"@babel/plugin-proposal-optional-catch-binding@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.0.tgz#5910085811ab4c28b00d6ebffa4ab0274d1e5f16" - integrity sha512-kicDo0A/5J0nrsCPbn89mTG3Bm4XgYi0CZtvex9Oyw7gGZE3HXGD0zpQNH+mo+tEfbo8wbmMvJftOwpmPy7aVw== +"@babel/plugin-proposal-optional-catch-binding@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb" + integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.0.tgz#56dbc3970825683608e9efb55ea82c2a2d6c8dc0" - integrity sha512-Y4rFpkZODfHrVo70Uaj6cC1JJOt3Pp0MdWSwIKtb8z1/lsjl9AmnB7ErRFV+QNGIfcY1Eruc2UMx5KaRnXjMyg== +"@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.20.7.tgz#49f2b372519ab31728cc14115bb0998b15bfda55" + integrity sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-private-methods@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.0.tgz#b4dafb9c717e4301c5776b30d080d6383c89aff6" - integrity sha512-IvHmcTHDFztQGnn6aWq4t12QaBXTKr1whF/dgp9kz84X6GUcwq9utj7z2wFCUfeOup/QKnOlt2k0zxkGFx9ubg== +"@babel/plugin-proposal-private-methods@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea" + integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-proposal-private-property-in-object@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.0.tgz#69e935b2c5c79d2488112d886f0c4e2790fee76f" - integrity sha512-3jQUr/HBbMVZmi72LpjQwlZ55i1queL8KcDTQEkAHihttJnAPrcvG9ZNXIfsd2ugpizZo595egYV6xy+pv4Ofw== +"@babel/plugin-proposal-private-property-in-object@^7.18.6": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz#309c7668f2263f1c711aa399b5a9a6291eef6135" + integrity sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-create-class-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-create-class-features-plugin" "^7.20.5" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-proposal-unicode-property-regex@^7.16.0", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz#890482dfc5ea378e42e19a71e709728cabf18612" - integrity sha512-ti7IdM54NXv29cA4+bNNKEMS4jLMCbJgl+Drv+FgYy0erJLAxNAIXcNjNjrRZEcWq0xJHsNVwQezskMFpF8N9g== +"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e" + integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -442,6 +467,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-syntax-import-assertions@^7.20.0": + version "7.20.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4" + integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ== + dependencies: + "@babel/helper-plugin-utils" "^7.19.0" + "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51" @@ -512,297 +544,301 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-arrow-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.0.tgz#951706f8b449c834ed07bd474c0924c944b95a8e" - integrity sha512-vIFb5250Rbh7roWARvCLvIJ/PtAU5Lhv7BtZ1u24COwpI9Ypjsh+bZcKk6rlIyalK+r0jOc1XQ8I4ovNxNrWrA== +"@babel/plugin-transform-arrow-functions@^7.18.6": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551" + integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-async-to-generator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.0.tgz#df12637f9630ddfa0ef9d7a11bc414d629d38604" - integrity sha512-PbIr7G9kR8tdH6g8Wouir5uVjklETk91GMVSUq+VaOgiinbCkBP6Q7NN/suM/QutZkMJMvcyAriogcYAdhg8Gw== +"@babel/plugin-transform-async-to-generator@^7.18.6": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354" + integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q== dependencies: - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-remap-async-to-generator" "^7.16.0" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-remap-async-to-generator" "^7.18.9" -"@babel/plugin-transform-block-scoped-functions@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.0.tgz#c618763233ad02847805abcac4c345ce9de7145d" - integrity sha512-V14As3haUOP4ZWrLJ3VVx5rCnrYhMSHN/jX7z6FAt5hjRkLsb0snPCmJwSOML5oxkKO4FNoNv7V5hw/y2bjuvg== +"@babel/plugin-transform-block-scoped-functions@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8" + integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-block-scoping@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.0.tgz#bcf433fb482fe8c3d3b4e8a66b1c4a8e77d37c16" - integrity sha512-27n3l67/R3UrXfizlvHGuTwsRIFyce3D/6a37GRxn28iyTPvNXaW4XvznexRh1zUNLPjbLL22Id0XQElV94ruw== +"@babel/plugin-transform-block-scoping@^7.20.2": + version "7.20.14" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.14.tgz#2f5025f01713ba739daf737997308e0d29d1dd75" + integrity sha512-sMPepQtsOs5fM1bwNvuJJHvaCfOEQfmc01FGw0ELlTpTJj5Ql/zuNRRldYhAPys4ghXdBIQJbRVYi44/7QflQQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-classes@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.0.tgz#54cf5ff0b2242c6573d753cd4bfc7077a8b282f5" - integrity sha512-HUxMvy6GtAdd+GKBNYDWCIA776byUQH8zjnfjxwT1P1ARv/wFu8eBDpmXQcLS/IwRtrxIReGiplOwMeyO7nsDQ== +"@babel/plugin-transform-classes@^7.20.2": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.7.tgz#f438216f094f6bb31dc266ebfab8ff05aecad073" + integrity sha512-LWYbsiXTPKl+oBlXUGlwNlJZetXD5Am+CyBdqhPsDVjM9Jc8jwBJFrKhHf900Kfk2eZG1y9MAG3UNajol7A4VQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.16.0" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-optimise-call-expression" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-replace-supers" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" + "@babel/helper-annotate-as-pure" "^7.18.6" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-optimise-call-expression" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-replace-supers" "^7.20.7" + "@babel/helper-split-export-declaration" "^7.18.6" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.0.tgz#e0c385507d21e1b0b076d66bed6d5231b85110b7" - integrity sha512-63l1dRXday6S8V3WFY5mXJwcRAnPYxvFfTlt67bwV1rTyVTM5zrp0DBBb13Kl7+ehkCVwIZPumPpFP/4u70+Tw== +"@babel/plugin-transform-computed-properties@^7.18.9": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa" + integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/template" "^7.20.7" -"@babel/plugin-transform-destructuring@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.0.tgz#ad3d7e74584ad5ea4eadb1e6642146c590dee33c" - integrity sha512-Q7tBUwjxLTsHEoqktemHBMtb3NYwyJPTJdM+wDwb0g8PZ3kQUIzNvwD5lPaqW/p54TXBc/MXZu9Jr7tbUEUM8Q== +"@babel/plugin-transform-destructuring@^7.20.2": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.7.tgz#8bda578f71620c7de7c93af590154ba331415454" + integrity sha512-Xwg403sRrZb81IVB79ZPqNQME23yhugYVqgTxAhT99h485F4f+GMELFhhOsscDUB7HCswepKeCKLn/GZvUKoBA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-dotall-regex@^7.16.0", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.0.tgz#50bab00c1084b6162d0a58a818031cf57798e06f" - integrity sha512-FXlDZfQeLILfJlC6I1qyEwcHK5UpRCFkaoVyA1nk9A1L1Yu583YO4un2KsLBsu3IJb4CUbctZks8tD9xPQubLw== +"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8" + integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-duplicate-keys@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.0.tgz#8bc2e21813e3e89e5e5bf3b60aa5fc458575a176" - integrity sha512-LIe2kcHKAZOJDNxujvmp6z3mfN6V9lJxubU4fJIGoQCkKe3Ec2OcbdlYP+vW++4MpxwG0d1wSDOJtQW5kLnkZQ== +"@babel/plugin-transform-duplicate-keys@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e" + integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-exponentiation-operator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.0.tgz#a180cd2881e3533cef9d3901e48dad0fbeff4be4" - integrity sha512-OwYEvzFI38hXklsrbNivzpO3fh87skzx8Pnqi4LoSYeav0xHlueSoCJrSgTPfnbyzopo5b3YVAJkFIcUpK2wsw== +"@babel/plugin-transform-exponentiation-operator@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd" + integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-for-of@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.0.tgz#f7abaced155260e2461359bbc7c7248aca5e6bd2" - integrity sha512-5QKUw2kO+GVmKr2wMYSATCTTnHyscl6sxFRAY+rvN7h7WB0lcG0o4NoV6ZQU32OZGVsYUsfLGgPQpDFdkfjlJQ== +"@babel/plugin-transform-for-of@^7.18.8": + version "7.18.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1" + integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-function-name@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.0.tgz#02e3699c284c6262236599f751065c5d5f1f400e" - integrity sha512-lBzMle9jcOXtSOXUpc7tvvTpENu/NuekNJVova5lCCWCV9/U1ho2HH2y0p6mBg8fPm/syEAbfaaemYGOHCY3mg== +"@babel/plugin-transform-function-name@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0" + integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ== dependencies: - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@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@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.0.tgz#79711e670ffceb31bd298229d50f3621f7980cac" - integrity sha512-gQDlsSF1iv9RU04clgXqRjrPyyoJMTclFt3K1cjLmTKikc0s/6vE3hlDeEVC71wLTRu72Fq7650kABrdTc2wMQ== +"@babel/plugin-transform-literals@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc" + integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-member-expression-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.0.tgz#5251b4cce01eaf8314403d21aedb269d79f5e64b" - integrity sha512-WRpw5HL4Jhnxw8QARzRvwojp9MIE7Tdk3ez6vRyUk1MwgjJN0aNpRoXainLR5SgxmoXx/vsXGZ6OthP6t/RbUg== +"@babel/plugin-transform-member-expression-literals@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e" + integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-modules-amd@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.0.tgz#09abd41e18dcf4fd479c598c1cef7bd39eb1337e" - integrity sha512-rWFhWbCJ9Wdmzln1NmSCqn7P0RAD+ogXG/bd9Kg5c7PKWkJtkiXmYsMBeXjDlzHpVTJ4I/hnjs45zX4dEv81xw== +"@babel/plugin-transform-modules-amd@^7.19.6": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a" + integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g== dependencies: - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - babel-plugin-dynamic-import-node "^2.3.3" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-modules-commonjs@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.0.tgz#add58e638c8ddc4875bd9a9ecb5c594613f6c922" - integrity sha512-Dzi+NWqyEotgzk/sb7kgQPJQf7AJkQBWsVp1N6JWc1lBVo0vkElUnGdr1PzUBmfsCCN5OOFya3RtpeHk15oLKQ== +"@babel/plugin-transform-modules-commonjs@^7.19.6": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.20.11.tgz#8cb23010869bf7669fd4b3098598b6b2be6dc607" + integrity sha512-S8e1f7WQ7cimJQ51JkAaDrEtohVEitXjgCGAS2N8S31Y42E+kWwfSz83LYz57QdBm7q9diARVqanIaH2oVgQnw== dependencies: - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-simple-access" "^7.16.0" - babel-plugin-dynamic-import-node "^2.3.3" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-simple-access" "^7.20.2" -"@babel/plugin-transform-modules-systemjs@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.0.tgz#a92cf240afeb605f4ca16670453024425e421ea4" - integrity sha512-yuGBaHS3lF1m/5R+6fjIke64ii5luRUg97N2wr+z1sF0V+sNSXPxXDdEEL/iYLszsN5VKxVB1IPfEqhzVpiqvg== +"@babel/plugin-transform-modules-systemjs@^7.19.6": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e" + integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw== dependencies: - "@babel/helper-hoist-variables" "^7.16.0" - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-validator-identifier" "^7.15.7" - babel-plugin-dynamic-import-node "^2.3.3" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-module-transforms" "^7.20.11" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-validator-identifier" "^7.19.1" -"@babel/plugin-transform-modules-umd@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.0.tgz#195f26c2ad6d6a391b70880effce18ce625e06a7" - integrity sha512-nx4f6no57himWiHhxDM5pjwhae5vLpTK2zCnDH8+wNLJy0TVER/LJRHl2bkt6w9Aad2sPD5iNNoUpY3X9sTGDg== +"@babel/plugin-transform-modules-umd@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9" + integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ== dependencies: - "@babel/helper-module-transforms" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-module-transforms" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-named-capturing-groups-regex@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.0.tgz#d3db61cc5d5b97986559967cd5ea83e5c32096ca" - integrity sha512-LogN88uO+7EhxWc8WZuQ8vxdSyVGxhkh8WTC3tzlT8LccMuQdA81e9SGV6zY7kY2LjDhhDOFdQVxdGwPyBCnvg== +"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8" + integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" + "@babel/helper-create-regexp-features-plugin" "^7.20.5" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-new-target@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.0.tgz#af823ab576f752215a49937779a41ca65825ab35" - integrity sha512-fhjrDEYv2DBsGN/P6rlqakwRwIp7rBGLPbrKxwh7oVt5NNkIhZVOY2GRV+ULLsQri1bDqwDWnU3vhlmx5B2aCw== +"@babel/plugin-transform-new-target@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8" + integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-object-super@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.0.tgz#fb20d5806dc6491a06296ac14ea8e8d6fedda72b" - integrity sha512-fds+puedQHn4cPLshoHcR1DTMN0q1V9ou0mUjm8whx9pGcNvDrVVrgw+KJzzCaiTdaYhldtrUps8DWVMgrSEyg== +"@babel/plugin-transform-object-super@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c" + integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-replace-supers" "^7.16.0" + "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-replace-supers" "^7.18.6" -"@babel/plugin-transform-parameters@^7.16.0", "@babel/plugin-transform-parameters@^7.16.3": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.3.tgz#fa9e4c874ee5223f891ee6fa8d737f4766d31d15" - integrity sha512-3MaDpJrOXT1MZ/WCmkOFo7EtmVVC8H4EUZVrHvFOsmwkk4lOjQj8rzv8JKUZV4YoQKeoIgk07GO+acPU9IMu/w== +"@babel/plugin-transform-parameters@^7.20.1", "@babel/plugin-transform-parameters@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.7.tgz#0ee349e9d1bc96e78e3b37a7af423a4078a7083f" + integrity sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.20.2" -"@babel/plugin-transform-property-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.0.tgz#a95c552189a96a00059f6776dc4e00e3690c78d1" - integrity sha512-XLldD4V8+pOqX2hwfWhgwXzGdnDOThxaNTgqagOcpBgIxbUvpgU2FMvo5E1RyHbk756WYgdbS0T8y0Cj9FKkWQ== +"@babel/plugin-transform-property-literals@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3" + integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-regenerator@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.0.tgz#eaee422c84b0232d03aea7db99c97deeaf6125a4" - integrity sha512-JAvGxgKuwS2PihiSFaDrp94XOzzTUeDeOQlcKzVAyaPap7BnZXK/lvMDiubkPTdotPKOIZq9xWXWnggUMYiExg== +"@babel/plugin-transform-regenerator@^7.18.6": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d" + integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ== dependencies: - regenerator-transform "^0.14.2" + "@babel/helper-plugin-utils" "^7.20.2" + regenerator-transform "^0.15.1" -"@babel/plugin-transform-reserved-words@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.0.tgz#fff4b9dcb19e12619394bda172d14f2d04c0379c" - integrity sha512-Dgs8NNCehHSvXdhEhln8u/TtJxfVwGYCgP2OOr5Z3Ar+B+zXicEOKNTyc+eca2cuEOMtjW6m9P9ijOt8QdqWkg== +"@babel/plugin-transform-reserved-words@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a" + integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-runtime@^7.13.10": - version "7.16.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.4.tgz#f9ba3c7034d429c581e1bd41b4952f3db3c2c7e8" - integrity sha512-pru6+yHANMTukMtEZGC4fs7XPwg35v8sj5CIEmE+gEkFljFiVJxEWxx/7ZDkTK+iZRYo1bFXBtfIN95+K3cJ5A== + version "7.19.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz#9d2a9dbf4e12644d6f46e5e75bfbf02b5d6e9194" + integrity sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw== dependencies: - "@babel/helper-module-imports" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.4.0" - babel-plugin-polyfill-regenerator "^0.3.0" + "@babel/helper-module-imports" "^7.18.6" + "@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" -"@babel/plugin-transform-shorthand-properties@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.0.tgz#090372e3141f7cc324ed70b3daf5379df2fa384d" - integrity sha512-iVb1mTcD8fuhSv3k99+5tlXu5N0v8/DPm2mO3WACLG6al1CGZH7v09HJyUb1TtYl/Z+KrM6pHSIJdZxP5A+xow== +"@babel/plugin-transform-shorthand-properties@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9" + integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-spread@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.0.tgz#d21ca099bbd53ab307a8621e019a7bd0f40cdcfb" - integrity sha512-Ao4MSYRaLAQczZVp9/7E7QHsCuK92yHRrmVNRe/SlEJjhzivq0BSn8mEraimL8wizHZ3fuaHxKH0iwzI13GyGg== +"@babel/plugin-transform-spread@^7.19.0": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e" + integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" -"@babel/plugin-transform-sticky-regex@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.0.tgz#c35ea31a02d86be485f6aa510184b677a91738fd" - integrity sha512-/ntT2NljR9foobKk4E/YyOSwcGUXtYWv5tinMK/3RkypyNBNdhHUaq6Orw5DWq9ZcNlS03BIlEALFeQgeVAo4Q== +"@babel/plugin-transform-sticky-regex@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc" + integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.6" -"@babel/plugin-transform-template-literals@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.0.tgz#a8eced3a8e7b8e2d40ec4ec4548a45912630d302" - integrity sha512-Rd4Ic89hA/f7xUSJQk5PnC+4so50vBoBfxjdQAdvngwidM8jYIBVxBZ/sARxD4e0yMXRbJVDrYf7dyRtIIKT6Q== +"@babel/plugin-transform-template-literals@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e" + integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-typeof-symbol@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.0.tgz#8b19a244c6f8c9d668dca6a6f754ad6ead1128f2" - integrity sha512-++V2L8Bdf4vcaHi2raILnptTBjGEFxn5315YU+e8+EqXIucA+q349qWngCLpUYqqv233suJ6NOienIVUpS9cqg== +"@babel/plugin-transform-typeof-symbol@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0" + integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-unicode-escapes@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.0.tgz#1a354064b4c45663a32334f46fa0cf6100b5b1f3" - integrity sha512-VFi4dhgJM7Bpk8lRc5CMaRGlKZ29W9C3geZjt9beuzSUrlJxsNwX7ReLwaL6WEvsOf2EQkyIJEPtF8EXjB/g2A== +"@babel/plugin-transform-unicode-escapes@^7.18.10": + version "7.18.10" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246" + integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ== dependencies: - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-plugin-utils" "^7.18.9" -"@babel/plugin-transform-unicode-regex@^7.16.0": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.0.tgz#293b80950177c8c85aede87cef280259fb995402" - integrity sha512-jHLK4LxhHjvCeZDWyA9c+P9XH1sOxRd1RO9xMtDVRAOND/PczPqizEtVdx4TQF/wyPaewqpT+tgQFYMnN/P94A== +"@babel/plugin-transform-unicode-regex@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca" + integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.16.0" - "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-create-regexp-features-plugin" "^7.18.6" + "@babel/helper-plugin-utils" "^7.18.6" "@babel/preset-env@^7.13.12": - version "7.16.4" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.4.tgz#4f6ec33b2a3fe72d6bfdcdf3859500232563a2e3" - integrity sha512-v0QtNd81v/xKj4gNKeuAerQ/azeNn/G1B1qMLeXOcV8+4TWlD2j3NV1u8q29SDFBXx/NBq5kyEAO+0mpRgacjA== + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506" + integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg== dependencies: - "@babel/compat-data" "^7.16.4" - "@babel/helper-compilation-targets" "^7.16.3" - "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-validator-option" "^7.14.5" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.2" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.0" - "@babel/plugin-proposal-async-generator-functions" "^7.16.4" - "@babel/plugin-proposal-class-properties" "^7.16.0" - "@babel/plugin-proposal-class-static-block" "^7.16.0" - "@babel/plugin-proposal-dynamic-import" "^7.16.0" - "@babel/plugin-proposal-export-namespace-from" "^7.16.0" - "@babel/plugin-proposal-json-strings" "^7.16.0" - "@babel/plugin-proposal-logical-assignment-operators" "^7.16.0" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.0" - "@babel/plugin-proposal-numeric-separator" "^7.16.0" - "@babel/plugin-proposal-object-rest-spread" "^7.16.0" - "@babel/plugin-proposal-optional-catch-binding" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.0" - "@babel/plugin-proposal-private-methods" "^7.16.0" - "@babel/plugin-proposal-private-property-in-object" "^7.16.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.16.0" + "@babel/compat-data" "^7.20.1" + "@babel/helper-compilation-targets" "^7.20.0" + "@babel/helper-plugin-utils" "^7.20.2" + "@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.20.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" + "@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.20.2" + "@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.20.0" "@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" @@ -812,44 +848,44 @@ "@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.16.0" - "@babel/plugin-transform-async-to-generator" "^7.16.0" - "@babel/plugin-transform-block-scoped-functions" "^7.16.0" - "@babel/plugin-transform-block-scoping" "^7.16.0" - "@babel/plugin-transform-classes" "^7.16.0" - "@babel/plugin-transform-computed-properties" "^7.16.0" - "@babel/plugin-transform-destructuring" "^7.16.0" - "@babel/plugin-transform-dotall-regex" "^7.16.0" - "@babel/plugin-transform-duplicate-keys" "^7.16.0" - "@babel/plugin-transform-exponentiation-operator" "^7.16.0" - "@babel/plugin-transform-for-of" "^7.16.0" - "@babel/plugin-transform-function-name" "^7.16.0" - "@babel/plugin-transform-literals" "^7.16.0" - "@babel/plugin-transform-member-expression-literals" "^7.16.0" - "@babel/plugin-transform-modules-amd" "^7.16.0" - "@babel/plugin-transform-modules-commonjs" "^7.16.0" - "@babel/plugin-transform-modules-systemjs" "^7.16.0" - "@babel/plugin-transform-modules-umd" "^7.16.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.0" - "@babel/plugin-transform-new-target" "^7.16.0" - "@babel/plugin-transform-object-super" "^7.16.0" - "@babel/plugin-transform-parameters" "^7.16.3" - "@babel/plugin-transform-property-literals" "^7.16.0" - "@babel/plugin-transform-regenerator" "^7.16.0" - "@babel/plugin-transform-reserved-words" "^7.16.0" - "@babel/plugin-transform-shorthand-properties" "^7.16.0" - "@babel/plugin-transform-spread" "^7.16.0" - "@babel/plugin-transform-sticky-regex" "^7.16.0" - "@babel/plugin-transform-template-literals" "^7.16.0" - "@babel/plugin-transform-typeof-symbol" "^7.16.0" - "@babel/plugin-transform-unicode-escapes" "^7.16.0" - "@babel/plugin-transform-unicode-regex" "^7.16.0" + "@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.20.2" + "@babel/plugin-transform-classes" "^7.20.2" + "@babel/plugin-transform-computed-properties" "^7.18.9" + "@babel/plugin-transform-destructuring" "^7.20.2" + "@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.19.6" + "@babel/plugin-transform-modules-commonjs" "^7.19.6" + "@babel/plugin-transform-modules-systemjs" "^7.19.6" + "@babel/plugin-transform-modules-umd" "^7.18.6" + "@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.20.1" + "@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.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.16.0" - babel-plugin-polyfill-corejs2 "^0.3.0" - babel-plugin-polyfill-corejs3 "^0.4.0" - babel-plugin-polyfill-regenerator "^0.3.0" - core-js-compat "^3.19.1" + "@babel/types" "^7.20.2" + 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" "@babel/preset-modules@^0.1.5": @@ -863,51 +899,45 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/runtime-corejs3@^7.10.2": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.16.3.tgz#1e25de4fa994c57c18e5fdda6cc810dac70f5590" - integrity sha512-IAdDC7T0+wEB4y2gbIL0uOXEYpiZEeuFUTVbdGq+UwCcF35T/tS8KrmMomEwEc5wBbyfH3PJVpTSUqrhPDXFcQ== +"@babel/runtime@^7.10.5", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": + version "7.20.13" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b" + integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA== dependencies: - core-js-pure "^3.19.0" - regenerator-runtime "^0.13.4" + regenerator-runtime "^0.13.11" -"@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" - integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ== +"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== dependencies: - regenerator-runtime "^0.13.4" + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" -"@babel/template@^7.16.0", "@babel/template@^7.3.3": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.0.tgz#d16a35ebf4cd74e202083356fab21dd89363ddd6" - integrity sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.13", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7": + version "7.20.13" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.13.tgz#817c1ba13d11accca89478bd5481b2d168d07473" + integrity sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ== dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/parser" "^7.16.0" - "@babel/types" "^7.16.0" - -"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.0", "@babel/traverse@^7.16.3": - version "7.16.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787" - integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag== - dependencies: - "@babel/code-frame" "^7.16.0" - "@babel/generator" "^7.16.0" - "@babel/helper-function-name" "^7.16.0" - "@babel/helper-hoist-variables" "^7.16.0" - "@babel/helper-split-export-declaration" "^7.16.0" - "@babel/parser" "^7.16.3" - "@babel/types" "^7.16.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.20.7" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.20.13" + "@babel/types" "^7.20.7" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.16.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.16.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.16.0.tgz#db3b313804f96aadd0b776c4823e127ad67289ba" - integrity sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg== +"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" + integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== dependencies: - "@babel/helper-validator-identifier" "^7.15.7" + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -915,6 +945,137 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== +"@budibase/bbui@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.2.12-alpha.51.tgz#c346501eeb4daba522794a6fd6063b387100454b" + integrity sha512-Eajnvt/kMl7kN/UhBB22DkHwItglk4PYwAxaaNa2OIUyl9NYYkDKDCvjCm+NeIgTZNmk+1FXsGN6FFcufbn+Og== + dependencies: + "@adobe/spectrum-css-workflow-icons" "1.2.1" + "@budibase/string-templates" "2.2.12-alpha.51" + "@spectrum-css/accordion" "3.0.24" + "@spectrum-css/actionbutton" "1.0.1" + "@spectrum-css/actiongroup" "1.0.1" + "@spectrum-css/avatar" "3.0.2" + "@spectrum-css/button" "3.0.1" + "@spectrum-css/buttongroup" "3.0.2" + "@spectrum-css/checkbox" "3.0.2" + "@spectrum-css/dialog" "3.0.1" + "@spectrum-css/divider" "1.0.3" + "@spectrum-css/dropzone" "3.0.2" + "@spectrum-css/fieldgroup" "3.0.2" + "@spectrum-css/fieldlabel" "3.0.1" + "@spectrum-css/icon" "3.0.1" + "@spectrum-css/illustratedmessage" "3.0.2" + "@spectrum-css/inlinealert" "2.0.1" + "@spectrum-css/inputgroup" "3.0.2" + "@spectrum-css/label" "2.0.10" + "@spectrum-css/link" "3.1.1" + "@spectrum-css/menu" "3.0.1" + "@spectrum-css/modal" "3.0.1" + "@spectrum-css/pagination" "3.0.3" + "@spectrum-css/picker" "1.0.1" + "@spectrum-css/popover" "3.0.1" + "@spectrum-css/progressbar" "1.0.2" + "@spectrum-css/progresscircle" "1.0.2" + "@spectrum-css/radio" "3.0.2" + "@spectrum-css/search" "3.0.2" + "@spectrum-css/sidenav" "3.0.2" + "@spectrum-css/slider" "3.0.1" + "@spectrum-css/statuslight" "3.0.2" + "@spectrum-css/stepper" "3.0.3" + "@spectrum-css/switch" "1.0.2" + "@spectrum-css/table" "3.0.1" + "@spectrum-css/tabs" "3.2.12" + "@spectrum-css/tags" "3.0.2" + "@spectrum-css/textfield" "3.0.1" + "@spectrum-css/toast" "3.0.1" + "@spectrum-css/tooltip" "3.0.3" + "@spectrum-css/treeview" "3.0.2" + "@spectrum-css/typography" "3.0.1" + "@spectrum-css/underlay" "2.0.9" + "@spectrum-css/vars" "3.0.1" + dayjs "^1.10.4" + easymde "^2.16.1" + svelte-flatpickr "^3.2.3" + svelte-portal "^1.0.0" + +"@budibase/client@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.2.12-alpha.51.tgz#3177ceee2bc37c27c49ba2afc1de3d9274cfbe42" + integrity sha512-WlPWYtUtYMfP6RI9F+FazRP06Y1Ay6pZA3/4Kxy+Gw4B78Qvf9OEj14DO++4raZP507d94TyGbewxq/EfTfEng== + dependencies: + "@budibase/bbui" "2.2.12-alpha.51" + "@budibase/frontend-core" "2.2.12-alpha.51" + "@budibase/string-templates" "2.2.12-alpha.51" + "@spectrum-css/button" "^3.0.3" + "@spectrum-css/card" "^3.0.3" + "@spectrum-css/divider" "^1.0.3" + "@spectrum-css/link" "^3.1.3" + "@spectrum-css/page" "^3.0.1" + "@spectrum-css/tag" "^3.1.4" + "@spectrum-css/typography" "^3.0.2" + "@spectrum-css/vars" "^3.0.1" + apexcharts "^3.22.1" + dayjs "^1.10.5" + downloadjs "1.4.7" + html5-qrcode "^2.2.1" + leaflet "^1.7.1" + regexparam "^1.3.0" + sanitize-html "^2.7.0" + screenfull "^6.0.1" + shortid "^2.2.15" + socket.io-client "^4.5.1" + svelte "^3.49.0" + svelte-apexcharts "^1.0.2" + svelte-flatpickr "^3.1.0" + svelte-spa-router "^3.0.5" + +"@budibase/frontend-core@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.2.12-alpha.51.tgz#029b84a5427113b36d8d72861cf6b7e43cde09b3" + integrity sha512-iO4dIxKbfcQIsHkaSYmvsPi5btOXEgu3+Gb1RRMJ6x/H3Mn17tHUXG1q+zkRLszXurR/h1Z/YzF60wUYxJzm7A== + dependencies: + "@budibase/bbui" "2.2.12-alpha.51" + lodash "^4.17.21" + svelte "^3.46.2" + +"@budibase/handlebars-helpers@^0.11.8": + version "0.11.8" + resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" + integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ== + dependencies: + array-sort "^1.0.0" + define-property "^2.0.2" + extend-shallow "^3.0.2" + for-in "^1.0.2" + get-object "^0.2.0" + get-value "^3.0.1" + handlebars "^4.7.7" + handlebars-utils "^1.0.6" + has-value "^2.0.2" + helper-md "^0.2.2" + html-tag "^2.0.0" + is-even "^1.0.0" + is-glob "^4.0.1" + kind-of "^6.0.3" + micromatch "^3.1.5" + relative "^3.0.2" + striptags "^3.1.1" + to-gfm-code-block "^0.1.1" + year "^0.2.1" + +"@budibase/string-templates@2.2.12-alpha.51": + version "2.2.12-alpha.51" + resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.2.12-alpha.51.tgz#13fd7ac4bfe628b517541974aa560d75129a7d31" + integrity sha512-fgJJopKfc/VHCYLE7KRda6bJzrHyn0wBJfo3DImogPE2cfAxdXTMpMj2IX4dza8mePJC6WjtJbtc2NLZtg7u2w== + dependencies: + "@budibase/handlebars-helpers" "^0.11.8" + dayjs "^1.10.4" + handlebars "^4.7.6" + handlebars-utils "^1.0.6" + lodash "^4.17.20" + vm2 "^3.9.4" + "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -923,6 +1084,11 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@colors/colors@1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" + integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== + "@cspotcode/source-map-support@^0.8.0": version "0.8.1" resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" @@ -931,9 +1097,9 @@ "@jridgewell/trace-mapping" "0.3.9" "@cypress/request@^2.88.10": - version "2.88.10" - resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce" - integrity sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg== + version "2.88.11" + resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.11.tgz#5a4c7399bc2d7e7ed56e92ce5acb620c8b187047" + integrity sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w== dependencies: aws-sign2 "~0.7.0" aws4 "^1.8.0" @@ -948,7 +1114,7 @@ json-stringify-safe "~5.0.1" mime-types "~2.1.19" performance-now "^2.1.0" - qs "~6.5.2" + qs "~6.10.3" safe-buffer "^5.1.2" tough-cookie "~2.5.0" tunnel-agent "^0.6.0" @@ -962,15 +1128,46 @@ debug "^3.1.0" lodash.once "^4.1.1" -"@esbuild/linux-loong64@0.14.54": - version "0.14.54" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz#de2a4be678bd4d0d1ffbb86e6de779cde5999028" - integrity sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw== +"@esbuild/android-arm@0.15.18": + version "0.15.18" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.18.tgz#266d40b8fdcf87962df8af05b76219bc786b4f80" + integrity sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw== + +"@esbuild/linux-loong64@0.15.18": + version "0.15.18" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz#128b76ecb9be48b60cf5cfc1c63a4f00691a3239" + integrity sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ== + +"@fortawesome/fontawesome-common-types@6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz#411e02a820744d3f7e0d8d9df9d82b471beaa073" + integrity sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ== + +"@fortawesome/fontawesome-svg-core@^6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz#e87e905e444b5e7b715af09b64d27b53d4c8f9d9" + integrity sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA== + dependencies: + "@fortawesome/fontawesome-common-types" "6.2.1" + +"@fortawesome/free-brands-svg-icons@^6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.1.tgz#04a6d6f7898f7ef392aba7a65030a584d4f4c84f" + integrity sha512-L8l4MfdHPmZlJ72PvzdfwOwbwcCAL0vx48tJRnI6u1PJXh+j2f3yDoKyQgO3qjEsgD5Fr2tQV/cPP8F/k6aUig== + dependencies: + "@fortawesome/fontawesome-common-types" "6.2.1" + +"@fortawesome/free-solid-svg-icons@^6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz#2290ea5adcf1537cbd0c43de6feb38af02141d27" + integrity sha512-oKuqrP5jbfEPJWTij4sM+/RvgX+RMFwx3QZCZcK9PrBDgxC35zuc7AOFsyMjMd/PIFPeB2JxyqDr5zs/DZFPPw== + dependencies: + "@fortawesome/fontawesome-common-types" "6.2.1" "@hapi/hoek@^9.0.0": - version "9.2.1" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.1.tgz#9551142a1980503752536b5050fd99f4a7f13b17" - integrity sha512-gfta+H8aziZsm8pZa0vj04KO6biEiisppNgA1kbJvFrrWu9Vm7eaUEy76DIxsuTaWvti5fkJVhllWc6ZTE+Mdw== + version "9.3.0" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb" + integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ== "@hapi/topo@^5.0.0": version "5.1.0" @@ -1051,6 +1248,13 @@ "@types/node" "*" jest-mock "^26.6.2" +"@jest/expect-utils@^29.4.1": + version "29.4.1" + resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.4.1.tgz#105b9f3e2c48101f09cae2f0a4d79a1b3a419cbb" + integrity sha512-w6YJMn5DlzmxjO00i9wu2YSozUYRBhIoJ6nQwpMYcBMtiqMGJm1QBzOf6DDgRao8dbtpDoaqLg6iiQTvv0UHhQ== + dependencies: + jest-get-type "^29.2.0" + "@jest/fake-timers@^26.6.2": version "26.6.2" resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad" @@ -1104,6 +1308,13 @@ optionalDependencies: node-notifier "^8.0.0" +"@jest/schemas@^29.4.0": + version "29.4.0" + resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.0.tgz#0d6ad358f295cc1deca0b643e6b4c86ebd539f17" + integrity sha512-0E01f/gOZeNTG76i5eWWSupvSHaIINrTie7vCyjiYFKgzNdyEGd12BUv4oNBFHOqlHDbtoJi3HrQ38KCC90NsQ== + dependencies: + "@sinclair/typebox" "^0.25.16" + "@jest/source-map@^26.6.2": version "26.6.2" resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535" @@ -1166,23 +1377,46 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@jest/types@^27.2.5": - version "27.2.5" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.2.5.tgz#420765c052605e75686982d24b061b4cbba22132" - integrity sha512-nmuM4VuDtCZcY+eTpw+0nvstwReMsjPoj7ZR80/BbixulhLaiX+fbv8oeLW8WZlJMcsGQsTmMKT/iTZu1Uy/lQ== +"@jest/types@^29.4.1": + version "29.4.1" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.4.1.tgz#f9f83d0916f50696661da72766132729dcb82ecb" + integrity sha512-zbrAXDUOnpJ+FMST2rV7QZOgec8rskg2zv8g2ajeqitp4tvZiyqTCYXANrKsM+ryj5o+LI+ZN2EgU9drrkiwSA== dependencies: + "@jest/schemas" "^29.4.0" "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" "@types/node" "*" - "@types/yargs" "^16.0.0" + "@types/yargs" "^17.0.8" chalk "^4.0.0" -"@jridgewell/resolve-uri@^3.0.3": +"@jridgewell/gen-mapping@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" + integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/gen-mapping@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3": version "3.1.0" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== -"@jridgewell/sourcemap-codec@^1.4.10": +"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.14" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== @@ -1195,6 +1429,14 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" +"@jridgewell/trace-mapping@^0.3.9": + version "0.3.17" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" + integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== + dependencies: + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1312,10 +1554,10 @@ resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.19.1.tgz#8762f668d3fc2416fbde31d15d13009544caeb54" integrity sha512-M5MhTLnjqYFwxMwcFPBpBgYQqI9hCvtVuj/A+NvcBHpe7VWOXdn/Sys+zD6C76DWGFYQdw3OWCsZimP24dL8mA== -"@sentry/types@^7.2.0": - version "7.21.1" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.21.1.tgz#408a7b95a66ddc30c4359979594e03bee8f9fbdc" - integrity sha512-3/IKnd52Ol21amQvI+kz+WB76s8/LR5YvFJzMgIoI2S8d82smIr253zGijRXxHPEif8kMLX4Yt+36VzrLxg6+A== +"@sentry/types@7.22.0": + version "7.22.0" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.22.0.tgz#58e4ce77b523048e0f31e2ea4b597946d76f6079" + integrity sha512-LhCL+wb1Jch+OesB2CIt6xpfO1Ab6CRvoNYRRzVumWPLns1T3ZJkarYfhbLaOEIb38EIbPgREdxn2AJT560U4Q== "@sentry/utils@5.19.1": version "5.19.1" @@ -1325,27 +1567,32 @@ "@sentry/types" "5.19.1" tslib "^1.9.3" -"@sideway/address@^4.1.0": - version "4.1.2" - resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.2.tgz#811b84333a335739d3969cfc434736268170cad1" - integrity sha512-idTz8ibqWFrPU8kMirL0CoPH/A29XOzzAzpyN3zQ4kAWnzmNfFmRaoMNN6VI8ske5M73HZyhIaW4OuSFIdM4oA== +"@sideway/address@^4.1.3": + version "4.1.4" + resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0" + integrity sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw== dependencies: "@hapi/hoek" "^9.0.0" "@sideway/formula@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.0.tgz#fe158aee32e6bd5de85044be615bc08478a0a13c" - integrity sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg== + version "3.0.1" + resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f" + integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg== "@sideway/pinpoint@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== +"@sinclair/typebox@^0.25.16": + version "0.25.21" + resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.21.tgz#763b05a4b472c93a8db29b2c3e359d55b29ce272" + integrity sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g== + "@sinonjs/commons@^1.7.0": - version "1.8.3" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" - integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== + version "1.8.6" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.6.tgz#80c516a4dc264c2a69115e7578d62581ff455ed9" + integrity sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ== dependencies: type-detect "4.0.8" @@ -1356,27 +1603,281 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@spectrum-css/accordion@^3.0.24": +"@socket.io/component-emitter@~3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" + integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== + +"@spectrum-css/accordion@3.0.24": version "3.0.24" resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74" integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA== -"@spectrum-css/page@^3.0.1": - version "3.0.8" - resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.8.tgz#001efa9e4c10095df9b2b37cf7d7d6eb60140190" - integrity sha512-naEGOyDv9zeK05oa8mZKdwenPILmHG9OTLyKcE8RwuYQDvb0EHcMGC54DOKtGJ5SMNMGCMdC4RwmYUYYKAhkNA== - dependencies: - "@spectrum-css/vars" "^4.3.0" +"@spectrum-css/accordion@^3.0.24": + version "3.0.30" + resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.30.tgz#0893a6db28bab984bf5adaf7e1ba194e741db615" + integrity sha512-J9zw5blM72pl+mtticqJKwLHaQYBwtrfwDXwQuz3lOTUcedzxQ0Pk2lZ1P46+98hdJzxTXZ5RjIyXre3TPEq1w== -"@spectrum-css/vars@^3.0.1": +"@spectrum-css/actionbutton@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577" + integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw== + +"@spectrum-css/actiongroup@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c" + integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA== + +"@spectrum-css/avatar@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95" + integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ== + +"@spectrum-css/button@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.1.tgz#6db8c3e851baecd0f1c2d88fef37d49d01c6e643" + integrity sha512-YXrBtjIYisk4Vaxnp0RiE4gdElQX04P2mc4Pi2GlQ27dJKlHmufYcF+kAqGdtiyK5yjdN/vKRcC8y13aA4rusA== + +"@spectrum-css/button@^3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84" + integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg== + +"@spectrum-css/buttongroup@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.2.tgz#fd3387973ca3131609e32112de42a1c0400a48d8" + integrity sha512-Wu7B4GJ/SAeVHz9SUGAkeIH8pLaZh4t+w2ykSKOPQIRuK2jCBoudkEClVxviNVwqekccf5XLFXg9GpYF1a3Uaw== + +"@spectrum-css/card@^3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b" + integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg== + +"@spectrum-css/checkbox@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.0.2.tgz#53ca2fba0d9faa1fead10e7206eb1f6cdcfd6ddd" + integrity sha512-hPbGcnm7kJvJS4jp/P/bdaZvbyR1eIE9mteuZqcBgdmyp9m/k6+mW5jmsbtqb3Y4mMPWvOJFfz/sIvWJP0F0Zg== + +"@spectrum-css/dialog@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.1.tgz#33aae036282159f6aa998848b8c0828640a9620a" + integrity sha512-hUFbRR6RGT63MNuP7wP+k9KU+uRuICsduMihskh700e+jiQ+Gsv53fBFDlB843FoZYlIXzFQXgtjMUC5a4Qibw== + +"@spectrum-css/divider@1.0.3": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385" + integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA== + dependencies: + "@spectrum-css/vars" "^3.0.2" + +"@spectrum-css/divider@^1.0.3": + version "1.0.27" + resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.27.tgz#435bf738a65b4eb15c899edf5c536bea22f2d679" + integrity sha512-hWKPHOEo9lkOGN5zecpVVwVxE3x0SJHQJKDNx1g0xs/P/AthAboK+L1c9Rq29czNfcQ2kUjumi4igzQzcqABMQ== + dependencies: + "@spectrum-css/vars" "^8.0.0" + +"@spectrum-css/dropzone@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.2.tgz#34f137851054442b219fed7f32006b93fc5e0bcf" + integrity sha512-BuBBzm5re6lM0AWgd6V+mI5eEGnnmFEtcFiJBEn9jYNEQYgflFhvnERUt89jMX5WmspiecwI2JBWJFrtFsOzug== + +"@spectrum-css/fieldgroup@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.0.2.tgz#1c1afd3c444d8650fefac275dc66a7a913933846" + integrity sha512-Vyw0kQJdLW18J6w4H+YAsoLntvkw5rXmW3CH5H3SDTXkBztxtHSSe3e106Nw5MoZxTfHlom6CxbYXYCTjQfqGw== + +"@spectrum-css/fieldlabel@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.1.tgz#39f7c0f25cc2ff402afeff005341b0832f7c588c" + integrity sha512-LMfwrwIq8wEEvxFLobdLvXRwKrp8o9Fty4iJ9aYl2Rj1uXkfRd8qLz9HGZjLEE1OuJgoTBgamYABl7EvoA5PLw== + +"@spectrum-css/icon@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.1.tgz#e300a6fc353c85c6b5d6e7a364408a940c31b177" + integrity sha512-cGFtIrcQ/7tthdkHK1npuEFiCdYVHLqwmLxghUYQw8Tb8KgJaw3OBO1tpjgsUizexNgu26BjVRIbGxNWuBXIHQ== + +"@spectrum-css/illustratedmessage@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.2.tgz#6a480be98b027e050b086e7899e40d87adb0a8c0" + integrity sha512-dqnE8X27bGcO0HN8+dYx8O4o0dNNIAqeivOzDHhe2El+V4dTzMrNIerF6G0NLm3GjVf6XliwmitsZK+K6FmbtA== + +"@spectrum-css/inlinealert@2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.1.tgz#7521f88f6c845806403cc7d925773c7414e204a2" + integrity sha512-Xy5RCOwgurqUXuGQCsEDUduDd5408bmEpmFg+feynG7VFUgLFZWBeylSENB/OqjlFtO76PHXNVdHkhDscPIHTA== + +"@spectrum-css/inputgroup@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.2.tgz#f1b13603832cbd22394f3d898af13203961f8691" + integrity sha512-O0G3Lw9gxsh8gTLQWIAKkN1O8cWhjpEUl+oR1PguIKFni72uNr2ikU9piOwy/r0gJG2Q/TVs6hAshoAAkmsSzw== + +"@spectrum-css/label@2.0.10": + version "2.0.10" + resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001" + integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ== + +"@spectrum-css/link@3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb" + integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA== + +"@spectrum-css/link@^3.1.3": + version "3.1.23" + resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.23.tgz#9d9ff64c41366edbfdb19d04a5deec88bf2ea8fd" + integrity sha512-CAJQGnGTrTtR4tF1L94ou9Y+c4vnx9d5rWhb3AMzKb2Focqz02xSkTyaCCH7OM/3CwD8TCLOMANon8LcRpGAjA== + +"@spectrum-css/menu@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe" + integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg== + +"@spectrum-css/modal@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.1.tgz#613a6b83d0330a4d38db41a98090800751c56d8d" + integrity sha512-F7D99F3cjDGT9DM9sogx/p49jrNYT7a1J6TUoqV73wUf+0gP+dTsskBOo9jB8VbUE+POQPjiDLB+SWLp6iBB+w== + +"@spectrum-css/page@^3.0.1": + version "3.0.9" + resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.9.tgz#f8a705dee90af958e2ee20307218e4f82a018c36" + integrity sha512-zxbzJHDHgbc6fq6DpgWPtQa73kCl/3bukMOV2l784jyEWfXx62nuhFYxFVUq8olvyHw2MNZEXF//P7y+W5axVw== + dependencies: + "@spectrum-css/vars" "^4.3.1" + +"@spectrum-css/pagination@3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.3.tgz#b204c3ada384c4af751a354bc428346d82eeea65" + integrity sha512-OJ/v9GeNXJOZ9Yr9LDBYPrR2NCiLOWP9wANT/a5sqFuugRnQbn/HYMnRp9TBxwpDY6ihaPo0T/wi7kLiAJFdDw== + +"@spectrum-css/picker@1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.1.tgz#98991198576d26bd14160824e7b6f3c278ff930b" + integrity sha512-Rv4/UBOdNW1gs7WVBCJnPD5VFly8MqP++psDX6kcugUIcfJy0GC3acvElotmKRlCDk8Qxks2W2A0jKeSgphTmA== + +"@spectrum-css/popover@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.1.tgz#5863c1efc53f98f9aba2de9186666780041303fc" + integrity sha512-LmOSj/yCwQQ9iGmCYnHiJsJR/HfPiGqI1Jl7pkKxBOCxYBMS/5+ans9vfCN2Qnd0eK7WSbfPg72S6mjye7db2Q== + +"@spectrum-css/progressbar@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.2.tgz#b5a59432517f9ae6dad49d9504691bc5ac42b424" + integrity sha512-+jExeBLtVCqo3BqtFq5WCtZ028Dzk+oUnX6y4z6ZamKPqOyOELOtFnhYnyhyRndQOqYwKUTXx9zsaWA/lpJOHw== + +"@spectrum-css/progresscircle@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.2.tgz#258ea9170fb70f795edda03e38a61d93bef4487c" + integrity sha512-JLULpyzjIY95lzlWR1yE1gv4l1K6p+scQ+edmuZZUHBzwM3pUtkvHJmUlA9TYdResUYW6Uka60VRdY6lZ8gnFQ== + +"@spectrum-css/radio@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.2.tgz#9c1386894920bbed604e4e174fbbd45d9d762152" + integrity sha512-0TDdzC9omNXnpKHEXNuuGeXdNh4x8jvTKVUqMRLb7vY4hY94hAdt6X01NBqka+jzK35HxGzpDdPADAz62yZLPQ== + +"@spectrum-css/search@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.0.2.tgz#70e93e321032d40b399498b2324e3b70e050551e" + integrity sha512-3UbT8yZmNOwrZxq+CUmumE+26ZySZ8OoKNM6U20SLMPLgdx6MrRugVE88r3Bl0sJ0RZX/5bU8nausdiHeX+Jlw== + +"@spectrum-css/sidenav@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.2.tgz#9d70f408d588ee79c69857751010333671f32713" + integrity sha512-YpIdH/F0jEICYmoduGrnkTmxwJq1kfKxEp0wOs+ZkQOsvKMv1an7nyhsfOKCQqcGNfYzJ9mJAk7/u5+vsxHa8g== + +"@spectrum-css/slider@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49" + integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q== + +"@spectrum-css/statuslight@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5" + integrity sha512-xodB8g8vGJH20XmUj9ZsPlM1jHrGeRbvmVXkz0q7YvQrYAhim8pP3W+XKKZAletPFAuu8cmUOc6SWn6i4X4z6w== + +"@spectrum-css/stepper@3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.3.tgz#ae89846886431e3edeee060207b8f81540f73a34" + integrity sha512-prAD61ImlOTs9b6PfB3cB08x4lAfxtvnW+RZiTYky0E8GgZdrc/MfCkL5/oqQaIQUtyQv/3Lb7ELAf/0K8QTXw== + +"@spectrum-css/switch@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.2.tgz#f0b4c69271964573e02b08e90998096e49e1de44" + integrity sha512-zqmHpgWPNg1gEwdUNFYV3CBX5JaeALfIqcJIxE0FLZqr9d1C4+oLE0ItIFzt1bwr4bFAOmkEpvtiY+amluzGxQ== + +"@spectrum-css/table@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.1.tgz#753e0e2498082c0c36b9600828516aff3ac338cd" + integrity sha512-XQ+srMTv9hK1H0nctWUtqyzitmvyb5TNR+7mjAmKRdkBRSTQQSipDhenxZp72ekzMtMoSYZVZ77kgo0Iw3Fpug== + +"@spectrum-css/tabs@3.2.12": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff" + integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA== + +"@spectrum-css/tag@^3.1.4": + version "3.3.15" + resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278" + integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q== + +"@spectrum-css/tags@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.2.tgz#5bf35fb79c97cd9344de485bd4626ad5b9f07757" + integrity sha512-HbvMk+QHvCDD1/ScvSErpKROcpAbXuMD4Hl/Gz/1A1lQ0fJ/CJeCq/MMsL7zjK1nlItU/ySu8r8KIuRF+6F8SQ== + +"@spectrum-css/textfield@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.0.1.tgz#e875b8e37817378ad08fc4af7d53026df38911e5" + integrity sha512-MUV5q87CVxbkNdSNoxGrFbgyKc51ft/WWf3aVEoPdPw5yBnXqFe1w1YmAit5zYDOOhhs58sCLAlUcCMlOpkgrA== + +"@spectrum-css/toast@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796" + integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg== + +"@spectrum-css/tooltip@3.0.3": + version "3.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281" + integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A== + +"@spectrum-css/treeview@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.2.tgz#d54d8f17290babb1c885f5d9355e225421beb0d2" + integrity sha512-foO7UBJv1JMFaKgDPVt8jBghZSVbqhXR8TaGaxHSnMubv7ygmKkc1AITrWC2STILCn84ju2vchOohMZfW6sYwg== + +"@spectrum-css/typography@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.1.tgz#957dafd9b18c314fa37a88b549042ba2175f5b3f" + integrity sha512-XyR68K2rIZX3u4j7HhMLOqLVHDJZcapp3XUqgYMzMWccBFleA0qPxKpfRWqVIA5DzTMSIw0wEcZPYKWFZ2e6dA== + +"@spectrum-css/typography@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38" + integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA== + +"@spectrum-css/underlay@2.0.9": + version "2.0.9" + resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.9.tgz#fc10f971d1325cc844b727e6260f7217844060e8" + integrity sha512-X86xd0PG4QobmUyXA90BFGnyygaI8kW64dA4ysf4z0cOvUWjNbAAl3a/DB/WRyrnp63Zqv83T/cgNbetagTbWg== + +"@spectrum-css/vars@3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.1.tgz#561fd69098f896a647242dd8d6108af603bfa31e" + integrity sha512-l4oRcCOqInChYXZN6OQhpe3isk6l4OE6Ys8cgdlsiKp53suNoQxyyd9p/eGRbCjZgH3xQ8nK0t4DHa7QYC0S6w== + +"@spectrum-css/vars@^3.0.1", "@spectrum-css/vars@^3.0.2": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999" integrity sha512-vzS9KqYXot4J3AEER/u618MXWAS+IoMvYMNrOoscKiLLKYQWenaueakUWulFonToPd/9vIpqtdbwxznqrK5qDw== -"@spectrum-css/vars@^4.3.0": - version "4.3.0" - resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-4.3.0.tgz#03ddf67d3aa8a9a4cb0edbbd259465c9ced7e70d" - integrity sha512-ZQ2XAhgu4G9yBeXQNDAz07Z8oZNnMt5o9vzf/mpBA7Teb/JI+8qXp2wt8D245SzmtNlFkG/bzRYvQc0scgZeCQ== +"@spectrum-css/vars@^4.3.1": + version "4.3.1" + resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-4.3.1.tgz#d333fa41909f691c8750b5c15ad9ba029df2248e" + integrity sha512-rX6Iasu9BsFMVgEN0vGRPm9dmSxva+IK/uqQAa9HM0lliwqUiFrJxrFXHHpiAgNuux/U4srEJwbSpGzfF+CegQ== + +"@spectrum-css/vars@^8.0.0": + version "8.0.3" + resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-8.0.3.tgz#a5da23c58861b36ee48b9cd5983f956d2bb7977f" + integrity sha512-LoSPi5273u21O5ItFr3FuLZS3D0y9dlmJImmat8W66r6dPaFJhHDRAbIB93hGOk5mPxqrQb8guAUx7FmvZrbuQ== "@sveltejs/vite-plugin-svelte@1.0.1": version "1.0.1" @@ -1390,41 +1891,41 @@ magic-string "^0.26.2" svelte-hmr "^0.14.12" -"@testing-library/dom@^7.0.3": - version "7.31.2" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-7.31.2.tgz#df361db38f5212b88555068ab8119f5d841a8c4a" - integrity sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ== +"@testing-library/dom@^8.1.0": + version "8.20.0" + resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.20.0.tgz#914aa862cef0f5e89b98cc48e3445c4c921010f6" + integrity sha512-d9ULIT+a4EXLX3UU8FBjauG9NnsZHkHztXoIcTsOKoOw030fyjheN9svkTULjJxtYag9DZz5Jz5qkWZDPxTFwA== dependencies: "@babel/code-frame" "^7.10.4" "@babel/runtime" "^7.12.5" - "@types/aria-query" "^4.2.0" - aria-query "^4.2.2" + "@types/aria-query" "^5.0.1" + aria-query "^5.0.0" chalk "^4.1.0" - dom-accessibility-api "^0.5.6" + dom-accessibility-api "^0.5.9" lz-string "^1.4.4" - pretty-format "^26.6.2" + pretty-format "^27.0.2" "@testing-library/jest-dom@^5.11.10": - version "5.15.0" - resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.15.0.tgz#4f5295dbc476a14aec3b07176434b3d51aae5da7" - integrity sha512-lOMuQidnL1tWHLEWIhL6UvSZC1Qt3OkNe1khvi2h6xFiqpe5O8arYs46OU0qyUGq0cSTbroQyMktYNXu3a7sAA== + version "5.16.5" + resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz#3912846af19a29b2dbf32a6ae9c31ef52580074e" + integrity sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA== dependencies: + "@adobe/css-tools" "^4.0.1" "@babel/runtime" "^7.9.2" "@types/testing-library__jest-dom" "^5.9.1" - aria-query "^4.2.2" + aria-query "^5.0.0" chalk "^3.0.0" - css "^3.0.0" css.escape "^1.5.1" dom-accessibility-api "^0.5.6" lodash "^4.17.15" redent "^3.0.0" "@testing-library/svelte@^3.0.0": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@testing-library/svelte/-/svelte-3.0.3.tgz#fd0653c02c95c8715ff5a51aa232e3306536755e" - integrity sha512-GxafAllShGM2nkntFGURZ7fYVlUYwv7K62lqv1aFqtTYzzeZ2Cu8zTVhtE/Qt3bk2zMl6+FPKP03wjLip/G8mA== + version "3.2.2" + resolved "https://registry.yarnpkg.com/@testing-library/svelte/-/svelte-3.2.2.tgz#aa8ca6bde3136593c5f8b4554e3634d7adc9bdc5" + integrity sha512-IKwZgqbekC3LpoRhSwhd0JswRGxKdAGkf39UiDXTywK61YyLXbCYoR831e/UUC6EeNW4hiHPY+2WuovxOgI5sw== dependencies: - "@testing-library/dom" "^7.0.3" + "@testing-library/dom" "^8.1.0" "@tootallnate/once@1": version "1.1.2" @@ -1432,45 +1933,45 @@ integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== "@tsconfig/node10@^1.0.7": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9" - integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg== + version "1.0.9" + resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" + integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA== "@tsconfig/node12@^1.0.7": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c" - integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw== + version "1.0.11" + resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" + integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== "@tsconfig/node14@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2" - integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg== + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" + integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== "@tsconfig/node16@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" - integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" + integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== -"@types/aria-query@^4.2.0": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc" - integrity sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig== +"@types/aria-query@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-5.0.1.tgz#3286741fb8f1e1580ac28784add4c7a1d49bdfbc" + integrity sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q== "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.16" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz#bc12c74b7d65e82d29876b5d0baf5c625ac58702" - integrity sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ== + version "7.20.0" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891" + integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ== dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" "@types/babel__generator" "*" "@types/babel__template" "*" "@types/babel__traverse" "*" "@types/babel__generator@*": - version "7.6.3" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5" - integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA== + version "7.6.4" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7" + integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg== dependencies: "@babel/types" "^7.0.0" @@ -1483,12 +1984,24 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.14.2" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" - integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== + version "7.18.3" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d" + integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w== dependencies: "@babel/types" "^7.3.0" +"@types/codemirror@^5.60.4": + version "5.60.7" + resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.7.tgz#efbb78e5e79f90c6762c2127c02096648e600808" + integrity sha512-QXIC+RPzt/1BGSuD6iFn6UMC9TDp+9hkOANYNPVsjjrDdzKphfRkwQDKGp2YaC54Yhz0g6P5uYTCCibZZEiMAA== + dependencies: + "@types/tern" "*" + +"@types/estree@*": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" + integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== + "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" @@ -1510,16 +2023,16 @@ "@types/node" "*" "@types/graceful-fs@^4.1.2": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" - integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw== + version "4.1.6" + resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.6.tgz#e14b2576a1c25026b7f02ede1de3b84c3a1efeae" + integrity sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw== dependencies: "@types/node" "*" "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" - integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw== + version "2.0.4" + resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" + integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== "@types/istanbul-lib-report@*": version "3.0.0" @@ -1536,32 +2049,37 @@ "@types/istanbul-lib-report" "*" "@types/jest@*": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-27.0.2.tgz#ac383c4d4aaddd29bbf2b916d8d105c304a5fcd7" - integrity sha512-4dRxkS/AFX0c5XW6IPMNOydLn2tEhNhJV7DnYK+0bjoJZ+QTmfucBlihX7aoEsh/ocYtkLC73UbnBXBXIxsULA== + version "29.4.0" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.4.0.tgz#a8444ad1704493e84dbf07bb05990b275b3b9206" + integrity sha512-VaywcGQ9tPorCX/Jkkni7RWGFfI11whqzs8dvxF41P17Z+z872thvEvlIbznjPJ02kl1HMX3LmLOonsj2n7HeQ== dependencies: - jest-diff "^27.0.0" - pretty-format "^27.0.0" + expect "^29.0.0" + pretty-format "^29.0.0" + +"@types/marked@^4.0.7": + version "4.0.8" + resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.8.tgz#b316887ab3499d0a8f4c70b7bd8508f92d477955" + integrity sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw== "@types/minimatch@*": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" - integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" + integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== "@types/node@*": - version "16.11.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.7.tgz#36820945061326978c42a01e56b61cd223dfdc42" - integrity sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw== + version "18.11.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" + integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== "@types/node@>=4.2.0 < 13": - version "12.20.37" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.37.tgz#abb38afa9d6e8a2f627a8cb52290b3c80fbe61ed" - integrity sha512-i1KGxqcvJaLQali+WuypQnXwcplhtNtjs66eNsZpp2P2FL/trJJxx/VWsM0YCL2iMoIJrbXje48lvIQAQ4p2ZA== + version "12.20.55" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" + integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== "@types/node@^14.14.31": - version "14.18.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24" - integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A== + version "14.18.36" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.36.tgz#c414052cb9d43fab67d679d5f3c641be911f5835" + integrity sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -1569,9 +2087,9 @@ integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== "@types/prettier@^2.0.0": - version "2.4.2" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.2.tgz#4c62fae93eb479660c3bd93f9d24d561597a8281" - integrity sha512-ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA== + version "2.7.2" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0" + integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg== "@types/sinonjs__fake-timers@8.1.1": version "8.1.1" @@ -1588,43 +2106,50 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== +"@types/tern@*": + version "0.23.4" + resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb" + integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg== + dependencies: + "@types/estree" "*" + "@types/testing-library__jest-dom@^5.9.1": - version "5.14.1" - resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.1.tgz#014162a5cee6571819d48e999980694e2f657c3c" - integrity sha512-Gk9vaXfbzc5zCXI9eYE9BI5BNHEp4D3FWjgqBE/ePGYElLAP+KvxBcsdkwfIVvezs605oiyd/VrpiHe3Oeg+Aw== + version "5.14.5" + resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz#d113709c90b3c75fdb127ec338dad7d5f86c974f" + integrity sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ== dependencies: "@types/jest" "*" "@types/yargs-parser@*": - version "20.2.1" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" - integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== + version "21.0.0" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" + integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^15.0.0": - version "15.0.14" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06" - integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ== + version "15.0.15" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.15.tgz#e609a2b1ef9e05d90489c2f5f45bbfb2be092158" + integrity sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg== dependencies: "@types/yargs-parser" "*" -"@types/yargs@^16.0.0": - version "16.0.4" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977" - integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw== +"@types/yargs@^17.0.8": + version "17.0.22" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz#7dd37697691b5f17d020f3c63e7a45971ff71e9a" + integrity sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g== dependencies: "@types/yargs-parser" "*" "@types/yauzl@^2.9.1": - version "2.9.2" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a" - integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA== + version "2.10.0" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" + integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== dependencies: "@types/node" "*" abab@^2.0.3, abab@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" - integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== + version "2.0.6" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" + integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== acorn-globals@^6.0.0: version "6.0.0" @@ -1639,7 +2164,7 @@ acorn-walk@^7.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn-walk@^8.1.1: +acorn-walk@^8.1.1, acorn-walk@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== @@ -1649,15 +2174,10 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4: - version "8.5.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" - integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== - -acorn@^8.4.1: - version "8.7.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" - integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== +acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.0: + version "8.8.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" + integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== agent-base@6: version "6.0.2" @@ -1675,9 +2195,9 @@ aggregate-error@^3.0.0: indent-string "^4.0.0" ansi-colors@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + version "4.1.3" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b" + integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw== ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: version "4.3.2" @@ -1719,13 +2239,25 @@ anymatch@^2.0.0: normalize-path "^2.1.1" anymatch@^3.0.3: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + version "3.1.3" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" + integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" +apexcharts@^3.19.2, apexcharts@^3.22.1: + version "3.36.3" + resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.36.3.tgz#debd58ded07163d51e00aeb15827d594e0cc8129" + integrity sha512-8/FXEs0ohXMff07Gv28XjhPwEJphIUdq2/wii/pcvi54Tw6z1mjrV8ydN8rlWi/ve8BAPBefJkLmRWv7UOBsLw== + dependencies: + svg.draggable.js "^2.2.2" + svg.easing.js "^2.0.0" + svg.filter.js "^2.0.2" + svg.pathmorphing.js "^0.1.3" + svg.resize.js "^1.4.3" + svg.select.js "^3.0.1" + arch@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" @@ -1736,25 +2268,29 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -argparse@^1.0.7: +arg@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" + integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== + +argparse@^1.0.10, argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== dependencies: sprintf-js "~1.0.2" -aria-query@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b" - integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA== +aria-query@^5.0.0: + version "5.1.3" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.3.tgz#19db27cd101152773631396f7a95a3b58c22c35e" + integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ== dependencies: - "@babel/runtime" "^7.10.2" - "@babel/runtime-corejs3" "^7.10.2" + deep-equal "^2.0.5" arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= + integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA== arr-flatten@^1.1.0: version "1.1.0" @@ -1764,7 +2300,16 @@ arr-flatten@^1.1.0: arr-union@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= + integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== + +array-sort@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" + integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== + dependencies: + default-compare "^1.0.0" + get-value "^2.0.6" + kind-of "^5.0.2" array-union@^2.1.0: version "2.1.0" @@ -1774,7 +2319,7 @@ array-union@^2.1.0: array-unique@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= + integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== asn1@~0.2.3: version "0.2.6" @@ -1786,12 +2331,12 @@ asn1@~0.2.3: assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= + integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== astral-regex@^2.0.0: version "2.0.0" @@ -1799,14 +2344,14 @@ astral-regex@^2.0.0: integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== async@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd" - integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g== + version "3.2.4" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" + integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== at-least-node@^1.0.0: version "1.0.0" @@ -1818,22 +2363,35 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== +autolinker@~0.28.0: + version "0.28.1" + resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" + integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ== + dependencies: + gulp-header "^1.7.1" + +available-typed-arrays@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" + integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== aws4@^1.8.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" - integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== + version "1.12.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3" + integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== -axios@^0.21.1: - version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== +axios@^0.27.2: + version "0.27.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" + integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== dependencies: - follow-redirects "^1.14.0" + follow-redirects "^1.14.9" + form-data "^4.0.0" babel-jest@^26.6.3: version "26.6.3" @@ -1849,13 +2407,6 @@ babel-jest@^26.6.3: graceful-fs "^4.2.4" slash "^3.0.0" -babel-plugin-dynamic-import-node@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3" - integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ== - dependencies: - object.assign "^4.1.0" - babel-plugin-istanbul@^6.0.0: version "6.1.1" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73" @@ -1877,29 +2428,29 @@ babel-plugin-jest-hoist@^26.6.2: "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-plugin-polyfill-corejs2@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz#407082d0d355ba565af24126fb6cb8e9115251fd" - integrity sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA== +babel-plugin-polyfill-corejs2@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122" + integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q== dependencies: - "@babel/compat-data" "^7.13.11" - "@babel/helper-define-polyfill-provider" "^0.3.0" + "@babel/compat-data" "^7.17.7" + "@babel/helper-define-polyfill-provider" "^0.3.3" semver "^6.1.1" -babel-plugin-polyfill-corejs3@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz#0b571f4cf3d67f911512f5c04842a7b8e8263087" - integrity sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw== +babel-plugin-polyfill-corejs3@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a" + integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA== dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.0" - core-js-compat "^3.18.0" + "@babel/helper-define-polyfill-provider" "^0.3.3" + core-js-compat "^3.25.1" -babel-plugin-polyfill-regenerator@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz#9ebbcd7186e1a33e21c5e20cae4e7983949533be" - integrity sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg== +babel-plugin-polyfill-regenerator@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747" + integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw== dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.0" + "@babel/helper-define-polyfill-provider" "^0.3.3" babel-preset-current-node-syntax@^1.0.0: version "1.0.1" @@ -1953,7 +2504,7 @@ base@^0.11.1: bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w== dependencies: tweetnacl "^0.14.3" @@ -1991,7 +2542,7 @@ braces@^2.3.1: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.1: +braces@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -2003,16 +2554,15 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browserslist@^4.17.5, browserslist@^4.17.6: - version "4.18.1" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f" - integrity sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ== +browserslist@^4.21.3, browserslist@^4.21.4: + version "4.21.5" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" + integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== dependencies: - caniuse-lite "^1.0.30001280" - electron-to-chromium "^1.3.896" - escalade "^3.1.1" - node-releases "^2.0.1" - picocolors "^1.0.0" + caniuse-lite "^1.0.30001449" + electron-to-chromium "^1.4.284" + node-releases "^2.0.8" + update-browserslist-db "^1.0.10" bser@2.1.1: version "2.1.1" @@ -2024,7 +2574,7 @@ bser@2.1.1: buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== buffer-from@^1.0.0: version "1.1.2" @@ -2040,9 +2590,9 @@ buffer@^5.6.0: ieee754 "^1.1.13" bufferutil@^4.0.1: - version "4.0.5" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.5.tgz#da9ea8166911cc276bf677b8aed2d02d31f59028" - integrity sha512-HTm14iMQKK2FjFLRTM5lAVcyaUzOnqbPtesFIvREgXpJHdQm8bWS+GkQgIkfaBYRHuCnea7w8UVNfwiAQhlr9A== + version "4.0.7" + resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.7.tgz#60c0d19ba2c992dd8273d3f73772ffc894c153ad" + integrity sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw== dependencies: node-gyp-build "^4.3.0" @@ -2066,7 +2616,7 @@ cachedir@^2.3.0: resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8" integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw== -call-bind@^1.0.0: +call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== @@ -2085,14 +2635,14 @@ camelcase@^5.0.0, camelcase@^5.3.1: integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== camelcase@^6.0.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e" - integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== + version "6.3.0" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" + integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== -caniuse-lite@^1.0.30001280: - version "1.0.30001282" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001282.tgz#38c781ee0a90ccfe1fe7fefd00e43f5ffdcb96fd" - integrity sha512-YhF/hG6nqBEllymSIjLtR2iWDDnChvhnVJqp+vloyt2tEHFG1yBR+ac2B/rOw0qOK0m0lEXU2dv4E/sMk5P9Kg== +caniuse-lite@^1.0.30001449: + version "1.0.30001449" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz#a8d11f6a814c75c9ce9d851dc53eb1d1dfbcd657" + integrity sha512-CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw== capture-exit@^2.0.0: version "2.0.0" @@ -2104,7 +2654,7 @@ capture-exit@^2.0.0: caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" @@ -2144,7 +2694,7 @@ cheap-watch@^1.0.2: check-more-types@2.24.0, check-more-types@^2.24.0: version "2.24.0" resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600" - integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA= + integrity sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA== ci-info@^2.0.0: version "2.0.0" @@ -2152,9 +2702,9 @@ ci-info@^2.0.0: integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== ci-info@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" - integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== + version "3.7.1" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.7.1.tgz#708a6cdae38915d597afdf3b145f2f8e1ff55f3f" + integrity sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w== cjs-module-lexer@^0.6.0: version "0.6.0" @@ -2184,13 +2734,13 @@ cli-cursor@^3.1.0: restore-cursor "^3.1.0" cli-table3@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8" - integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA== + version "0.6.3" + resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2" + integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg== dependencies: string-width "^4.2.0" optionalDependencies: - colors "1.4.0" + "@colors/colors" "1.5.0" cli-truncate@^2.1.0: version "2.1.0" @@ -2209,24 +2759,31 @@ cliui@^6.0.0: strip-ansi "^6.0.0" wrap-ansi "^6.2.0" -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== dependencies: string-width "^4.2.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" wrap-ansi "^7.0.0" co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= + integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -codemirror@^5.59.0: - version "5.63.3" - resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.63.3.tgz#97042a242027fe0c87c09b36bc01931d37b76527" - integrity sha512-1C+LELr+5grgJYqwZKqxrcbPsHFHapVaVAloBsFBASbpLnQqLw1U8yXJ3gT5D+rhxIiSpo+kTqN+hQ+9ialIXw== +codemirror-spell-checker@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e" + integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ== + dependencies: + typo-js "*" + +codemirror@^5.59.0, codemirror@^5.63.1: + version "5.65.11" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.11.tgz#c818edc3274788c008f636520c5490a1f7009b4f" + integrity sha512-Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A== collect-v8-coverage@^1.0.0: version "1.0.1" @@ -2236,7 +2793,7 @@ collect-v8-coverage@^1.0.0: collection-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= + integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw== dependencies: map-visit "^1.0.0" object-visit "^1.0.0" @@ -2258,7 +2815,7 @@ color-convert@^2.0.1: color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== color-name@~1.1.4: version "1.1.4" @@ -2271,14 +2828,9 @@ colorette@^1.1.0: integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== colorette@^2.0.16: - version "2.0.16" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" - integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== - -colors@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" - integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + version "2.0.19" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" + integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: version "1.0.8" @@ -2312,6 +2864,13 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +concat-with-sourcemaps@*: + version "1.1.0" + resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" + integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== + dependencies: + source-map "^0.6.1" + configent@^2.1.4: version "2.2.0" resolved "https://registry.yarnpkg.com/configent/-/configent-2.2.0.tgz#2de230fc43f22c47cfd99016aa6962d6f9546994" @@ -2320,34 +2879,31 @@ configent@^2.1.4: dotenv "^8.2.0" convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== - dependencies: - safe-buffer "~5.1.1" + version "1.9.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" + integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== copy-descriptor@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= + integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== -core-js-compat@^3.18.0, core-js-compat@^3.19.1: - version "3.19.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.19.1.tgz#fe598f1a9bf37310d77c3813968e9f7c7bb99476" - integrity sha512-Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g== +core-js-compat@^3.25.1: + version "3.27.2" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.27.2.tgz#607c50ad6db8fd8326af0b2883ebb987be3786da" + integrity sha512-welaYuF7ZtbYKGrIy7y3eb40d37rG1FvzEOfe7hSLd2iD6duMDqUhRfSvCGyC46HhR6Y8JXXdZ2lnRUMkPBpvg== dependencies: - browserslist "^4.17.6" - semver "7.0.0" - -core-js-pure@^3.19.0: - version "3.19.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.19.1.tgz#edffc1fc7634000a55ba05e95b3f0fe9587a5aa4" - integrity sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ== + browserslist "^4.21.4" core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== + +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== create-require@^1.1.0: version "1.1.1" @@ -2377,16 +2933,7 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.3: css.escape@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb" - integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s= - -css@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d" - integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ== - dependencies: - inherits "^2.0.4" - source-map "^0.6.1" - source-map-resolve "^0.6.0" + integrity sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg== cssom@^0.4.4: version "0.4.4" @@ -2406,9 +2953,9 @@ cssstyle@^2.3.0: cssom "~0.3.6" cypress-multi-reporters@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/cypress-multi-reporters/-/cypress-multi-reporters-1.6.0.tgz#2c6833b92e3df412c233657c55009e2d5e1cc7c1" - integrity sha512-JN9yMzDmPwwirzi95N2FC8VJZ0qp+uUJ1ixYHpJFaAtGgIx15LjVmASqQaxnDh8q57jIIJ6C0o7imiLU6N1YNQ== + version "1.6.2" + resolved "https://registry.yarnpkg.com/cypress-multi-reporters/-/cypress-multi-reporters-1.6.2.tgz#129dfeffa00d4deca3e9f58d84570b9962c28c2b" + integrity sha512-lvwGwHqZG5CwGxBJ6UJXWaxlWGkJgxBjP0h+IVLrrwRlJpT4coSwwt+UzMdeqEMrzT4IDfhbtmUNOiDleisOYA== dependencies: debug "^4.1.1" lodash "^4.17.15" @@ -2422,9 +2969,9 @@ cypress-terminal-report@^1.4.1: methods "^1.1.2" cypress@^9.3.1: - version "9.5.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.5.0.tgz#704a79f0d3d4e775f433334eb8f5ae065e3bea31" - integrity sha512-rC5QPolKsVjJ8QJZ7IeZ6HlKM4gswBGZc0XvoAJNL8urQCSL8zTX0A/ai/h35WfF47NQ0iSZnwIXBlHX3MOUIQ== + version "9.7.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.7.0.tgz#bf55b2afd481f7a113ef5604aa8b693564b5e744" + integrity sha512-+1EE1nuuuwIt/N1KXRR2iWHU+OiIt7H28jJDyyI4tiUftId/DrXYEwoDa5+kH2pki1zxnA0r6HrUGHV5eLbF5Q== dependencies: "@cypress/request" "^2.88.10" "@cypress/xvfb" "^1.2.4" @@ -2458,7 +3005,7 @@ cypress@^9.3.1: listr2 "^3.8.3" lodash "^4.17.21" log-symbols "^4.0.0" - minimist "^1.2.5" + minimist "^1.2.6" ospath "^1.2.2" pretty-bytes "^5.6.0" proxy-from-env "1.0.0" @@ -2472,7 +3019,7 @@ cypress@^9.3.1: dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g== dependencies: assert-plus "^1.0.0" @@ -2490,20 +3037,15 @@ dateformat@^4.5.1: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== -dayjs@^1.10.4: - version "1.10.7" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.7.tgz#2cf5f91add28116748440866a0a1d26f3a6ce468" - integrity sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig== +dayjs@^1.10.4, dayjs@^1.10.5, dayjs@^1.11.2: + version "1.11.7" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" + integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== -dayjs@^1.11.2: - version "1.11.2" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.2.tgz#fa0f5223ef0d6724b3d8327134890cfe3d72fbe5" - integrity sha512-F4LXf1OeU9hrSYRPTTj/6FbO4HTjPKXvEIC1P2kcnFurViINCVk3ZV0xAS3XVx9MkMsXbbqlK6hjseaYbgKEHw== - -debug@4, debug@4.3.2, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== +debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" @@ -2521,27 +3063,43 @@ debug@^3.1.0: dependencies: ms "^2.1.1" -debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== decimal.js@^10.2.1: - version "10.3.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" - integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== + version "10.4.3" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23" + integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA== decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= + version "0.2.2" + resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" + integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== + +deep-equal@^2.0.5: + version "2.2.0" + resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.0.tgz#5caeace9c781028b9ff459f33b779346637c43e6" + integrity sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw== + dependencies: + call-bind "^1.0.2" + es-get-iterator "^1.1.2" + get-intrinsic "^1.1.3" + is-arguments "^1.1.1" + is-array-buffer "^3.0.1" + is-date-object "^1.0.5" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.2" + isarray "^2.0.5" + object-is "^1.1.5" + object-keys "^1.1.1" + object.assign "^4.1.4" + regexp.prototype.flags "^1.4.3" + side-channel "^1.0.4" + which-boxed-primitive "^1.0.2" + which-collection "^1.0.1" + which-typed-array "^1.1.9" deep-is@~0.1.3: version "0.1.4" @@ -2549,28 +3107,36 @@ deep-is@~0.1.3: integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + version "4.3.0" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.0.tgz#65491893ec47756d44719ae520e0e2609233b59b" + integrity sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og== -define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== +default-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" + integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== dependencies: - object-keys "^1.0.12" + kind-of "^5.0.2" + +define-properties@^1.1.3, define-properties@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" + integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== + dependencies: + has-property-descriptors "^1.0.0" + object-keys "^1.1.1" define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= + integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA== dependencies: is-descriptor "^0.1.0" define-property@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= + integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA== dependencies: is-descriptor "^1.0.0" @@ -2585,7 +3151,7 @@ define-property@^2.0.2: delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== detect-newline@^3.0.0: version "3.1.0" @@ -2597,10 +3163,10 @@ diff-sequences@^26.6.2: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== -diff-sequences@^27.0.6: - version "27.0.6" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz#3305cb2e55a033924054695cc66019fd7f8e5723" - integrity sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ== +diff-sequences@^29.3.1: + version "29.3.1" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e" + integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ== diff@^4.0.1: version "4.0.2" @@ -2619,10 +3185,24 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -dom-accessibility-api@^0.5.6: - version "0.5.10" - resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.10.tgz#caa6d08f60388d0bb4539dd75fe458a9a1d0014c" - integrity sha512-Xu9mD0UjrJisTmv7lmVSDMagQcU9R5hwAbxsaAE/35XPnPLJobbuREfV/rraiSaEj/UOvgrzQs66zyTWTlyd+g== +dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9: + version "0.5.16" + resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz#5a7429e6066eb3664d911e33fb0e45de8eb08453" + integrity sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg== + +dom-serializer@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" + integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + entities "^4.2.0" + +domelementtype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== domexception@^2.0.1: version "2.0.1" @@ -2631,6 +3211,22 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" +domhandler@^5.0.1, domhandler@^5.0.2: + version "5.0.3" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" + integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== + dependencies: + domelementtype "^2.3.0" + +domutils@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" + integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== + dependencies: + dom-serializer "^2.0.0" + domelementtype "^2.3.0" + domhandler "^5.0.1" + dotenv@^8.2.0: version "8.6.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" @@ -2639,25 +3235,36 @@ dotenv@^8.2.0: downloadjs@1.4.7: version "1.4.7" resolved "https://registry.yarnpkg.com/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c" - integrity sha1-9p+W+UDg0FU9rCkROYZaPNAQHjw= + integrity sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q== duplexer@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== +easymde@^2.16.1: + version "2.18.0" + resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b" + integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA== + dependencies: + "@types/codemirror" "^5.60.4" + "@types/marked" "^4.0.7" + codemirror "^5.63.1" + codemirror-spell-checker "1.1.2" + marked "^4.1.0" + ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw== dependencies: jsbn "~0.1.0" safer-buffer "^2.1.0" -electron-to-chromium@^1.3.896: - version "1.3.900" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.900.tgz#5be2c5818a2a012c511b4b43e87b6ab7a296d4f5" - integrity sha512-SuXbQD8D4EjsaBaJJxySHbC+zq8JrFfxtb4GIr4E9n1BcROyMcRrJCYQNpJ9N+Wjf5mFp7Wp0OHykd14JNEzzQ== +electron-to-chromium@^1.4.284: + version "1.4.284" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" + integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== emittery@^0.7.1: version "0.7.2" @@ -2676,6 +3283,22 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" +engine.io-client@~6.2.3: + version "6.2.3" + resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz#a8cbdab003162529db85e9de31575097f6d29458" + integrity sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.1" + engine.io-parser "~5.0.3" + ws "~8.2.3" + xmlhttprequest-ssl "~2.0.0" + +engine.io-parser@~5.0.3: + version "5.0.6" + resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.6.tgz#7811244af173e157295dec9b2718dfe42a64ef45" + integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw== + enquirer@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" @@ -2683,6 +3306,16 @@ enquirer@^2.3.6: dependencies: ansi-colors "^4.1.1" +ent@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" + integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== + +entities@^4.2.0, entities@^4.3.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== + error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -2690,132 +3323,148 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -esbuild-android-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz#505f41832884313bbaffb27704b8bcaa2d8616be" - integrity sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ== +es-get-iterator@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.3.tgz#3ef87523c5d464d41084b2c3c9c214f1199763d6" + integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.3" + has-symbols "^1.0.3" + is-arguments "^1.1.1" + is-map "^2.0.2" + is-set "^2.0.2" + is-string "^1.0.7" + isarray "^2.0.5" + stop-iteration-iterator "^1.0.0" -esbuild-android-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz#8ce69d7caba49646e009968fe5754a21a9871771" - integrity sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg== +esbuild-android-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz#20a7ae1416c8eaade917fb2453c1259302c637a5" + integrity sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA== -esbuild-darwin-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz#24ba67b9a8cb890a3c08d9018f887cc221cdda25" - integrity sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug== +esbuild-android-arm64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz#9cc0ec60581d6ad267568f29cf4895ffdd9f2f04" + integrity sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ== -esbuild-darwin-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz#3f7cdb78888ee05e488d250a2bdaab1fa671bf73" - integrity sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw== +esbuild-darwin-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz#428e1730ea819d500808f220fbc5207aea6d4410" + integrity sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg== -esbuild-freebsd-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz#09250f997a56ed4650f3e1979c905ffc40bbe94d" - integrity sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg== +esbuild-darwin-arm64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz#b6dfc7799115a2917f35970bfbc93ae50256b337" + integrity sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA== -esbuild-freebsd-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz#bafb46ed04fc5f97cbdb016d86947a79579f8e48" - integrity sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q== +esbuild-freebsd-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz#4e190d9c2d1e67164619ae30a438be87d5eedaf2" + integrity sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA== -esbuild-linux-32@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz#e2a8c4a8efdc355405325033fcebeb941f781fe5" - integrity sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw== +esbuild-freebsd-arm64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz#18a4c0344ee23bd5a6d06d18c76e2fd6d3f91635" + integrity sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA== -esbuild-linux-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652" - integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg== +esbuild-linux-32@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz#9a329731ee079b12262b793fb84eea762e82e0ce" + integrity sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg== -esbuild-linux-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz#dae4cd42ae9787468b6a5c158da4c84e83b0ce8b" - integrity sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig== +esbuild-linux-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz#532738075397b994467b514e524aeb520c191b6c" + integrity sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw== -esbuild-linux-arm@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz#a2c1dff6d0f21dbe8fc6998a122675533ddfcd59" - integrity sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw== +esbuild-linux-arm64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz#5372e7993ac2da8f06b2ba313710d722b7a86e5d" + integrity sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug== -esbuild-linux-mips64le@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz#d9918e9e4cb972f8d6dae8e8655bf9ee131eda34" - integrity sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw== +esbuild-linux-arm@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz#e734aaf259a2e3d109d4886c9e81ec0f2fd9a9cc" + integrity sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA== -esbuild-linux-ppc64le@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz#3f9a0f6d41073fb1a640680845c7de52995f137e" - integrity sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ== +esbuild-linux-mips64le@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz#c0487c14a9371a84eb08fab0e1d7b045a77105eb" + integrity sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ== -esbuild-linux-riscv64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz#618853c028178a61837bc799d2013d4695e451c8" - integrity sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg== +esbuild-linux-ppc64le@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz#af048ad94eed0ce32f6d5a873f7abe9115012507" + integrity sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w== -esbuild-linux-s390x@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz#d1885c4c5a76bbb5a0fe182e2c8c60eb9e29f2a6" - integrity sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA== +esbuild-linux-riscv64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz#423ed4e5927bd77f842bd566972178f424d455e6" + integrity sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg== -esbuild-netbsd-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz#69ae917a2ff241b7df1dbf22baf04bd330349e81" - integrity sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w== +esbuild-linux-s390x@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz#21d21eaa962a183bfb76312e5a01cc5ae48ce8eb" + integrity sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ== -esbuild-openbsd-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz#db4c8495287a350a6790de22edea247a57c5d47b" - integrity sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw== +esbuild-netbsd-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz#ae75682f60d08560b1fe9482bfe0173e5110b998" + integrity sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg== -esbuild-sunos-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz#54287ee3da73d3844b721c21bc80c1dc7e1bf7da" - integrity sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw== +esbuild-openbsd-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz#79591a90aa3b03e4863f93beec0d2bab2853d0a8" + integrity sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ== -esbuild-windows-32@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz#f8aaf9a5667630b40f0fb3aa37bf01bbd340ce31" - integrity sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w== +esbuild-sunos-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz#fd528aa5da5374b7e1e93d36ef9b07c3dfed2971" + integrity sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw== -esbuild-windows-64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz#bf54b51bd3e9b0f1886ffdb224a4176031ea0af4" - integrity sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ== +esbuild-windows-32@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz#0e92b66ecdf5435a76813c4bc5ccda0696f4efc3" + integrity sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ== -esbuild-windows-arm64@0.14.54: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz#937d15675a15e4b0e4fafdbaa3a01a776a2be982" - integrity sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg== +esbuild-windows-64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz#0fc761d785414284fc408e7914226d33f82420d0" + integrity sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw== -esbuild@^0.14.47: - version "0.14.54" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.54.tgz#8b44dcf2b0f1a66fc22459943dccf477535e9aa2" - integrity sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA== +esbuild-windows-arm64@0.15.18: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz#5b5bdc56d341d0922ee94965c89ee120a6a86eb7" + integrity sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ== + +esbuild@^0.15.9: + version "0.15.18" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.15.18.tgz#ea894adaf3fbc036d32320a00d4d6e4978a2f36d" + integrity sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q== optionalDependencies: - "@esbuild/linux-loong64" "0.14.54" - esbuild-android-64 "0.14.54" - esbuild-android-arm64 "0.14.54" - esbuild-darwin-64 "0.14.54" - esbuild-darwin-arm64 "0.14.54" - esbuild-freebsd-64 "0.14.54" - esbuild-freebsd-arm64 "0.14.54" - esbuild-linux-32 "0.14.54" - esbuild-linux-64 "0.14.54" - esbuild-linux-arm "0.14.54" - esbuild-linux-arm64 "0.14.54" - esbuild-linux-mips64le "0.14.54" - esbuild-linux-ppc64le "0.14.54" - esbuild-linux-riscv64 "0.14.54" - esbuild-linux-s390x "0.14.54" - esbuild-netbsd-64 "0.14.54" - esbuild-openbsd-64 "0.14.54" - esbuild-sunos-64 "0.14.54" - esbuild-windows-32 "0.14.54" - esbuild-windows-64 "0.14.54" - esbuild-windows-arm64 "0.14.54" + "@esbuild/android-arm" "0.15.18" + "@esbuild/linux-loong64" "0.15.18" + esbuild-android-64 "0.15.18" + esbuild-android-arm64 "0.15.18" + esbuild-darwin-64 "0.15.18" + esbuild-darwin-arm64 "0.15.18" + esbuild-freebsd-64 "0.15.18" + esbuild-freebsd-arm64 "0.15.18" + esbuild-linux-32 "0.15.18" + esbuild-linux-64 "0.15.18" + esbuild-linux-arm "0.15.18" + esbuild-linux-arm64 "0.15.18" + esbuild-linux-mips64le "0.15.18" + esbuild-linux-ppc64le "0.15.18" + esbuild-linux-riscv64 "0.15.18" + esbuild-linux-s390x "0.15.18" + esbuild-netbsd-64 "0.15.18" + esbuild-openbsd-64 "0.15.18" + esbuild-sunos-64 "0.15.18" + esbuild-windows-32 "0.15.18" + esbuild-windows-64 "0.15.18" + esbuild-windows-arm64 "0.15.18" escalade@^3.1.1: version "3.1.1" @@ -2825,18 +3474,23 @@ escalade@^3.1.1: escape-html@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== escape-string-regexp@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" @@ -2887,7 +3541,7 @@ esutils@^2.0.2: event-stream@=3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" - integrity sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE= + integrity sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g== dependencies: duplexer "~0.1.1" from "~0" @@ -2898,9 +3552,9 @@ event-stream@=3.3.4: through "~2.3.1" eventemitter2@^6.4.3: - version "6.4.5" - resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.5.tgz#97380f758ae24ac15df8353e0cc27f8b95644655" - integrity sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw== + version "6.4.9" + resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.9.tgz#41f2750781b4230ed58827bc119d293471ecb125" + integrity sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg== exec-sh@^0.3.2: version "0.3.6" @@ -2960,12 +3614,12 @@ executable@^4.1.1: exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= + integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ== expand-brackets@^2.1.4: version "2.1.4" resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= + integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA== dependencies: debug "^2.3.3" define-property "^0.2.5" @@ -2987,17 +3641,28 @@ expect@^26.6.2: jest-message-util "^26.6.2" jest-regex-util "^26.0.0" +expect@^29.0.0: + version "29.4.1" + resolved "https://registry.yarnpkg.com/expect/-/expect-29.4.1.tgz#58cfeea9cbf479b64ed081fd1e074ac8beb5a1fe" + integrity sha512-OKrGESHOaMxK3b6zxIq9SOW8kEXztKff/Dvg88j4xIJxur1hspEbedVkR3GpHe5LO+WB2Qw7OWN0RMTdp6as5A== + dependencies: + "@jest/expect-utils" "^29.4.1" + jest-get-type "^29.2.0" + jest-matcher-utils "^29.4.1" + jest-message-util "^29.4.1" + jest-util "^29.4.1" + extend-shallow@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= + integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug== dependencies: is-extendable "^0.1.0" extend-shallow@^3.0.0, extend-shallow@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= + integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q== dependencies: assign-symbols "^1.0.0" is-extendable "^1.0.1" @@ -3035,7 +3700,7 @@ extract-zip@2.0.1: extsprintf@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g== extsprintf@^1.2.0: version "1.4.1" @@ -3043,9 +3708,9 @@ extsprintf@^1.2.0: integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== fast-glob@^3.0.3: - version "3.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" - integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== + version "3.2.12" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" + integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -3061,26 +3726,26 @@ fast-json-stable-stringify@^2.0.0: fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + version "1.15.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" + integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== dependencies: reusify "^1.0.4" fb-watchman@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85" - integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c" + integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA== dependencies: bser "2.1.1" fd-slicer@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== dependencies: pend "~1.2.0" @@ -3099,7 +3764,7 @@ figures@^3.2.0: fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= + integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ== dependencies: extend-shallow "^2.0.1" is-number "^3.0.0" @@ -3121,25 +3786,37 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" +flatpickr@^4.5.2: + version "4.6.13" + resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94" + integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw== + fn-name@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-3.0.0.tgz#0596707f635929634d791f452309ab41558e3c5c" integrity sha512-eNMNr5exLoavuAMhIUVsOKF79SWd/zG104ef6sxBTSw+cZc6BXdQXDvYcGvp0VbxVVSp1XDUNoz7mg1xMtSznA== -follow-redirects@^1.14.0: - version "1.14.8" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" - integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== +follow-redirects@^1.14.9: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + +for-each@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" + integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== + dependencies: + is-callable "^1.1.3" for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= + integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ== forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== form-data@^3.0.0: version "3.0.1" @@ -3150,6 +3827,15 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -3162,14 +3848,19 @@ form-data@~2.3.2: fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= + integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA== dependencies: map-cache "^0.2.2" from@~0: version "0.1.7" resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" - integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4= + integrity sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g== + +fs-exists-sync@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" + integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg== fs-extra@^10.0.0: version "10.1.0" @@ -3211,7 +3902,7 @@ fs-extra@^9.0.1, fs-extra@^9.1.0: fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@^2.1.2, fsevents@~2.3.2: version "2.3.2" @@ -3228,6 +3919,11 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +functions-have-names@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" + integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== + gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" @@ -3238,14 +3934,22 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: + version "1.2.0" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" + integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== dependencies: function-bind "^1.1.1" has "^1.0.3" - has-symbols "^1.0.1" + has-symbols "^1.0.3" + +get-object@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" + integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ== + dependencies: + is-number "^2.0.2" + isobject "^0.2.0" get-package-type@^0.1.0: version "0.1.0" @@ -3274,7 +3978,14 @@ get-stream@^6.0.0: get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= + integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== + +get-value@^3.0.0, get-value@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" + integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== + dependencies: + isobject "^3.0.1" getos@^3.2.1: version "3.2.1" @@ -3286,7 +3997,7 @@ getos@^3.2.1: getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng== dependencies: assert-plus "^1.0.0" @@ -3297,19 +4008,7 @@ glob-parent@^5.1.2: dependencies: is-glob "^4.0.1" -glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.6: +glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -3322,9 +4021,9 @@ glob@^7.1.6: path-is-absolute "^1.0.0" global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485" + integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA== dependencies: ini "2.0.0" @@ -3347,45 +4046,95 @@ globby@10.0.1: merge2 "^1.2.3" slash "^3.0.0" -graceful-fs@^4.1.2: +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== -graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== - growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" - integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= + integrity sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw== + +gulp-header@^1.7.1: + version "1.8.12" + resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" + integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== + dependencies: + concat-with-sourcemaps "*" + lodash.template "^4.4.0" + through2 "^2.0.0" + +handlebars-utils@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" + integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== + dependencies: + kind-of "^6.0.0" + typeof-article "^0.1.1" + +handlebars@^4.7.6, handlebars@^4.7.7: + version "4.7.7" + resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" + integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== + dependencies: + minimist "^1.2.5" + neo-async "^2.6.0" + source-map "^0.6.1" + wordwrap "^1.0.0" + optionalDependencies: + uglify-js "^3.1.4" harmony-reflect@^1.4.6: version "1.6.2" resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710" integrity sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g== +has-bigints@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" + integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-symbols@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +has-property-descriptors@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" + integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== + dependencies: + get-intrinsic "^1.1.1" + +has-symbols@^1.0.2, has-symbols@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== + +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" has-value@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= + integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q== dependencies: get-value "^2.0.3" has-values "^0.1.4" @@ -3394,25 +4143,40 @@ has-value@^0.3.1: has-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= + integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw== dependencies: get-value "^2.0.6" has-values "^1.0.0" isobject "^3.0.0" +has-value@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658" + integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA== + dependencies: + get-value "^3.0.0" + has-values "^2.0.1" + has-values@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= + integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ== has-values@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= + integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ== dependencies: is-number "^3.0.0" kind-of "^4.0.0" +has-values@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d" + integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w== + dependencies: + kind-of "^6.0.2" + has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -3420,6 +4184,16 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" +helper-md@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" + integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q== + dependencies: + ent "^2.2.0" + extend-shallow "^2.0.1" + fs-exists-sync "^0.1.0" + remarkable "^1.6.2" + hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -3437,6 +4211,29 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== +html-tag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" + integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== + dependencies: + is-self-closing "^1.0.1" + kind-of "^6.0.0" + +html5-qrcode@^2.2.1: + version "2.3.4" + resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.4.tgz#7e2b4575a23b10ff5e26d2bf147c8027c1ece389" + integrity sha512-VPZrOTG8XR9HmIAhSSiGtJVPErZxKy/DuGc9cPQLburCWZEbvxQGJP9y4K4P+8vdalLtYB/vM5YP1BdWQKZ8jQ== + +htmlparser2@^8.0.0: + version "8.0.1" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" + integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== + dependencies: + domelementtype "^2.3.0" + domhandler "^5.0.2" + domutils "^3.0.1" + entities "^4.3.0" + http-proxy-agent@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" @@ -3456,9 +4253,9 @@ http-signature@~1.3.6: sshpk "^1.14.1" https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== dependencies: agent-base "6" debug "4" @@ -3483,7 +4280,7 @@ iconv-lite@0.4.24: identity-obj-proxy@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14" - integrity sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ= + integrity sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA== dependencies: harmony-reflect "^1.4.6" @@ -3493,14 +4290,14 @@ ieee754@^1.1.13: integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== ignore@^5.1.1: - version "5.1.9" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.9.tgz#9ec1a5cbe8e1446ec60d4420060d43aa6e7382fb" - integrity sha512-2zeMQpbKz5dhZ9IwL0gbxSW5w0NK/MSAMtNuhgIHEPmaU3vPdKPL0UdvUCXs5SS4JAwsBxysK5sFMW8ocFiVjQ== + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== import-local@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0" - integrity sha512-bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA== + version "3.1.0" + resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" + integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== dependencies: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" @@ -3508,7 +4305,7 @@ import-local@^3.0.2: imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== indent-string@^4.0.0: version "4.0.0" @@ -3518,12 +4315,12 @@ indent-string@^4.0.0: inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.4: +inherits@2, inherits@~2.0.3: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -3533,10 +4330,19 @@ ini@2.0.0: resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== +internal-slot@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3" + integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ== + dependencies: + get-intrinsic "^1.1.3" + has "^1.0.3" + side-channel "^1.0.4" + is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= + integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A== dependencies: kind-of "^3.0.2" @@ -3547,16 +4353,53 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-arguments@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-array-buffer@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.1.tgz#deb1db4fcae48308d54ef2442706c0393997052a" + integrity sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.3" + is-typed-array "^1.1.10" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== + +is-bigint@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" + +is-boolean-object@^1.1.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-buffer@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== +is-callable@^1.1.3: + version "1.2.7" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" + integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== + is-ci@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" @@ -3571,24 +4414,17 @@ is-ci@^3.0.0: dependencies: ci-info "^3.2.0" -is-core-module@^2.2.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.0.tgz#0321336c3d0925e497fd97f5d95cb114a5ccd548" - integrity sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw== - dependencies: - has "^1.0.3" - is-core-module@^2.9.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed" - integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg== + version "2.11.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" + integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== dependencies: has "^1.0.3" is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= + integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg== dependencies: kind-of "^3.0.2" @@ -3599,6 +4435,13 @@ is-data-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" +is-date-object@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" + is-descriptor@^0.1.0: version "0.1.6" resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" @@ -3622,10 +4465,17 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +is-even@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" + integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg== + dependencies: + is-odd "^0.1.2" + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= + integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw== is-extendable@^1.0.1: version "1.0.1" @@ -3637,7 +4487,7 @@ is-extendable@^1.0.1: is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -3664,10 +4514,29 @@ is-installed-globally@~0.4.0: global-dirs "^3.0.0" is-path-inside "^3.0.2" +is-map@^2.0.1, is-map@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" + integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== + +is-number-object@^1.0.4: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" + integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== + dependencies: + has-tostringtag "^1.0.0" + +is-number@^2.0.2: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" + integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg== + dependencies: + kind-of "^3.0.2" + is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= + integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg== dependencies: kind-of "^3.0.2" @@ -3676,6 +4545,13 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== +is-odd@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" + integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw== + dependencies: + is-number "^3.0.0" + is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -3693,31 +4569,101 @@ is-plain-object@^3.0.0: resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b" integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g== +is-plain-object@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" + integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== + is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== +is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== + dependencies: + call-bind "^1.0.2" + has-tostringtag "^1.0.0" + +is-self-closing@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" + integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== + dependencies: + self-closing-tags "^1.0.1" + +is-set@^2.0.1, is-set@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" + integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== + +is-shared-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" + integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== + dependencies: + call-bind "^1.0.2" + is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== is-stream@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" + +is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== + dependencies: + has-symbols "^1.0.2" + +is-typed-array@^1.1.10: + version "1.1.10" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" + integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.0" + is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== is-unicode-supported@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== +is-weakmap@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" + integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== + +is-weakset@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" + integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -3730,32 +4676,42 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@1.0.0: +isarray@1.0.0, isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== + +isarray@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" + integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== + +isobject@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" + integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ== isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= + integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA== dependencies: isarray "1.0.0" isobject@^3.0.0, isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: version "3.2.0" @@ -3773,9 +4729,9 @@ istanbul-lib-instrument@^4.0.3: semver "^6.3.0" istanbul-lib-instrument@^5.0.4: - version "5.1.0" - resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a" - integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q== + version "5.2.1" + resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz#d10c8885c2125574e1c231cacadf955675e1ce3d" + integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg== dependencies: "@babel/core" "^7.12.3" "@babel/parser" "^7.14.7" @@ -3802,9 +4758,9 @@ istanbul-lib-source-maps@^4.0.0: source-map "^0.6.1" istanbul-reports@^3.0.2: - version "3.0.5" - resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.5.tgz#a2580107e71279ea6d661ddede929ffc6d693384" - integrity sha512-5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ== + version "3.1.5" + resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae" + integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w== dependencies: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" @@ -3871,15 +4827,15 @@ jest-diff@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" -jest-diff@^27.0.0: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.3.1.tgz#d2775fea15411f5f5aeda2a5e02c2f36440f6d55" - integrity sha512-PCeuAH4AWUo2O5+ksW4pL9v5xJAcIKPUPfIhZBcG1RKv/0+dvaWTQK1Nrau8d67dp65fOqbeMdoil+6PedyEPQ== +jest-diff@^29.4.1: + version "29.4.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.4.1.tgz#9a6dc715037e1fa7a8a44554e7d272088c4029bd" + integrity sha512-uazdl2g331iY56CEyfbNA0Ut7Mn2ulAG5vUaEHXycf1L6IPyuImIxSz4F0VYBKi7LYIuxOwTZzK3wh5jHzASMw== dependencies: chalk "^4.0.0" - diff-sequences "^27.0.6" - jest-get-type "^27.3.1" - pretty-format "^27.3.1" + diff-sequences "^29.3.1" + jest-get-type "^29.2.0" + pretty-format "^29.4.1" jest-docblock@^26.0.0: version "26.0.0" @@ -3929,10 +4885,10 @@ jest-get-type@^26.3.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-get-type@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.3.1.tgz#a8a2b0a12b50169773099eee60a0e6dd11423eff" - integrity sha512-+Ilqi8hgHSAdhlQ3s12CAVNd8H96ZkQBfYoXmArzZnOfAtVAJEiPDBirjByEblvG/4LPJmkL+nBqPO3A1YJAEg== +jest-get-type@^29.2.0: + version "29.2.0" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408" + integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA== jest-haste-map@^26.6.2: version "26.6.2" @@ -3997,6 +4953,16 @@ jest-matcher-utils@^26.6.2: jest-get-type "^26.3.0" pretty-format "^26.6.2" +jest-matcher-utils@^29.4.1: + version "29.4.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.4.1.tgz#73d834e305909c3b43285fbc76f78bf0ad7e1954" + integrity sha512-k5h0u8V4nAEy6lSACepxL/rw78FLDkBnXhZVgFneVpnJONhb2DhZj/Gv4eNe+1XqQ5IhgUcqj745UwH0HJmMnA== + dependencies: + chalk "^4.0.0" + jest-diff "^29.4.1" + jest-get-type "^29.2.0" + pretty-format "^29.4.1" + jest-message-util@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07" @@ -4012,6 +4978,21 @@ jest-message-util@^26.6.2: slash "^3.0.0" stack-utils "^2.0.2" +jest-message-util@^29.4.1: + version "29.4.1" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.4.1.tgz#522623aa1df9a36ebfdffb06495c7d9d19e8a845" + integrity sha512-H4/I0cXUaLeCw6FM+i4AwCnOwHRgitdaUFOdm49022YD5nfyr8C/DrbXOBEyJaj+w/y0gGJ57klssOaUiLLQGQ== + dependencies: + "@babel/code-frame" "^7.12.13" + "@jest/types" "^29.4.1" + "@types/stack-utils" "^2.0.0" + chalk "^4.0.0" + graceful-fs "^4.2.9" + micromatch "^4.0.4" + pretty-format "^29.4.1" + slash "^3.0.0" + stack-utils "^2.0.3" + jest-mock@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302" @@ -4021,9 +5002,9 @@ jest-mock@^26.6.2: "@types/node" "*" jest-pnp-resolver@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" - integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== + version "1.2.3" + resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz#930b1546164d4ad5937d5540e711d4d38d4cad2e" + integrity sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w== jest-regex-util@^26.0.0: version "26.0.0" @@ -4154,6 +5135,18 @@ jest-util@^26.6.2: is-ci "^2.0.0" micromatch "^4.0.2" +jest-util@^29.4.1: + version "29.4.1" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.4.1.tgz#2eeed98ff4563b441b5a656ed1a786e3abc3e4c4" + integrity sha512-bQy9FPGxVutgpN4VRc0hk6w7Hx/m6L53QxpDreTZgJd9gfx/AV2MjyPde9tGyZRINAUrSv57p2inGBu2dRLmkQ== + dependencies: + "@jest/types" "^29.4.1" + "@types/node" "*" + chalk "^4.0.0" + ci-info "^3.2.0" + graceful-fs "^4.2.9" + picomatch "^2.2.3" + jest-validate@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec" @@ -4197,14 +5190,14 @@ jest@^26.6.3: import-local "^3.0.2" jest-cli "^26.6.3" -joi@^17.4.0: - version "17.4.2" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.4.2.tgz#02f4eb5cf88e515e614830239379dcbbe28ce7f7" - integrity sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw== +joi@^17.7.0: + version "17.7.0" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.7.0.tgz#591a33b1fe1aca2bc27f290bcad9b9c1c570a6b3" + integrity sha512-1/ugc8djfn93rTE3WRKdCzGGt/EtiYKxITMO4Wiv6q5JL1gl9ePt4kBsl1S499nbosspfctIQTpYIhSmHA3WAg== dependencies: "@hapi/hoek" "^9.0.0" "@hapi/topo" "^5.0.0" - "@sideway/address" "^4.1.0" + "@sideway/address" "^4.1.3" "@sideway/formula" "^3.0.0" "@sideway/pinpoint" "^2.0.0" @@ -4224,7 +5217,7 @@ js-yaml@^3.13.1: jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== jsdom@^16.0.1, jsdom@^16.4.0: version "16.7.0" @@ -4267,7 +5260,7 @@ jsesc@^2.5.1: jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= + integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== json-parse-even-better-errors@^2.3.0: version "2.3.1" @@ -4282,9 +5275,9 @@ json-schema@0.4.0: json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== -json5@^2.1.2, json5@^2.2.1: +json5@^2.2.1, json5@^2.2.2: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -4292,7 +5285,7 @@ json5@^2.1.2, json5@^2.2.1: jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= + integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== optionalDependencies: graceful-fs "^4.1.6" @@ -4315,7 +5308,7 @@ jsprim@^2.0.2: json-schema "0.4.0" verror "1.10.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== @@ -4325,16 +5318,16 @@ kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: kind-of@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= + integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw== dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0: +kind-of@^5.0.0, kind-of@^5.0.2: version "5.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -kind-of@^6.0.0, kind-of@^6.0.2: +kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -4352,7 +5345,12 @@ kleur@^4.1.5: lazy-ass@1.6.0, lazy-ass@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" - integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM= + integrity sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw== + +leaflet@^1.7.1: + version "1.9.3" + resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414" + integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ== leven@^3.1.0: version "3.1.0" @@ -4362,15 +5360,15 @@ leven@^3.1.0: levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= + integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== dependencies: prelude-ls "~1.1.2" type-check "~0.3.2" lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + version "1.2.4" + resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" + integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== listr2@^3.8.3: version "3.14.0" @@ -4398,15 +5396,20 @@ lodash-es@^4.17.11: resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== +lodash._reinterpolate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" + integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== + lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= + integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== lodash.isempty@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" - integrity sha1-b4bL7di+TsmHvpqvM8loTbGzHn4= + integrity sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg== lodash.isfunction@^3.0.9: version "3.0.9" @@ -4416,19 +5419,34 @@ lodash.isfunction@^3.0.9: lodash.isobject@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d" - integrity sha1-PI+41bW/S/kK4G4U8qUwpO2TXh0= + integrity sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA== lodash.isstring@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" - integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= + integrity sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw== lodash.once@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" - integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w= + integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg== -lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.7.0: +lodash.template@^4.4.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" + integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== + dependencies: + lodash._reinterpolate "^3.0.0" + lodash.templatesettings "^4.0.0" + +lodash.templatesettings@^4.0.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" + integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== + dependencies: + lodash._reinterpolate "^3.0.0" + +lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -4465,6 +5483,13 @@ loose-envify@^1.4.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + lru-cache@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" @@ -4475,19 +5500,19 @@ lru-cache@^6.0.0: lz-string@^1.4.4: version "1.4.4" resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" - integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY= + integrity sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ== magic-string@^0.25.7: - version "0.25.7" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051" - integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA== + version "0.25.9" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" + integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== dependencies: - sourcemap-codec "^1.4.4" + sourcemap-codec "^1.4.8" magic-string@^0.26.2: - version "0.26.2" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.2.tgz#5331700e4158cd6befda738bb6b0c7b93c0d4432" - integrity sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A== + version "0.26.7" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.7.tgz#caf7daf61b34e9982f8228c4527474dac8981d6f" + integrity sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow== dependencies: sourcemap-codec "^1.4.8" @@ -4513,20 +5538,25 @@ makeerror@1.0.12: map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= + integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg== map-stream@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" - integrity sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ= + integrity sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g== map-visit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= + integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w== dependencies: object-visit "^1.0.0" +marked@^4.1.0: + version "4.2.12" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5" + integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw== + merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -4540,9 +5570,9 @@ merge2@^1.2.3, merge2@^1.3.0: methods@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== -micromatch@^3.1.4: +micromatch@^3.1.4, micromatch@^3.1.5: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -4562,24 +5592,24 @@ micromatch@^3.1.4: to-regex "^3.0.2" micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: - braces "^3.0.1" - picomatch "^2.2.3" + braces "^3.0.2" + picomatch "^2.3.1" -mime-db@1.51.0: - version "1.51.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" - integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.34" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" - integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A== + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: - mime-db "1.51.0" + mime-db "1.52.0" mimic-fn@^2.1.0: version "2.1.0" @@ -4598,10 +5628,10 @@ minimatch@^3.0.4, minimatch@^3.1.1: dependencies: brace-expansion "^1.1.7" -minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== +minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.7: + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== mixin-deep@^1.2.0: version "1.3.2" @@ -4612,9 +5642,9 @@ mixin-deep@^1.2.0: is-extendable "^1.0.1" mochawesome-merge@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/mochawesome-merge/-/mochawesome-merge-4.2.1.tgz#484e5c500dd5d88b33adb440e6dfef80d9109a18" - integrity sha512-G7+LqIKgixShKG4FyWDn1PIrzpKEwCofrJip/VzdqghNGqZl4S5MNoXx5YDfk9KLe+pr4qGa1TOzCc/oVw/8Kw== + version "4.2.2" + resolved "https://registry.yarnpkg.com/mochawesome-merge/-/mochawesome-merge-4.2.2.tgz#67164973f8efeefcc206764c3702aa2d5f0ba406" + integrity sha512-ZHeZcChGhb3If7fjSVuyB9rmDH86inNtsTb1ONYq1h0L1IduldFu38bJDcow46alMpiYQgJ7cPhv6nwpCwbJQw== dependencies: fs-extra "^7.0.1" glob "^7.1.6" @@ -4657,7 +5687,7 @@ mochawesome@^7.1.3: ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== ms@2.1.2: version "2.1.2" @@ -4699,12 +5729,17 @@ nanomatch@^1.2.9: natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== ncp@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" - integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M= + integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA== + +neo-async@^2.6.0: + version "2.6.2" + resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" + integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== nice-try@^1.0.4: version "1.0.5" @@ -4712,26 +5747,21 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-fetch@^2.6.0: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== + version "2.6.9" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" + integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== dependencies: whatwg-url "^5.0.0" node-gyp-build@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" - integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== + version "4.6.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055" + integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ== node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" - integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= - -node-modules-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" - integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= + integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== node-notifier@^8.0.0: version "8.0.2" @@ -4745,10 +5775,10 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" - integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== +node-releases@^2.0.8: + version "2.0.9" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.9.tgz#fe66405285382b0c4ac6bcfbfbe7e8a510650b4d" + integrity sha512-2xfmOrRkGogbTK9R6Leda0DGiXeY3p2NJpy4+gNCffdUvV6mdEJnaDEic1i3Ec2djAo8jWYoJMR5PB0MSMpxUA== normalize-package-data@^2.5.0: version "2.5.0" @@ -4763,7 +5793,7 @@ normalize-package-data@^2.5.0: normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w== dependencies: remove-trailing-separator "^1.0.1" @@ -4775,7 +5805,7 @@ normalize-path@^3.0.0: npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= + integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw== dependencies: path-key "^2.0.0" @@ -4787,25 +5817,38 @@ npm-run-path@^4.0.0, npm-run-path@^4.0.1: path-key "^3.0.0" nwsapi@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" - integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ== + version "2.2.2" + resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" + integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-copy@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= + integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ== dependencies: copy-descriptor "^0.1.0" define-property "^0.2.5" kind-of "^3.0.3" -object-keys@^1.0.12, object-keys@^1.1.1: +object-inspect@^1.9.0: + version "1.12.3" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" + integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== + +object-is@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + +object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== @@ -4813,31 +5856,31 @@ object-keys@^1.0.12, object-keys@^1.1.1: object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= + integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA== dependencies: isobject "^3.0.0" -object.assign@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== +object.assign@^4.1.4: + version "4.1.4" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" + 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" object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= + integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== dependencies: isobject "^3.0.1" once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" @@ -4868,7 +5911,7 @@ optionator@^0.8.1: ospath@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b" - integrity sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs= + integrity sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA== p-each-series@^2.1.0: version "2.2.0" @@ -4878,7 +5921,7 @@ p-each-series@^2.1.0: p-finally@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= + integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== p-limit@^2.2.0: version "2.3.0" @@ -4916,6 +5959,11 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" +parse-srcset@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1" + integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q== + parse5@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" @@ -4924,7 +5972,7 @@ parse5@6.0.1: pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= + integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== path-exists@^4.0.0: version "4.0.0" @@ -4934,19 +5982,19 @@ path-exists@^4.0.0: path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== path-key@^2.0.0, path-key@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= + integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -path-parse@^1.0.6, path-parse@^1.0.7: +path-parse@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== @@ -4959,41 +6007,39 @@ path-type@^4.0.0: pause-stream@0.0.11: version "0.0.11" resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445" - integrity sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= + integrity sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A== dependencies: through "~2.3" pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= + integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== picocolors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.2, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== +picomatch@^2.0.4, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== pify@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== pirates@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" - integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== - dependencies: - node-modules-regexp "^1.0.0" + version "4.0.5" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b" + integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ== pkg-dir@^4.2.0: version "4.2.0" @@ -5005,30 +6051,30 @@ pkg-dir@^4.2.0: posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= + integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== -postcss@^8.4.16: - version "8.4.16" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c" - integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ== +postcss@^8.3.11, postcss@^8.4.18: + version "8.4.21" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" + integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== dependencies: nanoid "^3.3.4" picocolors "^1.0.0" source-map-js "^1.0.2" posthog-js@^1.36.0: - version "1.36.0" - resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.36.0.tgz#cbefa031a1e7ee6ff25dae29b8aa77bd741adbba" - integrity sha512-LL9lbJxN46GbckRKSFZxX7fwNAvKUbi5nLFF0hMkmKY9o9zoz58oA0DJBZkqyEXK+15XzNoyLxF+wnxSPNwn3g== + version "1.42.3" + resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.42.3.tgz#524de8bd7628425a3fb4b61f5c10260e8a51b531" + integrity sha512-+HdPY1PRsENcqjKyjw8CGbcGzBXcElPikSUSFffjKVJKmkMqEgMFpEKhIY5UBbrU6xtgcvnQmidn+8gRhCBa5g== dependencies: - "@sentry/types" "^7.2.0" + "@sentry/types" "7.22.0" fflate "^0.4.1" rrweb-snapshot "^1.1.14" prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= + integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== pretty-bytes@^5.6.0: version "5.6.0" @@ -5045,16 +6091,29 @@ pretty-format@^26.6.2: ansi-styles "^4.0.0" react-is "^17.0.1" -pretty-format@^27.0.0, pretty-format@^27.3.1: - version "27.3.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.3.1.tgz#7e9486365ccdd4a502061fa761d3ab9ca1b78df5" - integrity sha512-DR/c+pvFc52nLimLROYjnXPtolawm+uWDxr4FjuLDLUn+ktWnSN851KoHwHzzqq6rfCOjkzN8FLgDrSub6UDuA== +pretty-format@^27.0.2: + version "27.5.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" + integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ== dependencies: - "@jest/types" "^27.2.5" ansi-regex "^5.0.1" ansi-styles "^5.0.0" react-is "^17.0.1" +pretty-format@^29.0.0, pretty-format@^29.4.1: + version "29.4.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.4.1.tgz#0da99b532559097b8254298da7c75a0785b1751c" + integrity sha512-dt/Z761JUVsrIKaY215o1xQJBGlSmTx/h4cSqXqjHLnU1+Kt+mavVE7UgqJJO5ukx5HjSswHfmXz4LjS2oIJfg== + dependencies: + "@jest/schemas" "^29.4.0" + ansi-styles "^5.0.0" + react-is "^18.0.0" + +process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + prompts@^2.0.1: version "2.4.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" @@ -5073,14 +6132,14 @@ prop-types@^15.7.2: react-is "^16.13.1" property-expr@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.4.tgz#37b925478e58965031bb612ec5b3260f8241e910" - integrity sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg== + version "2.0.5" + resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.5.tgz#278bdb15308ae16af3e3b9640024524f4dc02cb4" + integrity sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA== proxy-from-env@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" - integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4= + integrity sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A== ps-tree@1.2.0: version "1.2.0" @@ -5090,9 +6149,9 @@ ps-tree@1.2.0: event-stream "=3.3.4" psl@^1.1.28, psl@^1.1.33: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== + version "1.9.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" + integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== pump@^3.0.0: version "3.0.0" @@ -5103,14 +6162,21 @@ pump@^3.0.0: once "^1.3.1" punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== -qs@~6.5.2: - version "6.5.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" - integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== +qs@~6.10.3: + version "6.10.5" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4" + integrity sha512-O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ== + dependencies: + side-channel "^1.0.4" + +querystringify@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" + integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== queue-microtask@^1.2.2: version "1.2.3" @@ -5127,6 +6193,11 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== +react-is@^18.0.0: + version "18.2.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" + integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== + read-pkg-up@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" @@ -5146,6 +6217,19 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" +readable-stream@~2.3.6: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -5154,10 +6238,10 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -regenerate-unicode-properties@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz#54d09c7115e1f53dc2314a974b32c1c344efe326" - integrity sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA== +regenerate-unicode-properties@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c" + integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ== dependencies: regenerate "^1.4.2" @@ -5166,15 +6250,15 @@ regenerate@^1.4.2: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== -regenerator-runtime@^0.13.4: - version "0.13.9" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" - integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== +regenerator-runtime@^0.13.11: + version "0.13.11" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== -regenerator-transform@^0.14.2: - version "0.14.5" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4" - integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw== +regenerator-transform@^0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56" + integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg== dependencies: "@babel/runtime" "^7.8.4" @@ -5186,30 +6270,64 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexpu-core@^4.7.1: - version "4.8.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.8.0.tgz#e5605ba361b67b1718478501327502f4479a98f0" - integrity sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg== +regexp.prototype.flags@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" + integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + functions-have-names "^1.2.2" + +regexparam@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa" + integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw== + +regexparam@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" + integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== + +regexpu-core@^5.2.1: + version "5.2.2" + resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.2.tgz#3e4e5d12103b64748711c3aad69934d7718e75fc" + integrity sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw== dependencies: regenerate "^1.4.2" - regenerate-unicode-properties "^9.0.0" - regjsgen "^0.5.2" - regjsparser "^0.7.0" + 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" + unicode-match-property-value-ecmascript "^2.1.0" -regjsgen@^0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733" - integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== +regjsgen@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6" + integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA== -regjsparser@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.7.0.tgz#a6b667b54c885e18b52554cb4960ef71187e9968" - integrity sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ== +regjsparser@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" + integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ== dependencies: jsesc "~0.5.0" +relative@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" + integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA== + dependencies: + isobject "^2.0.0" + +remarkable@^1.6.2: + version "1.7.4" + resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" + integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== + dependencies: + argparse "^1.0.10" + autolinker "~0.28.0" + remixicon@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/remixicon/-/remixicon-2.5.0.tgz#b5e245894a1550aa23793f95daceadbf96ad1a41" @@ -5218,7 +6336,7 @@ remixicon@2.5.0: remove-trailing-separator@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw== repeat-element@^1.1.2: version "1.1.4" @@ -5228,25 +6346,30 @@ repeat-element@^1.1.2: repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= + integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== request-progress@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe" - integrity sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4= + integrity sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg== dependencies: throttleit "^1.0.0" require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== +requires-port@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== + resolve-cwd@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" @@ -5262,17 +6385,9 @@ resolve-from@^5.0.0: resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= + integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== -resolve@^1.10.0, resolve@^1.14.2, resolve@^1.18.1: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - -resolve@^1.22.1: +resolve@^1.10.0, resolve@^1.14.2, resolve@^1.18.1, resolve@^1.22.1: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -5329,17 +6444,10 @@ rollup-pluginutils@^2.8.2: dependencies: estree-walker "^0.6.1" -"rollup@>=2.75.6 <2.77.0 || ~2.77.0": - version "2.77.3" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.3.tgz#8f00418d3a2740036e15deb653bed1a90ee0cc12" - integrity sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g== - optionalDependencies: - fsevents "~2.3.2" - -rollup@^2.44.0: - version "2.60.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.60.0.tgz#4ee60ab7bdd0356763f87d7099f413e5460fc193" - integrity sha512-cHdv9GWd58v58rdseC8e8XIaPUo8a9cgZpnCMMDGZFDZKEODOiPPEQFXLriWr/TjXzhPPmG5bkAztPsOARIcGQ== +rollup@^2.44.0, rollup@^2.79.1: + version "2.79.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" + integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== optionalDependencies: fsevents "~2.3.2" @@ -5360,17 +6468,10 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -rxjs@^7.1.0: - version "7.4.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68" - integrity sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w== - dependencies: - tslib "~2.1.0" - -rxjs@^7.5.1: - version "7.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.4.tgz#3d6bd407e6b7ce9a123e76b1e770dc5761aa368d" - integrity sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ== +rxjs@^7.5.1, rxjs@^7.8.0: + version "7.8.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" + integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== dependencies: tslib "^2.1.0" @@ -5379,7 +6480,7 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.2: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-buffer@~5.1.1: +safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== @@ -5387,7 +6488,7 @@ safe-buffer@~5.1.1: safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= + integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg== dependencies: ret "~0.1.10" @@ -5411,6 +6512,18 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" +sanitize-html@^2.7.0: + version "2.8.1" + resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.8.1.tgz#319c4fdba67e1edf35b1fd6d9362210044826d47" + integrity sha512-qK5neD0SaMxGwVv5txOYv05huC3o6ZAA4h5+7nJJgWMNFUNRjcjLO6FpwAtKzfKCZ0jrG6xTk6eVFskbvOGblg== + dependencies: + deepmerge "^4.2.2" + escape-string-regexp "^4.0.0" + htmlparser2 "^8.0.0" + is-plain-object "^5.0.0" + parse-srcset "^1.0.2" + postcss "^8.3.11" + saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" @@ -5418,32 +6531,37 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" +screenfull@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238" + integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw== + +self-closing-tags@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" + integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== + "semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== semver@^7.3.2: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== dependencies: lru-cache "^6.0.0" set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== set-value@^2.0.0, set-value@^2.0.1: version "2.0.1" @@ -5458,7 +6576,7 @@ set-value@^2.0.0, set-value@^2.0.1: shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= + integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== dependencies: shebang-regex "^1.0.0" @@ -5472,7 +6590,7 @@ shebang-command@^2.0.0: shebang-regex@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= + integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== shebang-regex@^3.0.0: version "3.0.0" @@ -5491,10 +6609,26 @@ shortid@2.2.15: dependencies: nanoid "^2.1.0" +shortid@^2.2.15: + version "2.2.16" + resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" + integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== + dependencies: + nanoid "^2.1.0" + +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.5" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" - integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== sisteransi@^1.0.5: version "1.0.5" @@ -5554,6 +6688,24 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" +socket.io-client@^4.5.1: + version "4.5.4" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.4.tgz#d3cde8a06a6250041ba7390f08d2468ccebc5ac9" + integrity sha512-ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.2" + engine.io-client "~6.2.3" + socket.io-parser "~4.2.1" + +socket.io-parser@~4.2.1: + version "4.2.2" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206" + integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw== + dependencies: + "@socket.io/component-emitter" "~3.1.0" + debug "~4.3.1" + source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" @@ -5570,18 +6722,10 @@ source-map-resolve@^0.5.0: source-map-url "^0.4.0" urix "^0.1.0" -source-map-resolve@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" - integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - source-map-support@^0.5.6: - version "0.5.20" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" - integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -5591,10 +6735,10 @@ source-map-url@^0.4.0: resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== -source-map@^0.5.0, source-map@^0.5.6: +source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" @@ -5602,11 +6746,11 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== source-map@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== + version "0.7.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== -sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8: +sourcemap-codec@^1.4.8: version "1.4.8" resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== @@ -5633,9 +6777,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.11" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" - integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== + version "3.0.12" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779" + integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -5647,14 +6791,14 @@ split-string@^3.0.1, split-string@^3.0.2: split@0.3: version "0.3.3" resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" - integrity sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8= + integrity sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA== dependencies: through "2" sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== sshpk@^1.14.1: version "1.17.0" @@ -5671,38 +6815,46 @@ sshpk@^1.14.1: safer-buffer "^2.0.2" tweetnacl "~0.14.0" -stack-utils@^2.0.2: - version "2.0.5" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" - integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== +stack-utils@^2.0.2, stack-utils@^2.0.3: + version "2.0.6" + resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f" + integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ== dependencies: escape-string-regexp "^2.0.0" start-server-and-test@^1.12.1: - version "1.14.0" - resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.14.0.tgz#c57f04f73eac15dd51733b551d775b40837fdde3" - integrity sha512-on5ELuxO2K0t8EmNj9MtVlFqwBMxfWOhu4U7uZD1xccVpFlOQKR93CSe0u98iQzfNxRyaNTb/CdadbNllplTsw== + version "1.15.3" + resolved "https://registry.yarnpkg.com/start-server-and-test/-/start-server-and-test-1.15.3.tgz#33bb6465ff4d5e3a476337512a7e0d737a5ef026" + integrity sha512-4GqkqghvUR9cJ8buvtgkyT0AHgVwCJ5EN8eDEhe9grTChGwWUxGm2nqfSeE9+0PZkLRdFqcwTwxVHe1y3ViutQ== dependencies: + arg "^5.0.2" bluebird "3.7.2" check-more-types "2.24.0" - debug "4.3.2" + debug "4.3.4" execa "5.1.1" lazy-ass "1.6.0" ps-tree "1.2.0" - wait-on "6.0.0" + wait-on "7.0.1" static-extend@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= + integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g== dependencies: define-property "^0.2.5" object-copy "^0.1.0" +stop-iteration-iterator@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4" + integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ== + dependencies: + internal-slot "^1.0.4" + stream-combiner@~0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" - integrity sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ= + integrity sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw== dependencies: duplexer "~0.1.1" @@ -5723,6 +6875,13 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -5743,7 +6902,7 @@ strip-bom@^4.0.0: strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= + integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q== strip-final-newline@^2.0.0: version "2.0.0" @@ -5757,6 +6916,11 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" +striptags@^3.1.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" + integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== + supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -5779,9 +6943,9 @@ supports-color@^8.1.1: has-flag "^4.0.0" supports-hyperlinks@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" - integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== + version "2.3.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624" + integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA== dependencies: has-flag "^4.0.0" supports-color "^7.0.0" @@ -5791,10 +6955,24 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== +svelte-apexcharts@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/svelte-apexcharts/-/svelte-apexcharts-1.0.2.tgz#4e000f8b8f7c901c05658c845457dfc8314d54c1" + integrity sha512-6qlx4rE+XsonZ0FZudfwqOQ34Pq+3wpxgAD75zgEmGoYhYBJcwmikTuTf3o8ZBsZue9U/pAwhNy3ed1Bkq1gmA== + dependencies: + apexcharts "^3.19.2" + svelte-dnd-action@^0.9.8: - version "0.9.12" - resolved "https://registry.yarnpkg.com/svelte-dnd-action/-/svelte-dnd-action-0.9.12.tgz#78cf33097986488c6d069eca517af473cd998730" - integrity sha512-GlXIB3/56IMR5A0+qUx+FX7Q7n8uCAIeuYdgSBmn9iOlxWc+mgM8P1kNwAKCMSTdQ4IQETVQILNgWVY1KIFzsg== + version "0.9.22" + resolved "https://registry.yarnpkg.com/svelte-dnd-action/-/svelte-dnd-action-0.9.22.tgz#003eee9dddb31d8c782f6832aec8b1507fff194d" + integrity sha512-lOQJsNLM1QWv5mdxIkCVtk6k4lHCtLgfE59y8rs7iOM6erchbLC9hMEFYSveZz7biJV0mpg7yDSs4bj/RT/YkA== + +svelte-flatpickr@^3.1.0, svelte-flatpickr@^3.2.3: + version "3.3.1" + resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.3.1.tgz#2f2fb60d8190e583ff62d82162a5c2f3fd7824a8" + integrity sha512-cKHET/oFoGA/qIoAX87+XvC5n3KuFrCSYBTzI1gl1TKZsTiVnbQkJOIsIa96S19tbnyyPKn+tdt028vzBA3qyA== + dependencies: + flatpickr "^4.5.2" svelte-hmr@^0.14.12: version "0.14.12" @@ -5811,15 +6989,77 @@ svelte-loading-spinners@^0.1.1: resolved "https://registry.yarnpkg.com/svelte-loading-spinners/-/svelte-loading-spinners-0.1.7.tgz#3fa6fa0ef67ab635773bf20b07d0b071debbadaa" integrity sha512-EKCId1DjVL2RSUVJJsvtNcqQHox03XIgh4xh/4p7r6ST7d8mut6INY9/LqK4A17PFU64+3quZmqiSfOlf480CA== -svelte-portal@1.0.0: +svelte-portal@1.0.0, svelte-portal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== -svelte@^3.48.0: - version "3.49.0" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.49.0.tgz#5baee3c672306de1070c3b7888fc2204e36a4029" - integrity sha512-+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA== +svelte-spa-router@^3.0.5: + version "3.3.0" + resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c" + integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ== + dependencies: + regexparam "2.0.1" + +svelte@^3.46.2, svelte@^3.48.0, svelte@^3.49.0: + version "3.55.1" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.55.1.tgz#6f93b153e5248039906ce5fe196efdb9e05dfce8" + integrity sha512-S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ== + +svg.draggable.js@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba" + integrity sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw== + dependencies: + svg.js "^2.0.1" + +svg.easing.js@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/svg.easing.js/-/svg.easing.js-2.0.0.tgz#8aa9946b0a8e27857a5c40a10eba4091e5691f12" + integrity sha512-//ctPdJMGy22YoYGV+3HEfHbm6/69LJUTAqI2/5qBvaNHZ9uUFVC82B0Pl299HzgH13rKrBgi4+XyXXyVWWthA== + dependencies: + svg.js ">=2.3.x" + +svg.filter.js@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/svg.filter.js/-/svg.filter.js-2.0.2.tgz#91008e151389dd9230779fcbe6e2c9a362d1c203" + integrity sha512-xkGBwU+dKBzqg5PtilaTb0EYPqPfJ9Q6saVldX+5vCRy31P6TlRCP3U9NxH3HEufkKkpNgdTLBJnmhDHeTqAkw== + dependencies: + svg.js "^2.2.5" + +svg.js@>=2.3.x, svg.js@^2.0.1, svg.js@^2.2.5, svg.js@^2.4.0, svg.js@^2.6.5: + version "2.7.1" + resolved "https://registry.yarnpkg.com/svg.js/-/svg.js-2.7.1.tgz#eb977ed4737001eab859949b4a398ee1bb79948d" + integrity sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA== + +svg.pathmorphing.js@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz#c25718a1cc7c36e852ecabc380e758ac09bb2b65" + integrity sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww== + dependencies: + svg.js "^2.4.0" + +svg.resize.js@^1.4.3: + version "1.4.3" + resolved "https://registry.yarnpkg.com/svg.resize.js/-/svg.resize.js-1.4.3.tgz#885abd248e0cd205b36b973c4b578b9a36f23332" + integrity sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw== + dependencies: + svg.js "^2.6.5" + svg.select.js "^2.1.2" + +svg.select.js@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-2.1.2.tgz#e41ce13b1acff43a7441f9f8be87a2319c87be73" + integrity sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ== + dependencies: + svg.js "^2.2.5" + +svg.select.js@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-3.0.1.tgz#a4198e359f3825739226415f82176a90ea5cc917" + integrity sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw== + dependencies: + svg.js "^2.6.5" symbol-tree@^3.2.4: version "3.2.4" @@ -5827,9 +7067,9 @@ symbol-tree@^3.2.4: integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== synchronous-promise@^2.0.13: - version "2.0.15" - resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.15.tgz#07ca1822b9de0001f5ff73595f3d08c4f720eb8e" - integrity sha512-k8uzYIkIVwmT+TcglpdN50pS2y1BDcUnBPK9iJeGu0Pl1lOI8pD6wtzgw91Pjpe+RxtTncw32tLxs/R0yNL2Mg== + version "2.0.17" + resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.17.tgz#38901319632f946c982152586f2caf8ddc25c032" + integrity sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g== tcomb-validation@^3.3.0: version "3.4.1" @@ -5868,12 +7108,20 @@ throat@^5.0.0: throttleit@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" - integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw= + integrity sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g== + +through2@^2.0.0: + version "2.0.5" + resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== + dependencies: + readable-stream "~2.3.6" + xtend "~4.0.1" through@2, through@^2.3.8, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== tmp@~0.2.1: version "0.2.1" @@ -5890,19 +7138,24 @@ tmpl@1.0.5: to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== + +to-gfm-code-block@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" + integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg== to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= + integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg== dependencies: kind-of "^3.0.2" to-regex-range@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= + integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg== dependencies: is-number "^3.0.0" repeat-string "^1.6.1" @@ -5927,16 +7180,17 @@ to-regex@^3.0.1, to-regex@^3.0.2: toposort@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" - integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA= + integrity sha512-0a5EOkAUp8D4moMi2W8ZF8jcga7BgZd91O/yabJCFY8az+XSzeGyTKs0Aoo897iV1Nj6guFq8orWDS96z91oGg== tough-cookie@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" - integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== + version "4.1.2" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" + 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" tough-cookie@~2.5.0: version "2.5.0" @@ -5956,7 +7210,7 @@ tr46@^2.1.0: tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== ts-node@10.8.1: version "10.8.1" @@ -5992,31 +7246,26 @@ tslib@^1.9.3: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.1.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== - -tslib@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== dependencies: safe-buffer "^5.0.1" tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== type-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= + integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== dependencies: prelude-ls "~1.1.2" @@ -6047,11 +7296,28 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" +typeof-article@^0.1.1: + version "0.1.1" + resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" + integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw== + dependencies: + kind-of "^3.1.0" + typescript@4.7.3: version "4.7.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== +typo-js@*: + version "1.2.2" + resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b" + integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== + +uglify-js@^3.1.4: + version "3.17.4" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" + integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== + unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" @@ -6065,15 +7331,15 @@ unicode-match-property-ecmascript@^2.0.0: unicode-canonical-property-names-ecmascript "^2.0.0" unicode-property-aliases-ecmascript "^2.0.0" -unicode-match-property-value-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" - integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== +unicode-match-property-value-ecmascript@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0" + integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA== unicode-property-aliases-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8" - integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd" + integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w== union-value@^1.0.0: version "1.0.1" @@ -6085,11 +7351,16 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^2.0.1" -universalify@^0.1.0, universalify@^0.1.2: +universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== +universalify@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" + integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== + universalify@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" @@ -6098,7 +7369,7 @@ universalify@^2.0.0: unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= + integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ== dependencies: has-value "^0.3.1" isobject "^3.0.0" @@ -6108,10 +7379,26 @@ untildify@^4.0.0: resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== +update-browserslist-db@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + urix@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= + integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg== + +url-parse@^1.5.3: + version "1.5.10" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" + integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== + dependencies: + querystringify "^2.1.1" + requires-port "^1.0.0" use@^3.1.0: version "3.1.1" @@ -6119,12 +7406,17 @@ use@^3.1.0: integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== utf-8-validate@^5.0.2: - version "5.0.7" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.7.tgz#c15a19a6af1f7ad9ec7ddc425747ca28c3644922" - integrity sha512-vLt1O5Pp+flcArHGIyKEQq883nBt8nN8tVBcoL0qUXj2XT1n7p70yGIq2VK98I5FdZ1YHc0wk/koOnHjnXWk1Q== + version "5.0.10" + resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.10.tgz#d7d10ea39318171ca982718b6b96a8d2442571a2" + integrity sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ== dependencies: node-gyp-build "^4.3.0" +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== + uuid@8.3.1: version "8.3.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" @@ -6165,24 +7457,32 @@ validator@^13.6.0: verror@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw== dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" extsprintf "^1.2.0" vite@^3.0.8: - version "3.0.8" - resolved "https://registry.yarnpkg.com/vite/-/vite-3.0.8.tgz#aa095ad8e3e5da46d9ec7e878f262678965d6531" - integrity sha512-AOZ4eN7mrkJiOLuw8IA7piS4IdOQyQCA81GxGsAQvAZzMRi9ZwGB3TOaYsj4uLAWK46T5L4AfQ6InNGlxX30IQ== + version "3.2.5" + resolved "https://registry.yarnpkg.com/vite/-/vite-3.2.5.tgz#dee5678172a8a0ab3e547ad4148c3d547f90e86a" + integrity sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ== dependencies: - esbuild "^0.14.47" - postcss "^8.4.16" + esbuild "^0.15.9" + postcss "^8.4.18" resolve "^1.22.1" - rollup ">=2.75.6 <2.77.0 || ~2.77.0" + rollup "^2.79.1" optionalDependencies: fsevents "~2.3.2" +vm2@^3.9.4: + version "3.9.13" + resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.13.tgz#774a1a3d73b9b90b1aa45bcc5f25e349f2eef649" + integrity sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q== + dependencies: + acorn "^8.7.0" + acorn-walk "^8.2.0" + w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -6197,16 +7497,16 @@ w3c-xmlserializer@^2.0.0: dependencies: xml-name-validator "^3.0.0" -wait-on@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-6.0.0.tgz#7e9bf8e3d7fe2daecbb7a570ac8ca41e9311c7e7" - integrity sha512-tnUJr9p5r+bEYXPUdRseolmz5XqJTTj98JgOsfBn7Oz2dxfE2g3zw1jE+Mo8lopM3j3et/Mq1yW7kKX6qw7RVw== +wait-on@7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-7.0.1.tgz#5cff9f8427e94f4deacbc2762e6b0a489b19eae9" + integrity sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog== dependencies: - axios "^0.21.1" - joi "^17.4.0" + axios "^0.27.2" + joi "^17.7.0" lodash "^4.17.21" - minimist "^1.2.5" - rxjs "^7.1.0" + minimist "^1.2.7" + rxjs "^7.8.0" walker@^1.0.7, walker@~1.0.5: version "1.0.8" @@ -6218,7 +7518,7 @@ walker@^1.0.7, walker@~1.0.5: webidl-conversions@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== webidl-conversions@^5.0.0: version "5.0.0" @@ -6245,7 +7545,7 @@ whatwg-mimetype@^2.3.0: whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== dependencies: tr46 "~0.0.3" webidl-conversions "^3.0.0" @@ -6259,10 +7559,43 @@ whatwg-url@^8.0.0, whatwg-url@^8.5.0: tr46 "^2.1.0" webidl-conversions "^6.1.0" +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" + +which-collection@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" + integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== + dependencies: + is-map "^2.0.1" + is-set "^2.0.1" + is-weakmap "^2.0.1" + is-weakset "^2.0.1" + which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= + integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== + +which-typed-array@^1.1.9: + version "1.1.9" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" + integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== + dependencies: + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.0" + is-typed-array "^1.1.10" which@^1.2.9: version "1.3.1" @@ -6283,6 +7616,11 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +wordwrap@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" + integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== + wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -6304,7 +7642,7 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== write-file-atomic@^3.0.0: version "3.0.3" @@ -6317,9 +7655,14 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" ws@^7.4.6: - version "7.5.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881" - integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w== + version "7.5.9" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" + integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== + +ws@~8.2.3: + version "8.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" + integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== xml-name-validator@^3.0.0: version "3.0.0" @@ -6331,6 +7674,16 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== +xmlhttprequest-ssl@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" + integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== + +xtend@~4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" + integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + y18n@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" @@ -6341,6 +7694,11 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + yallist@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" @@ -6354,10 +7712,10 @@ yargs-parser@^18.1.2: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^21.0.0: - version "21.0.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" - integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== yargs@^15.3.1, yargs@^15.4.1: version "15.4.1" @@ -6377,26 +7735,31 @@ yargs@^15.3.1, yargs@^15.4.1: yargs-parser "^18.1.2" yargs@^17.2.1: - version "17.5.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" - integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== + version "17.6.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" + integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== dependencies: - cliui "^7.0.2" + cliui "^8.0.1" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" string-width "^4.2.3" y18n "^5.0.5" - yargs-parser "^21.0.0" + yargs-parser "^21.1.1" yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== dependencies: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" +year@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" + integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w== + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From 2ab368053807ab3f930ffdf1523842352d752537 Mon Sep 17 00:00:00 2001 From: adrinr Date: Tue, 31 Jan 2023 17:27:25 +0000 Subject: [PATCH 347/387] Fix installation race conditions --- packages/backend-core/src/installation.ts | 28 +++++++++++++------ .../src/tests/utilities/TestConfiguration.ts | 12 +------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/packages/backend-core/src/installation.ts b/packages/backend-core/src/installation.ts index 4e78a508a5..64be6f3f43 100644 --- a/packages/backend-core/src/installation.ts +++ b/packages/backend-core/src/installation.ts @@ -2,7 +2,7 @@ import { newid } from "./utils" import * as events from "./events" import { StaticDatabases } from "./db" import { doWithDB } from "./db" -import { Installation, IdentityType } from "@budibase/types" +import { Installation, IdentityType, Database } from "@budibase/types" import * as context from "./context" import semver from "semver" import { bustCache, withCache, TTL, CacheKey } from "./cache/generic" @@ -14,6 +14,24 @@ export const getInstall = async (): Promise => { useTenancy: false, }) } +async function createInstallDoc(platformDb: Database) { + const install: Installation = { + _id: StaticDatabases.PLATFORM_INFO.docs.install, + installId: newid(), + version: pkg.version, + } + try { + const resp = await platformDb.put(install) + install._rev = resp.rev + return install + } catch (err: any) { + if (err.status === 409) { + return getInstallFromDB() + } else { + throw err + } + } +} const getInstallFromDB = async (): Promise => { return doWithDB( @@ -26,13 +44,7 @@ const getInstallFromDB = async (): Promise => { ) } catch (e: any) { if (e.status === 404) { - install = { - _id: StaticDatabases.PLATFORM_INFO.docs.install, - installId: newid(), - version: pkg.version, - } - const resp = await platformDb.put(install) - install._rev = resp.rev + install = await createInstallDoc(platformDb) } else { throw e } diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts index 6726de5bca..688b3cd698 100644 --- a/packages/server/src/tests/utilities/TestConfiguration.ts +++ b/packages/server/src/tests/utilities/TestConfiguration.ts @@ -11,7 +11,7 @@ mocks.licenses.useUnlimited() import { init as dbInit } from "../../db" dbInit() import env from "../../environment" -import { db, env as coreEnv, StaticDatabases } from "@budibase/backend-core" +import { env as coreEnv } from "@budibase/backend-core" import { basicTable, basicRow, @@ -153,16 +153,6 @@ class TestConfiguration { this.tenantId = `tenant-${newid()}` } - try { - // Prepopulate dbs to avoid race conditions - await db.getDB(StaticDatabases.PLATFORM_INFO.name).checkSetup() - await db.getDB(StaticDatabases.PLATFORM_INFO.docs.install).checkSetup() - } catch (err: any) { - if (err.status !== 409) { - throw err - } - } - if (!this.started) { await startup() } From 21d16d3aabcaed9a31c38c1f3963c22440f21b04 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 31 Jan 2023 17:32:58 +0000 Subject: [PATCH 348/387] v2.2.12-alpha.52 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index b24e3bc52c..88005cc266 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.51", + "version": "2.2.12-alpha.52", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index f891756772..1d2328c530 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.51", + "version": "2.2.12-alpha.52", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.51", + "@budibase/types": "2.2.12-alpha.52", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index e3281c05fd..7392a22185 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.51", + "version": "2.2.12-alpha.52", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.51", + "@budibase/string-templates": "2.2.12-alpha.52", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 2fa8c23776..142fcee4b3 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.51", + "version": "2.2.12-alpha.52", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.51", - "@budibase/client": "2.2.12-alpha.51", - "@budibase/frontend-core": "2.2.12-alpha.51", - "@budibase/string-templates": "2.2.12-alpha.51", + "@budibase/bbui": "2.2.12-alpha.52", + "@budibase/client": "2.2.12-alpha.52", + "@budibase/frontend-core": "2.2.12-alpha.52", + "@budibase/string-templates": "2.2.12-alpha.52", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 627e80225d..ac24542ed0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.51", + "version": "2.2.12-alpha.52", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.51", - "@budibase/string-templates": "2.2.12-alpha.51", - "@budibase/types": "2.2.12-alpha.51", + "@budibase/backend-core": "2.2.12-alpha.52", + "@budibase/string-templates": "2.2.12-alpha.52", + "@budibase/types": "2.2.12-alpha.52", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 992e107b63..0265f23608 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.51", + "version": "2.2.12-alpha.52", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.51", - "@budibase/frontend-core": "2.2.12-alpha.51", - "@budibase/string-templates": "2.2.12-alpha.51", + "@budibase/bbui": "2.2.12-alpha.52", + "@budibase/frontend-core": "2.2.12-alpha.52", + "@budibase/string-templates": "2.2.12-alpha.52", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index cb94e37af0..0f5327e5f3 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.51", + "version": "2.2.12-alpha.52", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.51", + "@budibase/bbui": "2.2.12-alpha.52", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index a0f714cd88..52ac20c70a 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.51", + "version": "2.2.12-alpha.52", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 98a5c50463..f08939138b 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.51", + "version": "2.2.12-alpha.52", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.51", - "@budibase/client": "2.2.12-alpha.51", + "@budibase/backend-core": "2.2.12-alpha.52", + "@budibase/client": "2.2.12-alpha.52", "@budibase/pro": "2.2.12-alpha.51", - "@budibase/string-templates": "2.2.12-alpha.51", - "@budibase/types": "2.2.12-alpha.51", + "@budibase/string-templates": "2.2.12-alpha.52", + "@budibase/types": "2.2.12-alpha.52", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index e268e5bd2a..44bfa48ebf 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.51", + "version": "2.2.12-alpha.52", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index cc30804846..ce7ad9c492 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.51", + "version": "2.2.12-alpha.52", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index cc39afd0d0..b96bb164b7 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.51", + "version": "2.2.12-alpha.52", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.51", + "@budibase/backend-core": "2.2.12-alpha.52", "@budibase/pro": "2.2.12-alpha.51", - "@budibase/string-templates": "2.2.12-alpha.51", - "@budibase/types": "2.2.12-alpha.51", + "@budibase/string-templates": "2.2.12-alpha.52", + "@budibase/types": "2.2.12-alpha.52", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From 9f3cb5934b4d101c35048f59ff8b20a2d018ffc5 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 31 Jan 2023 17:37:32 +0000 Subject: [PATCH 349/387] Update pro version to 2.2.12-alpha.52 --- packages/server/package.json | 2 +- packages/server/yarn.lock | 30 +++++++++++++++--------------- packages/worker/package.json | 2 +- packages/worker/yarn.lock | 30 +++++++++++++++--------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index f08939138b..9d0bc27b0c 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -45,7 +45,7 @@ "@apidevtools/swagger-parser": "10.0.3", "@budibase/backend-core": "2.2.12-alpha.52", "@budibase/client": "2.2.12-alpha.52", - "@budibase/pro": "2.2.12-alpha.51", + "@budibase/pro": "2.2.12-alpha.52", "@budibase/string-templates": "2.2.12-alpha.52", "@budibase/types": "2.2.12-alpha.52", "@bull-board/api": "3.7.0", diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock index 16bddaef18..df3fcc1aaa 100644 --- a/packages/server/yarn.lock +++ b/packages/server/yarn.lock @@ -1273,13 +1273,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.51": - version "2.2.12-alpha.51" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.51.tgz#086dd2566be016683e5e3ae4ce8e8996aec35f7b" - integrity sha512-XWsiELOdi+292nTBT2rWz4vc2gs8YfRKKC2TE6a/4cc7kzuX/Sj88cY6l8wHYb1TVlMG+i9gLHRIxaI+w3cb9Q== +"@budibase/backend-core@2.2.12-alpha.52": + version "2.2.12-alpha.52" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.52.tgz#b1f7457f5aae71eaed4e4fb7ab3c2d760ea3d74a" + integrity sha512-JUpwI6U0b+n5CyatdUUDzYkVneJQWUbjkGHZiWZrP0TncrHeKi4HmBKPswYoEydzOQQOfpDOa7ZoK9ffEldf/A== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.51" + "@budibase/types" "2.2.12-alpha.52" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -1374,13 +1374,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.51": - version "2.2.12-alpha.51" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.51.tgz#a0b5dd3d5c023d147f008b0eda05bfa1bcdca56c" - integrity sha512-jBV92QxtQuABLACiLT7iWI9S/yesm+OUKqPAz5hSc9EfqRS4L8jP/OOxoEkhj9lK8vi7qbeHijlarna6JqNnRA== +"@budibase/pro@2.2.12-alpha.52": + version "2.2.12-alpha.52" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.52.tgz#37df13f60fbe873537e901f9183205100ddb8d98" + integrity sha512-Y5luiKVvkOtWEnfZ0lrqfNfclSyQrhFJnP9P7BgEBKUcqBguslaAObPZtHfcP1GXiR/I6hoZKXMCCSvHDRXFbg== dependencies: - "@budibase/backend-core" "2.2.12-alpha.51" - "@budibase/types" "2.2.12-alpha.51" + "@budibase/backend-core" "2.2.12-alpha.52" + "@budibase/types" "2.2.12-alpha.52" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -1406,10 +1406,10 @@ svelte-apexcharts "^1.0.2" svelte-flatpickr "^3.1.0" -"@budibase/types@2.2.12-alpha.51": - version "2.2.12-alpha.51" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.51.tgz#2595094cb737397091744515e9b0a9141de5cba9" - integrity sha512-mzsPC8BLaUQwayfqLlv+Q2E986Axh429o+x3r2OhkfaoHyioiE3TBtI7hLHoBExGHm1tKycRQojkRnwcuWHbWQ== +"@budibase/types@2.2.12-alpha.52": + version "2.2.12-alpha.52" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.52.tgz#184c2c74a1705e0fad49ad14608b618db99ecabd" + integrity sha512-yQSxExP1l/kqy1grHB58STHDfs8UBwEozfRRs090kif3a69DfhAzur500EECW8otKahQKL+DUHedG0b/ilAVtw== "@bull-board/api@3.7.0": version "3.7.0" diff --git a/packages/worker/package.json b/packages/worker/package.json index b96bb164b7..93b526b6a1 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -37,7 +37,7 @@ "license": "GPL-3.0", "dependencies": { "@budibase/backend-core": "2.2.12-alpha.52", - "@budibase/pro": "2.2.12-alpha.51", + "@budibase/pro": "2.2.12-alpha.52", "@budibase/string-templates": "2.2.12-alpha.52", "@budibase/types": "2.2.12-alpha.52", "@koa/router": "8.0.8", diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock index 353fe2a698..967263467c 100644 --- a/packages/worker/yarn.lock +++ b/packages/worker/yarn.lock @@ -470,13 +470,13 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/backend-core@2.2.12-alpha.51": - version "2.2.12-alpha.51" - resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.51.tgz#086dd2566be016683e5e3ae4ce8e8996aec35f7b" - integrity sha512-XWsiELOdi+292nTBT2rWz4vc2gs8YfRKKC2TE6a/4cc7kzuX/Sj88cY6l8wHYb1TVlMG+i9gLHRIxaI+w3cb9Q== +"@budibase/backend-core@2.2.12-alpha.52": + version "2.2.12-alpha.52" + resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.2.12-alpha.52.tgz#b1f7457f5aae71eaed4e4fb7ab3c2d760ea3d74a" + integrity sha512-JUpwI6U0b+n5CyatdUUDzYkVneJQWUbjkGHZiWZrP0TncrHeKi4HmBKPswYoEydzOQQOfpDOa7ZoK9ffEldf/A== dependencies: "@budibase/nano" "10.1.1" - "@budibase/types" "2.2.12-alpha.51" + "@budibase/types" "2.2.12-alpha.52" "@shopify/jest-koa-mocks" "5.0.1" "@techpass/passport-openidconnect" "0.3.2" aws-cloudfront-sign "2.2.0" @@ -521,13 +521,13 @@ qs "^6.11.0" tough-cookie "^4.1.2" -"@budibase/pro@2.2.12-alpha.51": - version "2.2.12-alpha.51" - resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.51.tgz#a0b5dd3d5c023d147f008b0eda05bfa1bcdca56c" - integrity sha512-jBV92QxtQuABLACiLT7iWI9S/yesm+OUKqPAz5hSc9EfqRS4L8jP/OOxoEkhj9lK8vi7qbeHijlarna6JqNnRA== +"@budibase/pro@2.2.12-alpha.52": + version "2.2.12-alpha.52" + resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.2.12-alpha.52.tgz#37df13f60fbe873537e901f9183205100ddb8d98" + integrity sha512-Y5luiKVvkOtWEnfZ0lrqfNfclSyQrhFJnP9P7BgEBKUcqBguslaAObPZtHfcP1GXiR/I6hoZKXMCCSvHDRXFbg== dependencies: - "@budibase/backend-core" "2.2.12-alpha.51" - "@budibase/types" "2.2.12-alpha.51" + "@budibase/backend-core" "2.2.12-alpha.52" + "@budibase/types" "2.2.12-alpha.52" "@koa/router" "8.0.8" bull "4.10.1" joi "17.6.0" @@ -535,10 +535,10 @@ lru-cache "^7.14.1" node-fetch "^2.6.1" -"@budibase/types@2.2.12-alpha.51": - version "2.2.12-alpha.51" - resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.51.tgz#2595094cb737397091744515e9b0a9141de5cba9" - integrity sha512-mzsPC8BLaUQwayfqLlv+Q2E986Axh429o+x3r2OhkfaoHyioiE3TBtI7hLHoBExGHm1tKycRQojkRnwcuWHbWQ== +"@budibase/types@2.2.12-alpha.52": + version "2.2.12-alpha.52" + resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.2.12-alpha.52.tgz#184c2c74a1705e0fad49ad14608b618db99ecabd" + integrity sha512-yQSxExP1l/kqy1grHB58STHDfs8UBwEozfRRs090kif3a69DfhAzur500EECW8otKahQKL+DUHedG0b/ilAVtw== "@cspotcode/source-map-support@^0.8.0": version "0.8.1" From 194772cb2069e9809b7f178957728909ad970fc1 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Tue, 31 Jan 2023 18:05:53 +0000 Subject: [PATCH 350/387] Update package.json and file addition Updating commands within package.json Re-adding files: - cypress.json - setup.js - setup.ts --- packages/builder/cypress.json | 15 +++++++++++++ packages/builder/setup.js | 42 +++++++++++++++++++++++++++++++++++ packages/builder/ts/setup.ts | 4 ++++ qa-core/package.json | 4 ++-- 4 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 packages/builder/cypress.json create mode 100644 packages/builder/setup.js create mode 100644 packages/builder/ts/setup.ts diff --git a/packages/builder/cypress.json b/packages/builder/cypress.json new file mode 100644 index 0000000000..68117490f4 --- /dev/null +++ b/packages/builder/cypress.json @@ -0,0 +1,15 @@ +{ + "baseUrl": "http://localhost:4100", + "video": true, + "projectId": "bmbemn", + "reporter": "cypress-multi-reporters", + "reporterOptions": { + "configFile": "reporterConfig.json" + }, + "env": { + "PORT": "4100", + "WORKER_PORT": "4200", + "JWT_SECRET": "test", + "HOST_IP": "" + } +} \ No newline at end of file diff --git a/packages/builder/setup.js b/packages/builder/setup.js new file mode 100644 index 0000000000..eaadb64d39 --- /dev/null +++ b/packages/builder/setup.js @@ -0,0 +1,42 @@ +const cypressConfig = require("./cypress.json") + +// normal development system +const SERVER_PORT = cypressConfig.env.PORT +const WORKER_PORT = cypressConfig.env.WORKER_PORT + +if (!process.env.NODE_ENV) { + process.env.NODE_ENV = "cypress" +} +process.env.ENABLE_ANALYTICS = "0" +process.env.JWT_SECRET = cypressConfig.env.JWT_SECRET +process.env.SELF_HOSTED = 1 +process.env.WORKER_URL = `http://localhost:${WORKER_PORT}/` +process.env.APPS_URL = `http://localhost:${SERVER_PORT}/` +process.env.MINIO_URL = `http://localhost:4004` +process.env.MINIO_ACCESS_KEY = "budibase" +process.env.MINIO_SECRET_KEY = "budibase" +process.env.COUCH_DB_USER = "budibase" +process.env.COUCH_DB_PASSWORD = "budibase" +process.env.INTERNAL_API_KEY = "budibase" +process.env.ALLOW_DEV_AUTOMATIONS = 1 + +// Stop info logs polluting test outputs +process.env.LOG_LEVEL = "error" + +exports.run = (serverLoc = "../server/dist", workerLoc = "../worker/dist") => { + // require("dotenv").config({ path: resolve(dir, ".env") }) + // don't make this a variable or top level require + // it will cause environment module to be loaded prematurely + + // override the port with the worker port temporarily + process.env.PORT = WORKER_PORT + require(workerLoc) + + // override the port with the server port + process.env.PORT = SERVER_PORT + require(serverLoc) +} + +if (require.main === module) { + exports.run() +} diff --git a/packages/builder/ts/setup.ts b/packages/builder/ts/setup.ts new file mode 100644 index 0000000000..12965ce7c9 --- /dev/null +++ b/packages/builder/ts/setup.ts @@ -0,0 +1,4 @@ +// @ts-ignore +import { run } from "../setup" + +run("../server/src/index", "../worker/src/index") diff --git a/qa-core/package.json b/qa-core/package.json index bf760c17a3..8508361566 100644 --- a/qa-core/package.json +++ b/qa-core/package.json @@ -14,8 +14,8 @@ "test:debug": "DEBUG=1 jest", "docker:up": "docker-compose up -d", "docker:down": "docker-compose down", - "api:server:setup": "npm run docker:up && env-cmd ts-node ../packages/builder/cypress/ts/setup.ts", - "api:server:setup:ci": "env-cmd node ../packages/builder/cypress/setup.js", + "api:server:setup": "npm run docker:up && env-cmd ts-node ../packages/builder/ts/setup.ts", + "api:server:setup:ci": "env-cmd node ../packages/builder/setup.js", "api:test:ci": "start-server-and-test api:server:setup:ci http://localhost:4100/builder test", "api:test": "start-server-and-test api:server:setup http://localhost:4100/builder test" }, From 746d08cb7044ed9b3cc0bfe4c4c419df8248ef76 Mon Sep 17 00:00:00 2001 From: Mitch-Budibase Date: Tue, 31 Jan 2023 18:26:30 +0000 Subject: [PATCH 351/387] Renaming cypress.json Renamed to testConfig.json. The file was still required when I was running API tests. Also updated setup.js based on file name change --- packages/builder/setup.js | 10 +++++----- packages/builder/{cypress.json => testConfig.json} | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) rename packages/builder/{cypress.json => testConfig.json} (86%) diff --git a/packages/builder/setup.js b/packages/builder/setup.js index eaadb64d39..92391f9b3b 100644 --- a/packages/builder/setup.js +++ b/packages/builder/setup.js @@ -1,14 +1,14 @@ -const cypressConfig = require("./cypress.json") +const testConfig = require("./testConfig.json") // normal development system -const SERVER_PORT = cypressConfig.env.PORT -const WORKER_PORT = cypressConfig.env.WORKER_PORT +const SERVER_PORT = testConfig.env.PORT +const WORKER_PORT = testConfig.env.WORKER_PORT if (!process.env.NODE_ENV) { - process.env.NODE_ENV = "cypress" + process.env.NODE_ENV = "test" } process.env.ENABLE_ANALYTICS = "0" -process.env.JWT_SECRET = cypressConfig.env.JWT_SECRET +process.env.JWT_SECRET = testConfig.env.JWT_SECRET process.env.SELF_HOSTED = 1 process.env.WORKER_URL = `http://localhost:${WORKER_PORT}/` process.env.APPS_URL = `http://localhost:${SERVER_PORT}/` diff --git a/packages/builder/cypress.json b/packages/builder/testConfig.json similarity index 86% rename from packages/builder/cypress.json rename to packages/builder/testConfig.json index 68117490f4..6dc1d8171e 100644 --- a/packages/builder/cypress.json +++ b/packages/builder/testConfig.json @@ -2,7 +2,6 @@ "baseUrl": "http://localhost:4100", "video": true, "projectId": "bmbemn", - "reporter": "cypress-multi-reporters", "reporterOptions": { "configFile": "reporterConfig.json" }, From dd343a594630d36b510ff6c6c46fbc5d016202ed Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Tue, 31 Jan 2023 19:34:32 +0000 Subject: [PATCH 352/387] New App Onboarding (#9489) * New App Onboarding * Lint * Move app creation onboarding into its own route * Fix quiet action button variant * Fix alt attribute background image flashing * Update routing logic and redirects to show app creation onboarding * Navigate to data rather than design upon initial app creation to allow tour to function properly * Tidy up popover logic and remove tip functionality * Fix binding popovers * Lint * Silence spammy warnings from the builder * Exclude SVG files from rollup plugin image to fix spectrum icons * Fix help menu icon colours not working in light themes * Tweak help menu styles --------- Co-authored-by: Andrew Kingston --- .../bbui/src/ActionButton/ActionButton.svelte | 2 +- .../bbui/src/Actions/position_dropdown.js | 18 +- .../bbui/src/Form/Core/EnvDropdown.svelte | 4 - packages/bbui/src/Popover/Popover.svelte | 62 ++--- .../icons/GoogleSheets.svelte | 6 + .../DatasourceNavigator/icons/Oracle.svelte | 2 +- .../modals/CreateTableModal.svelte | 22 +- .../components/common/FontAwesomeIcon.svelte | 18 +- .../src/components/common/HelpMenu.svelte | 8 +- .../common/bindings/BindingPanel.svelte | 2 +- .../components/deploy/DeployNavigation.svelte | 1 - .../src/pages/builder/portal/_layout.svelte | 7 +- .../pages/builder/portal/apps/_layout.svelte | 4 +- .../pages/builder/portal/apps/create.svelte | 82 +++--- .../onboarding/_components/DataPanel.svelte | 13 + .../_components/DatasourceConfigPanel.svelte | 109 ++++++++ .../onboarding/_components/ExampleApp.svelte | 254 ++++++++++++++++++ .../onboarding/_components/NamePanel.svelte | 60 +++++ .../onboarding/_components/PanelHeader.svelte | 49 ++++ .../portal/apps/onboarding/index.svelte | 202 ++++++++++++++ packages/builder/vite.config.js | 15 +- packages/client/rollup.config.js | 5 +- .../src/components/SplitPage.svelte | 4 +- 23 files changed, 830 insertions(+), 119 deletions(-) create mode 100644 packages/builder/src/pages/builder/portal/apps/onboarding/_components/DataPanel.svelte create mode 100644 packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte create mode 100644 packages/builder/src/pages/builder/portal/apps/onboarding/_components/ExampleApp.svelte create mode 100644 packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte create mode 100644 packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte create mode 100644 packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte index cc4417be2a..640f696458 100644 --- a/packages/bbui/src/ActionButton/ActionButton.svelte +++ b/packages/bbui/src/ActionButton/ActionButton.svelte @@ -86,7 +86,7 @@ margin-left: 0; transition: color ease-out 130ms; } - .is-selected:not(.spectrum-ActionButton--emphasized) { + .is-selected:not(.spectrum-ActionButton--emphasized):not(.spectrum-ActionButton--quiet) { background: var(--spectrum-global-color-gray-300); border-color: var(--spectrum-global-color-gray-700); } diff --git a/packages/bbui/src/Actions/position_dropdown.js b/packages/bbui/src/Actions/position_dropdown.js index 09264d5250..1884bbf2d6 100644 --- a/packages/bbui/src/Actions/position_dropdown.js +++ b/packages/bbui/src/Actions/position_dropdown.js @@ -16,10 +16,10 @@ export default function positionDropdown( top: null, } - let popoverLeftPad = 20 - // Determine vertical styles - if (window.innerHeight - anchorBounds.bottom < 100) { + if (align === "right-outside") { + styles.top = anchorBounds.top + } else if (window.innerHeight - anchorBounds.bottom < 100) { styles.top = anchorBounds.top - elementBounds.height - 5 } else { styles.top = anchorBounds.bottom + 5 @@ -34,15 +34,9 @@ export default function positionDropdown( styles.minWidth = anchorBounds.width } if (align === "right") { - let left = - anchorBounds.left + anchorBounds.width / 2 - elementBounds.width - // Accommodate margin on popover: 1.25rem; ~20px - if (left + elementBounds.width + popoverLeftPad > window.innerWidth) { - left -= 20 - } - styles.left = left - } else if (align === "right-side") { - styles.left = anchorBounds.left + anchorBounds.width + styles.left = anchorBounds.left + anchorBounds.width - elementBounds.width + } else if (align === "right-outside") { + styles.left = anchorBounds.right + 10 } else { styles.left = anchorBounds.left } diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte index f40d6556e5..eb2d6baca9 100644 --- a/packages/bbui/src/Form/Core/EnvDropdown.svelte +++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte @@ -247,10 +247,6 @@ width: 100%; } - .no-variables-height { - height: 100px; - } - .no-variables-text { padding: var(--spacing-m); color: var(--spectrum-global-color-gray-600); diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte index 576c4b9338..c32f93ea2a 100644 --- a/packages/bbui/src/Popover/Popover.svelte +++ b/packages/bbui/src/Popover/Popover.svelte @@ -15,15 +15,10 @@ export let portalTarget export let dataCy export let maxWidth - export let direction = "bottom" - export let showTip = false export let open = false export let useAnchorWidth = false export let dismissible = true - $: tooltipClasses = showTip - ? `spectrum-Popover--withTip spectrum-Popover--${direction}` - : "" $: target = portalTarget || getContext(Context.PopoverRoot) || ".spectrum" export const show = () => { @@ -62,29 +57,31 @@ {#if open} - -
{}, - anchor, - }} - on:keydown={handleEscape} - class={"spectrum-Popover is-open " + (tooltipClasses || "")} - role="presentation" - data-cy={dataCy} - transition:fly|local={{ y: -20, duration: 200 }} - > - -
- + {#key anchor} + +
{}, + anchor, + }} + on:keydown={handleEscape} + class="spectrum-Popover is-open" + role="presentation" + data-cy={dataCy} + transition:fly|local={{ y: -20, duration: 200 }} + > + +
+ + {/key} {/if} diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/GoogleSheets.svelte b/packages/builder/src/components/backend/DatasourceNavigator/icons/GoogleSheets.svelte index 0d376e4400..d38c92d27d 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/icons/GoogleSheets.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/GoogleSheets.svelte @@ -182,3 +182,9 @@ + + diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/Oracle.svelte b/packages/builder/src/components/backend/DatasourceNavigator/icons/Oracle.svelte index c939a59d90..2767e904a0 100644 --- a/packages/builder/src/components/backend/DatasourceNavigator/icons/Oracle.svelte +++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/Oracle.svelte @@ -11,6 +11,6 @@ diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte index 175705732f..7808134fb4 100644 --- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte +++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte @@ -29,6 +29,18 @@ : BUDIBASE_INTERNAL_DB_ID export let name + export let beforeSave = async () => {} + export let afterSave = async table => { + notifications.success(`Table ${name} created successfully.`) + + // Navigate to new table + const currentUrl = $url() + const path = currentUrl.endsWith("data") + ? `./table/${table._id}` + : `../../table/${table._id}` + $goto(path) + } + let error = "" let autoColumns = getAutoColumnInformation() let schema = {} @@ -78,15 +90,9 @@ // Create table let table try { + await beforeSave() table = await tables.save(newTable) - notifications.success(`Table ${name} created successfully.`) - - // Navigate to new table - const currentUrl = $url() - const path = currentUrl.endsWith("data") - ? `./table/${table._id}` - : `../../table/${table._id}` - $goto(path) + await afterSave(table) } catch (e) { notifications.error(e) // reload in case the table was created diff --git a/packages/builder/src/components/common/FontAwesomeIcon.svelte b/packages/builder/src/components/common/FontAwesomeIcon.svelte index 7929f6d9ad..84c16abeda 100644 --- a/packages/builder/src/components/common/FontAwesomeIcon.svelte +++ b/packages/builder/src/components/common/FontAwesomeIcon.svelte @@ -6,10 +6,22 @@ faBook, faPlay, faLock, + faFileArrowUp, + faChevronLeft, } from "@fortawesome/free-solid-svg-icons" import { faGithub, faDiscord } from "@fortawesome/free-brands-svg-icons" - library.add(faXmark, faBook, faPlay, faLock, faGithub, faDiscord, faEnvelope) + library.add( + faXmark, + faBook, + faPlay, + faLock, + faGithub, + faDiscord, + faEnvelope, + faFileArrowUp, + faChevronLeft + ) dom.watch() @@ -24,8 +36,6 @@ diff --git a/packages/builder/src/components/common/HelpMenu.svelte b/packages/builder/src/components/common/HelpMenu.svelte index c06efecdfa..75c53f0ca5 100644 --- a/packages/builder/src/components/common/HelpMenu.svelte +++ b/packages/builder/src/components/common/HelpMenu.svelte @@ -143,11 +143,11 @@ display: flex; padding: 12px; align-items: center; - transition: filter 0.5s; + transition: filter 0.5s, background 0.13s ease-out; } a:hover { - background-color: var(--spectrum-global-color-gray-300); + background-color: var(--spectrum-global-color-gray-200); } a:last-child { @@ -168,14 +168,14 @@ } .disabled { - opacity: 70%; + opacity: 60%; } .premiumBadge { align-items: center; margin-left: auto; display: flex; - border: var(--border-light); + border: 1px solid var(--spectrum-global-color-gray-400); border-radius: 4px; padding: 4px 7px 5px 8px; } diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index d995bd507b..7daf2173a7 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -179,7 +179,7 @@ diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte index 71aec61465..1f95c2f694 100644 --- a/packages/builder/src/pages/builder/portal/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/_layout.svelte @@ -1,7 +1,7 @@ -{#if $auth.user && loaded} +{#if fullScreen} + +{:else if $auth.user && loaded}
diff --git a/packages/builder/src/pages/builder/portal/apps/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/_layout.svelte index fe10d4b08a..b91f5f0c5a 100644 --- a/packages/builder/src/pages/builder/portal/apps/_layout.svelte +++ b/packages/builder/src/pages/builder/portal/apps/_layout.svelte @@ -2,7 +2,7 @@ import { notifications } from "@budibase/bbui" import { apps, templates, licensing, groups } from "stores/portal" import { onMount } from "svelte" - import { goto } from "@roxi/routify" + import { redirect } from "@roxi/routify" // Don't block loading if we've already hydrated state let loaded = $apps.length > 0 @@ -24,7 +24,7 @@ // Go to new app page if no apps exists if (!$apps.length) { - $goto("./create") + $redirect("./onboarding") } } catch (error) { notifications.error("Error loading apps and templates") diff --git a/packages/builder/src/pages/builder/portal/apps/create.svelte b/packages/builder/src/pages/builder/portal/apps/create.svelte index 72ed203880..1f273360ab 100644 --- a/packages/builder/src/pages/builder/portal/apps/create.svelte +++ b/packages/builder/src/pages/builder/portal/apps/create.svelte @@ -1,5 +1,6 @@ - - - - - - -
-
- - -
-
- - - - - - - - +{#if !$apps.length} + +{:else} + + + + + + +
+
+ + +
+
+ + + + + + + +{/if} diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DataPanel.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DataPanel.svelte new file mode 100644 index 0000000000..9a7fffd893 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DataPanel.svelte @@ -0,0 +1,13 @@ + + +
+ + +
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte new file mode 100644 index 0000000000..a5f0fc138d --- /dev/null +++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/DatasourceConfigPanel.svelte @@ -0,0 +1,109 @@ + + +
+ +
+ + {#each Object.entries(fields) as [name, { type, default: defaultValue, required }]} + {#if type !== "boolean"} + {}} + label={formatName(name)} + {type} + /> + {/if} + {/each} + {#each Object.entries(fields) as [name, { type, default: defaultValue, required }]} + {#if type === "boolean"} + + {/if} + {/each} + +
+ +
+ + diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/ExampleApp.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/ExampleApp.svelte new file mode 100644 index 0000000000..3e970ac360 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/ExampleApp.svelte @@ -0,0 +1,254 @@ + + +
+
+
+ Budibase Logo +

{name}

+
+
Home
+ + + + + + + + + + + + + + {#each rows as row} + + {#each Object.values(row) as value} + + {/each} + + {/each} + +
FIRST NAMELAST NAMEEMAILADDRESSCITYPOSTCODEPHONE
{value}
+
+

{rows[0].firstName}

+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
+
+ + diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte new file mode 100644 index 0000000000..740cfda8f2 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte @@ -0,0 +1,60 @@ + + +
+ + + + + + {#if url} +

{window.location.origin}/app/{url}

+ {:else} +

‎

+ {/if} + +
+ + diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte new file mode 100644 index 0000000000..34d612dc9e --- /dev/null +++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte @@ -0,0 +1,49 @@ + + +
+ +
+ {#if onBack} + + {/if} + {title} +
+ {subtitle} +
+ + diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte new file mode 100644 index 0000000000..6df756f119 --- /dev/null +++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte @@ -0,0 +1,202 @@ + + + + goToApp(appId)} + /> + + + + {#if stage === "name"} + (stage = "data")} /> + {:else if integrationsLoading} +

loading...

+ {:else if stage === "data"} + (stage = "name")}> +
+ handleCreateApp({ useSampleData: true })}> +
+
+ +
+ Budibase Sample data +
+ +
+
+ +
+
+ +
+ Upload file +
+ +
+ {#each Object.entries(plusIntegrations) as [integrationType, schema]} +
+ (stage = integrationType)}> +
+
+ +
+ {schema.friendlyName} +
+ +
+ {/each} + + {:else if stage in plusIntegrations} + (stage = "data")} + onNext={data => handleCreateApp({ datasourceConfig: data })} + /> + {:else} +

There was an problem. Please refresh the page and try again.

+ {/if} +
+ +
+ + + diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js index 95e2908995..c02f13e193 100644 --- a/packages/builder/vite.config.js +++ b/packages/builder/vite.config.js @@ -1,9 +1,16 @@ import { svelte } from "@sveltejs/vite-plugin-svelte" import replace from "@rollup/plugin-replace" import { defineConfig, loadEnv } from "vite" - import path from "path" +const ignoredWarnings = [ + "unused-export-let", + "css-unused-selector", + "module-script-reactive-declaration", + "a11y-no-onchange", + "a11y-click-events-have-key-events", +] + export default defineConfig(({ mode }) => { const isProduction = mode === "production" const env = loadEnv(mode, process.cwd()) @@ -29,6 +36,12 @@ export default defineConfig(({ mode }) => { svelte({ hot: !isProduction, emitCss: true, + onwarn: (warning, handler) => { + // Ignore some warnings + if (!ignoredWarnings.includes(warning.code)) { + handler(warning) + } + }, }), replace({ preventAssignment: true, diff --git a/packages/client/rollup.config.js b/packages/client/rollup.config.js index a69de38799..f56714b51a 100644 --- a/packages/client/rollup.config.js +++ b/packages/client/rollup.config.js @@ -17,6 +17,7 @@ const ignoredWarnings = [ "css-unused-selector", "module-script-reactive-declaration", "a11y-no-onchange", + "a11y-click-events-have-key-events", ] export default { @@ -88,7 +89,9 @@ export default { dedupe: ["svelte", "svelte/internal"], }), svg(), - image(), + image({ + exclude: "**/*.svg", + }), json(), production && terser(), !production && visualizer(), diff --git a/packages/frontend-core/src/components/SplitPage.svelte b/packages/frontend-core/src/components/SplitPage.svelte index 08ec519715..79886845de 100644 --- a/packages/frontend-core/src/components/SplitPage.svelte +++ b/packages/frontend-core/src/components/SplitPage.svelte @@ -9,7 +9,8 @@
- background + +
@@ -30,6 +31,7 @@ overflow-y: auto; } .right { + overflow: hidden; position: relative; } .right img { From 1909407ab1cf6da7f1ad829e976a26c5a3a8f690 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Tue, 31 Jan 2023 19:45:03 +0000 Subject: [PATCH 353/387] v2.2.12-alpha.53 --- lerna.json | 2 +- packages/backend-core/package.json | 4 ++-- packages/bbui/package.json | 4 ++-- packages/builder/package.json | 10 +++++----- packages/cli/package.json | 8 ++++---- packages/client/package.json | 8 ++++---- packages/frontend-core/package.json | 4 ++-- packages/sdk/package.json | 2 +- packages/server/package.json | 10 +++++----- packages/string-templates/package.json | 2 +- packages/types/package.json | 2 +- packages/worker/package.json | 8 ++++---- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 88005cc266..6f2cf29a7f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.2.12-alpha.52", + "version": "2.2.12-alpha.53", "npmClient": "yarn", "packages": [ "packages/*" diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json index 1d2328c530..c0c9bcdd52 100644 --- a/packages/backend-core/package.json +++ b/packages/backend-core/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/backend-core", - "version": "2.2.12-alpha.52", + "version": "2.2.12-alpha.53", "description": "Budibase backend core libraries used in server and worker", "main": "dist/src/index.js", "types": "dist/src/index.d.ts", @@ -23,7 +23,7 @@ }, "dependencies": { "@budibase/nano": "10.1.1", - "@budibase/types": "2.2.12-alpha.52", + "@budibase/types": "2.2.12-alpha.53", "@shopify/jest-koa-mocks": "5.0.1", "@techpass/passport-openidconnect": "0.3.2", "aws-cloudfront-sign": "2.2.0", diff --git a/packages/bbui/package.json b/packages/bbui/package.json index 7392a22185..16bf4ee6a3 100644 --- a/packages/bbui/package.json +++ b/packages/bbui/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/bbui", "description": "A UI solution used in the different Budibase projects.", - "version": "2.2.12-alpha.52", + "version": "2.2.12-alpha.53", "license": "MPL-2.0", "svelte": "src/index.js", "module": "dist/bbui.es.js", @@ -38,7 +38,7 @@ ], "dependencies": { "@adobe/spectrum-css-workflow-icons": "1.2.1", - "@budibase/string-templates": "2.2.12-alpha.52", + "@budibase/string-templates": "2.2.12-alpha.53", "@spectrum-css/accordion": "3.0.24", "@spectrum-css/actionbutton": "1.0.1", "@spectrum-css/actiongroup": "1.0.1", diff --git a/packages/builder/package.json b/packages/builder/package.json index 142fcee4b3..0e85314ad5 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/builder", - "version": "2.2.12-alpha.52", + "version": "2.2.12-alpha.53", "license": "GPL-3.0", "private": true, "scripts": { @@ -71,10 +71,10 @@ } }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.52", - "@budibase/client": "2.2.12-alpha.52", - "@budibase/frontend-core": "2.2.12-alpha.52", - "@budibase/string-templates": "2.2.12-alpha.52", + "@budibase/bbui": "2.2.12-alpha.53", + "@budibase/client": "2.2.12-alpha.53", + "@budibase/frontend-core": "2.2.12-alpha.53", + "@budibase/string-templates": "2.2.12-alpha.53", "@fortawesome/fontawesome-svg-core": "^6.2.1", "@fortawesome/free-brands-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index ac24542ed0..0a7df43473 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/cli", - "version": "2.2.12-alpha.52", + "version": "2.2.12-alpha.53", "description": "Budibase CLI, for developers, self hosting and migrations.", "main": "src/index.js", "bin": { @@ -26,9 +26,9 @@ "outputPath": "build" }, "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.52", - "@budibase/string-templates": "2.2.12-alpha.52", - "@budibase/types": "2.2.12-alpha.52", + "@budibase/backend-core": "2.2.12-alpha.53", + "@budibase/string-templates": "2.2.12-alpha.53", + "@budibase/types": "2.2.12-alpha.53", "axios": "0.21.2", "chalk": "4.1.0", "cli-progress": "3.11.2", diff --git a/packages/client/package.json b/packages/client/package.json index 0265f23608..4dffbef085 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/client", - "version": "2.2.12-alpha.52", + "version": "2.2.12-alpha.53", "license": "MPL-2.0", "module": "dist/budibase-client.js", "main": "dist/budibase-client.js", @@ -19,9 +19,9 @@ "dev:builder": "rollup -cw" }, "dependencies": { - "@budibase/bbui": "2.2.12-alpha.52", - "@budibase/frontend-core": "2.2.12-alpha.52", - "@budibase/string-templates": "2.2.12-alpha.52", + "@budibase/bbui": "2.2.12-alpha.53", + "@budibase/frontend-core": "2.2.12-alpha.53", + "@budibase/string-templates": "2.2.12-alpha.53", "@spectrum-css/button": "^3.0.3", "@spectrum-css/card": "^3.0.3", "@spectrum-css/divider": "^1.0.3", diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json index 0f5327e5f3..c8523c3a7c 100644 --- a/packages/frontend-core/package.json +++ b/packages/frontend-core/package.json @@ -1,12 +1,12 @@ { "name": "@budibase/frontend-core", - "version": "2.2.12-alpha.52", + "version": "2.2.12-alpha.53", "description": "Budibase frontend core libraries used in builder and client", "author": "Budibase", "license": "MPL-2.0", "svelte": "src/index.js", "dependencies": { - "@budibase/bbui": "2.2.12-alpha.52", + "@budibase/bbui": "2.2.12-alpha.53", "lodash": "^4.17.21", "svelte": "^3.46.2" } diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 52ac20c70a..363e56d8af 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/sdk", - "version": "2.2.12-alpha.52", + "version": "2.2.12-alpha.53", "description": "Budibase Public API SDK", "author": "Budibase", "license": "MPL-2.0", diff --git a/packages/server/package.json b/packages/server/package.json index 9d0bc27b0c..8ba86d5f7a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/server", "email": "hi@budibase.com", - "version": "2.2.12-alpha.52", + "version": "2.2.12-alpha.53", "description": "Budibase Web Server", "main": "src/index.ts", "repository": { @@ -43,11 +43,11 @@ "license": "GPL-3.0", "dependencies": { "@apidevtools/swagger-parser": "10.0.3", - "@budibase/backend-core": "2.2.12-alpha.52", - "@budibase/client": "2.2.12-alpha.52", + "@budibase/backend-core": "2.2.12-alpha.53", + "@budibase/client": "2.2.12-alpha.53", "@budibase/pro": "2.2.12-alpha.52", - "@budibase/string-templates": "2.2.12-alpha.52", - "@budibase/types": "2.2.12-alpha.52", + "@budibase/string-templates": "2.2.12-alpha.53", + "@budibase/types": "2.2.12-alpha.53", "@bull-board/api": "3.7.0", "@bull-board/koa": "3.9.4", "@elastic/elasticsearch": "7.10.0", diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json index 44bfa48ebf..35eab64384 100644 --- a/packages/string-templates/package.json +++ b/packages/string-templates/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/string-templates", - "version": "2.2.12-alpha.52", + "version": "2.2.12-alpha.53", "description": "Handlebars wrapper for Budibase templating.", "main": "src/index.cjs", "module": "dist/bundle.mjs", diff --git a/packages/types/package.json b/packages/types/package.json index ce7ad9c492..4c0801b5a7 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@budibase/types", - "version": "2.2.12-alpha.52", + "version": "2.2.12-alpha.53", "description": "Budibase types", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/packages/worker/package.json b/packages/worker/package.json index 93b526b6a1..f29af7d8bb 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -1,7 +1,7 @@ { "name": "@budibase/worker", "email": "hi@budibase.com", - "version": "2.2.12-alpha.52", + "version": "2.2.12-alpha.53", "description": "Budibase background service", "main": "src/index.ts", "repository": { @@ -36,10 +36,10 @@ "author": "Budibase", "license": "GPL-3.0", "dependencies": { - "@budibase/backend-core": "2.2.12-alpha.52", + "@budibase/backend-core": "2.2.12-alpha.53", "@budibase/pro": "2.2.12-alpha.52", - "@budibase/string-templates": "2.2.12-alpha.52", - "@budibase/types": "2.2.12-alpha.52", + "@budibase/string-templates": "2.2.12-alpha.53", + "@budibase/types": "2.2.12-alpha.53", "@koa/router": "8.0.8", "@sentry/node": "6.17.7", "@techpass/passport-openidconnect": "0.3.2", From f4379fcb4f2f516f1d208a2cafce508bc9ce52a5 Mon Sep 17 00:00:00 2001 From: mike12345567 Date: Tue, 31 Jan 2023 19:49:31 +0000 Subject: [PATCH 354/387] Updates to use our new Nano layer for CouchDB integration rather than PouchDB. --- .../backend-core/src/db/couch/DatabaseImpl.ts | 47 +- .../backend-core/src/db/couch/connections.ts | 4 +- packages/builder/yarn.lock | 1007 +---------------- packages/server/src/integrations/couchdb.ts | 58 +- .../src/integrations/tests/couchdb.spec.ts | 46 +- 5 files changed, 124 insertions(+), 1038 deletions(-) diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts index 9b4761d961..2dbb061863 100644 --- a/packages/backend-core/src/db/couch/DatabaseImpl.ts +++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts @@ -15,18 +15,36 @@ import { getCouchInfo } from "./connections" import { directCouchCall } from "./utils" import { getPouchDB } from "./pouchDB" import { WriteStream, ReadStream } from "fs" +import { newid } from "../../newid" + +function buildNano(couchInfo: { url: string; cookie: string }) { + return Nano({ + url: couchInfo.url, + requestDefaults: { + headers: { + Authorization: couchInfo.cookie, + }, + }, + parseUrl: false, + }) +} export class DatabaseImpl implements Database { public readonly name: string private static nano: Nano.ServerScope + private readonly instanceNano?: Nano.ServerScope private readonly pouchOpts: DatabaseOpts - constructor(dbName?: string, opts?: DatabaseOpts) { + constructor(dbName?: string, opts?: DatabaseOpts, connection?: string) { if (dbName == null) { throw new Error("Database name cannot be undefined.") } this.name = dbName this.pouchOpts = opts || {} + if (connection) { + const couchInfo = getCouchInfo(connection) + this.instanceNano = buildNano(couchInfo) + } if (!DatabaseImpl.nano) { DatabaseImpl.init() } @@ -34,15 +52,7 @@ export class DatabaseImpl implements Database { static init() { const couchInfo = getCouchInfo() - DatabaseImpl.nano = Nano({ - url: couchInfo.url, - requestDefaults: { - headers: { - Authorization: couchInfo.cookie, - }, - }, - parseUrl: false, - }) + DatabaseImpl.nano = buildNano(couchInfo) } async exists() { @@ -50,6 +60,10 @@ export class DatabaseImpl implements Database { return response.status === 200 } + private nano() { + return this.instanceNano || DatabaseImpl.nano + } + async checkSetup() { let shouldCreate = !this.pouchOpts?.skip_setup // check exists in a lightweight fashion @@ -58,9 +72,9 @@ export class DatabaseImpl implements Database { throw new Error("DB does not exist") } if (!exists) { - await DatabaseImpl.nano.db.create(this.name) + await this.nano().db.create(this.name) } - return DatabaseImpl.nano.db.use(this.name) + return this.nano().db.use(this.name) } private async updateOutput(fnc: any) { @@ -101,6 +115,13 @@ export class DatabaseImpl implements Database { return this.updateOutput(() => db.destroy(_id, _rev)) } + async post(document: AnyDocument, opts?: DatabasePutOpts) { + if (!document._id) { + document._id = newid() + } + return this.put(document, opts) + } + async put(document: AnyDocument, opts?: DatabasePutOpts) { if (!document._id) { throw new Error("Cannot store document without _id field.") @@ -146,7 +167,7 @@ export class DatabaseImpl implements Database { async destroy() { try { - await DatabaseImpl.nano.db.destroy(this.name) + await this.nano().db.destroy(this.name) } catch (err: any) { // didn't exist, don't worry if (err.statusCode === 404) { diff --git a/packages/backend-core/src/db/couch/connections.ts b/packages/backend-core/src/db/couch/connections.ts index a2206de634..06c661f350 100644 --- a/packages/backend-core/src/db/couch/connections.ts +++ b/packages/backend-core/src/db/couch/connections.ts @@ -1,7 +1,7 @@ import env from "../../environment" -export const getCouchInfo = () => { - const urlInfo = getUrlInfo() +export const getCouchInfo = (connection?: string) => { + const urlInfo = getUrlInfo(connection) let username let password if (env.COUCH_DB_USERNAME) { diff --git a/packages/builder/yarn.lock b/packages/builder/yarn.lock index cc6d28b11f..20fc29b0e3 100644 --- a/packages/builder/yarn.lock +++ b/packages/builder/yarn.lock @@ -7,11 +7,6 @@ resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.1.0.tgz#417fef4a143f4396ad0b3b4351fee21323f15aa8" integrity sha512-mMVJ/j/GbZ/De4ZHWbQAQO1J6iVnjtZLc9WEdkUQb8S/Bu2cAF2bETXUgMAdvMG3/ngtKmcNBe+Zms9bg6jnQQ== -"@adobe/spectrum-css-workflow-icons@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4" - integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w== - "@ampproject/remapping@^2.1.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" @@ -945,137 +940,6 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@budibase/bbui@2.2.12-alpha.51": - version "2.2.12-alpha.51" - resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-2.2.12-alpha.51.tgz#c346501eeb4daba522794a6fd6063b387100454b" - integrity sha512-Eajnvt/kMl7kN/UhBB22DkHwItglk4PYwAxaaNa2OIUyl9NYYkDKDCvjCm+NeIgTZNmk+1FXsGN6FFcufbn+Og== - dependencies: - "@adobe/spectrum-css-workflow-icons" "1.2.1" - "@budibase/string-templates" "2.2.12-alpha.51" - "@spectrum-css/accordion" "3.0.24" - "@spectrum-css/actionbutton" "1.0.1" - "@spectrum-css/actiongroup" "1.0.1" - "@spectrum-css/avatar" "3.0.2" - "@spectrum-css/button" "3.0.1" - "@spectrum-css/buttongroup" "3.0.2" - "@spectrum-css/checkbox" "3.0.2" - "@spectrum-css/dialog" "3.0.1" - "@spectrum-css/divider" "1.0.3" - "@spectrum-css/dropzone" "3.0.2" - "@spectrum-css/fieldgroup" "3.0.2" - "@spectrum-css/fieldlabel" "3.0.1" - "@spectrum-css/icon" "3.0.1" - "@spectrum-css/illustratedmessage" "3.0.2" - "@spectrum-css/inlinealert" "2.0.1" - "@spectrum-css/inputgroup" "3.0.2" - "@spectrum-css/label" "2.0.10" - "@spectrum-css/link" "3.1.1" - "@spectrum-css/menu" "3.0.1" - "@spectrum-css/modal" "3.0.1" - "@spectrum-css/pagination" "3.0.3" - "@spectrum-css/picker" "1.0.1" - "@spectrum-css/popover" "3.0.1" - "@spectrum-css/progressbar" "1.0.2" - "@spectrum-css/progresscircle" "1.0.2" - "@spectrum-css/radio" "3.0.2" - "@spectrum-css/search" "3.0.2" - "@spectrum-css/sidenav" "3.0.2" - "@spectrum-css/slider" "3.0.1" - "@spectrum-css/statuslight" "3.0.2" - "@spectrum-css/stepper" "3.0.3" - "@spectrum-css/switch" "1.0.2" - "@spectrum-css/table" "3.0.1" - "@spectrum-css/tabs" "3.2.12" - "@spectrum-css/tags" "3.0.2" - "@spectrum-css/textfield" "3.0.1" - "@spectrum-css/toast" "3.0.1" - "@spectrum-css/tooltip" "3.0.3" - "@spectrum-css/treeview" "3.0.2" - "@spectrum-css/typography" "3.0.1" - "@spectrum-css/underlay" "2.0.9" - "@spectrum-css/vars" "3.0.1" - dayjs "^1.10.4" - easymde "^2.16.1" - svelte-flatpickr "^3.2.3" - svelte-portal "^1.0.0" - -"@budibase/client@2.2.12-alpha.51": - version "2.2.12-alpha.51" - resolved "https://registry.yarnpkg.com/@budibase/client/-/client-2.2.12-alpha.51.tgz#3177ceee2bc37c27c49ba2afc1de3d9274cfbe42" - integrity sha512-WlPWYtUtYMfP6RI9F+FazRP06Y1Ay6pZA3/4Kxy+Gw4B78Qvf9OEj14DO++4raZP507d94TyGbewxq/EfTfEng== - dependencies: - "@budibase/bbui" "2.2.12-alpha.51" - "@budibase/frontend-core" "2.2.12-alpha.51" - "@budibase/string-templates" "2.2.12-alpha.51" - "@spectrum-css/button" "^3.0.3" - "@spectrum-css/card" "^3.0.3" - "@spectrum-css/divider" "^1.0.3" - "@spectrum-css/link" "^3.1.3" - "@spectrum-css/page" "^3.0.1" - "@spectrum-css/tag" "^3.1.4" - "@spectrum-css/typography" "^3.0.2" - "@spectrum-css/vars" "^3.0.1" - apexcharts "^3.22.1" - dayjs "^1.10.5" - downloadjs "1.4.7" - html5-qrcode "^2.2.1" - leaflet "^1.7.1" - regexparam "^1.3.0" - sanitize-html "^2.7.0" - screenfull "^6.0.1" - shortid "^2.2.15" - socket.io-client "^4.5.1" - svelte "^3.49.0" - svelte-apexcharts "^1.0.2" - svelte-flatpickr "^3.1.0" - svelte-spa-router "^3.0.5" - -"@budibase/frontend-core@2.2.12-alpha.51": - version "2.2.12-alpha.51" - resolved "https://registry.yarnpkg.com/@budibase/frontend-core/-/frontend-core-2.2.12-alpha.51.tgz#029b84a5427113b36d8d72861cf6b7e43cde09b3" - integrity sha512-iO4dIxKbfcQIsHkaSYmvsPi5btOXEgu3+Gb1RRMJ6x/H3Mn17tHUXG1q+zkRLszXurR/h1Z/YzF60wUYxJzm7A== - dependencies: - "@budibase/bbui" "2.2.12-alpha.51" - lodash "^4.17.21" - svelte "^3.46.2" - -"@budibase/handlebars-helpers@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.11.8.tgz#6953d29673a8c5c407e096c0a84890465c7ce841" - integrity sha512-ggWJUt0GqsHFAEup5tlWlcrmYML57nKhpNGGLzVsqXVYN8eVmf3xluYmmMe7fDYhQH0leSprrdEXmsdFQF3HAQ== - dependencies: - array-sort "^1.0.0" - define-property "^2.0.2" - extend-shallow "^3.0.2" - for-in "^1.0.2" - get-object "^0.2.0" - get-value "^3.0.1" - handlebars "^4.7.7" - handlebars-utils "^1.0.6" - has-value "^2.0.2" - helper-md "^0.2.2" - html-tag "^2.0.0" - is-even "^1.0.0" - is-glob "^4.0.1" - kind-of "^6.0.3" - micromatch "^3.1.5" - relative "^3.0.2" - striptags "^3.1.1" - to-gfm-code-block "^0.1.1" - year "^0.2.1" - -"@budibase/string-templates@2.2.12-alpha.51": - version "2.2.12-alpha.51" - resolved "https://registry.yarnpkg.com/@budibase/string-templates/-/string-templates-2.2.12-alpha.51.tgz#13fd7ac4bfe628b517541974aa560d75129a7d31" - integrity sha512-fgJJopKfc/VHCYLE7KRda6bJzrHyn0wBJfo3DImogPE2cfAxdXTMpMj2IX4dza8mePJC6WjtJbtc2NLZtg7u2w== - dependencies: - "@budibase/handlebars-helpers" "^0.11.8" - dayjs "^1.10.4" - handlebars "^4.7.6" - handlebars-utils "^1.0.6" - lodash "^4.17.20" - vm2 "^3.9.4" - "@cnakazawa/watch@^1.0.3": version "1.0.4" resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a" @@ -1603,140 +1467,11 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@socket.io/component-emitter@~3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" - integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== - -"@spectrum-css/accordion@3.0.24": - version "3.0.24" - resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.24.tgz#f89066c120c57b0cfc9aba66d60c39fc1cf69f74" - integrity sha512-jNOmUsxmiT3lRLButnN5KKHM94fd+87fjiF8L0c4uRNgJl6ZsBuxPXrM15lV4y1f8D2IACAw01/ZkGRAeaCOFA== - "@spectrum-css/accordion@^3.0.24": version "3.0.30" resolved "https://registry.yarnpkg.com/@spectrum-css/accordion/-/accordion-3.0.30.tgz#0893a6db28bab984bf5adaf7e1ba194e741db615" integrity sha512-J9zw5blM72pl+mtticqJKwLHaQYBwtrfwDXwQuz3lOTUcedzxQ0Pk2lZ1P46+98hdJzxTXZ5RjIyXre3TPEq1w== -"@spectrum-css/actionbutton@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/actionbutton/-/actionbutton-1.0.1.tgz#9c75da37ea6915919fb574c74bd60dacc03b6577" - integrity sha512-AUqtyNabHF451Aj9i3xz82TxS5Z6k1dttA68/1hMeU9kbPCSS4P6Viw3vaRGs9CSspuR8xnnhDgrq+F+zMy2Hw== - -"@spectrum-css/actiongroup@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/actiongroup/-/actiongroup-1.0.1.tgz#b95b86e7af229e90fe1e70399d8d4b547b4bd31c" - integrity sha512-5Q6uMjzv5BFA2TwGASr/jAtJpTWl26fhWvgGY8kOA0RCSij35l+YJg/FPXf6Nnj2qCOl8DkNycjT9YXJ+bhyVA== - -"@spectrum-css/avatar@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/avatar/-/avatar-3.0.2.tgz#4f1826223eae330e64b6d3cc899e9bc2e98dac95" - integrity sha512-wEczvSqxttTWSiL3cOvXV/RmGRwSkw2w6+slcHhnf0kb7ovymMM+9oz8vvEpEsSeo5u598bc+7ktrKFpAd6soQ== - -"@spectrum-css/button@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.1.tgz#6db8c3e851baecd0f1c2d88fef37d49d01c6e643" - integrity sha512-YXrBtjIYisk4Vaxnp0RiE4gdElQX04P2mc4Pi2GlQ27dJKlHmufYcF+kAqGdtiyK5yjdN/vKRcC8y13aA4rusA== - -"@spectrum-css/button@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/button/-/button-3.0.3.tgz#2df1efaab6c7e0b3b06cb4b59e1eae59c7f1fc84" - integrity sha512-6CnLPqqtaU/PcSSIGeGRi0iFIIxIUByYLKFO6zn5NEUc12KQ28dJ4PLwB6WBa0L8vRoAGlnWWH2ZZweTijbXgg== - -"@spectrum-css/buttongroup@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/buttongroup/-/buttongroup-3.0.2.tgz#fd3387973ca3131609e32112de42a1c0400a48d8" - integrity sha512-Wu7B4GJ/SAeVHz9SUGAkeIH8pLaZh4t+w2ykSKOPQIRuK2jCBoudkEClVxviNVwqekccf5XLFXg9GpYF1a3Uaw== - -"@spectrum-css/card@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/card/-/card-3.0.3.tgz#56b2e2da6b80c1583228baa279de7407383bfb6b" - integrity sha512-+oKLUI2a0QmQP9EzySeq/G4FpUkkdaDNbuEbqCj2IkPMc/2v/nwzsPhh1fj2UIghGAiiUwXfPpzax1e8fyhQUg== - -"@spectrum-css/checkbox@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/checkbox/-/checkbox-3.0.2.tgz#53ca2fba0d9faa1fead10e7206eb1f6cdcfd6ddd" - integrity sha512-hPbGcnm7kJvJS4jp/P/bdaZvbyR1eIE9mteuZqcBgdmyp9m/k6+mW5jmsbtqb3Y4mMPWvOJFfz/sIvWJP0F0Zg== - -"@spectrum-css/dialog@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/dialog/-/dialog-3.0.1.tgz#33aae036282159f6aa998848b8c0828640a9620a" - integrity sha512-hUFbRR6RGT63MNuP7wP+k9KU+uRuICsduMihskh700e+jiQ+Gsv53fBFDlB843FoZYlIXzFQXgtjMUC5a4Qibw== - -"@spectrum-css/divider@1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.3.tgz#639e2ebaa0834efa40f42397668bbd5c153ea385" - integrity sha512-Zy4Rn40w8UtzMh3wx/U9+CepSCpm1aOCGftHgWDub0XZuVTzh0c1WwyzTuLCx2Hf21z5VRGNiDh8bGEEzSbtNA== - dependencies: - "@spectrum-css/vars" "^3.0.2" - -"@spectrum-css/divider@^1.0.3": - version "1.0.27" - resolved "https://registry.yarnpkg.com/@spectrum-css/divider/-/divider-1.0.27.tgz#435bf738a65b4eb15c899edf5c536bea22f2d679" - integrity sha512-hWKPHOEo9lkOGN5zecpVVwVxE3x0SJHQJKDNx1g0xs/P/AthAboK+L1c9Rq29czNfcQ2kUjumi4igzQzcqABMQ== - dependencies: - "@spectrum-css/vars" "^8.0.0" - -"@spectrum-css/dropzone@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/dropzone/-/dropzone-3.0.2.tgz#34f137851054442b219fed7f32006b93fc5e0bcf" - integrity sha512-BuBBzm5re6lM0AWgd6V+mI5eEGnnmFEtcFiJBEn9jYNEQYgflFhvnERUt89jMX5WmspiecwI2JBWJFrtFsOzug== - -"@spectrum-css/fieldgroup@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/fieldgroup/-/fieldgroup-3.0.2.tgz#1c1afd3c444d8650fefac275dc66a7a913933846" - integrity sha512-Vyw0kQJdLW18J6w4H+YAsoLntvkw5rXmW3CH5H3SDTXkBztxtHSSe3e106Nw5MoZxTfHlom6CxbYXYCTjQfqGw== - -"@spectrum-css/fieldlabel@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/fieldlabel/-/fieldlabel-3.0.1.tgz#39f7c0f25cc2ff402afeff005341b0832f7c588c" - integrity sha512-LMfwrwIq8wEEvxFLobdLvXRwKrp8o9Fty4iJ9aYl2Rj1uXkfRd8qLz9HGZjLEE1OuJgoTBgamYABl7EvoA5PLw== - -"@spectrum-css/icon@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/icon/-/icon-3.0.1.tgz#e300a6fc353c85c6b5d6e7a364408a940c31b177" - integrity sha512-cGFtIrcQ/7tthdkHK1npuEFiCdYVHLqwmLxghUYQw8Tb8KgJaw3OBO1tpjgsUizexNgu26BjVRIbGxNWuBXIHQ== - -"@spectrum-css/illustratedmessage@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/illustratedmessage/-/illustratedmessage-3.0.2.tgz#6a480be98b027e050b086e7899e40d87adb0a8c0" - integrity sha512-dqnE8X27bGcO0HN8+dYx8O4o0dNNIAqeivOzDHhe2El+V4dTzMrNIerF6G0NLm3GjVf6XliwmitsZK+K6FmbtA== - -"@spectrum-css/inlinealert@2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/inlinealert/-/inlinealert-2.0.1.tgz#7521f88f6c845806403cc7d925773c7414e204a2" - integrity sha512-Xy5RCOwgurqUXuGQCsEDUduDd5408bmEpmFg+feynG7VFUgLFZWBeylSENB/OqjlFtO76PHXNVdHkhDscPIHTA== - -"@spectrum-css/inputgroup@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/inputgroup/-/inputgroup-3.0.2.tgz#f1b13603832cbd22394f3d898af13203961f8691" - integrity sha512-O0G3Lw9gxsh8gTLQWIAKkN1O8cWhjpEUl+oR1PguIKFni72uNr2ikU9piOwy/r0gJG2Q/TVs6hAshoAAkmsSzw== - -"@spectrum-css/label@2.0.10": - version "2.0.10" - resolved "https://registry.yarnpkg.com/@spectrum-css/label/-/label-2.0.10.tgz#2368651d7636a19385b5d300cdf6272db1916001" - integrity sha512-xCbtEiQkZIlLdWFikuw7ifDCC21DOC/KMgVrrVJHXFc4KRQe9LTZSqmGF3tovm+CSq1adE59mYoTbojVQ9YuEQ== - -"@spectrum-css/link@3.1.1": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.1.tgz#cb526a2e10b50ef5a7ae29cca7272e2610d597eb" - integrity sha512-Bi88lRhTY7g6nM/ryW1yY4Cji211ZYNtRxkxbV7n2lPvwMAAQtyx0qVD3ru4kTGj/FFVvmPR3XiOE10K13HSNA== - -"@spectrum-css/link@^3.1.3": - version "3.1.23" - resolved "https://registry.yarnpkg.com/@spectrum-css/link/-/link-3.1.23.tgz#9d9ff64c41366edbfdb19d04a5deec88bf2ea8fd" - integrity sha512-CAJQGnGTrTtR4tF1L94ou9Y+c4vnx9d5rWhb3AMzKb2Focqz02xSkTyaCCH7OM/3CwD8TCLOMANon8LcRpGAjA== - -"@spectrum-css/menu@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/menu/-/menu-3.0.1.tgz#2a376f991acc24e12ec892bb6b9db2650fc41fbe" - integrity sha512-Qjg0+1O0eC89sb/bRFq2AGnQ8XqhVy23TUXHyffNM8qdcMssnlny3QmhzjURCZKvx/Y5UytCpzhedPQqSpQwZg== - -"@spectrum-css/modal@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/modal/-/modal-3.0.1.tgz#613a6b83d0330a4d38db41a98090800751c56d8d" - integrity sha512-F7D99F3cjDGT9DM9sogx/p49jrNYT7a1J6TUoqV73wUf+0gP+dTsskBOo9jB8VbUE+POQPjiDLB+SWLp6iBB+w== - "@spectrum-css/page@^3.0.1": version "3.0.9" resolved "https://registry.yarnpkg.com/@spectrum-css/page/-/page-3.0.9.tgz#f8a705dee90af958e2ee20307218e4f82a018c36" @@ -1744,127 +1479,7 @@ dependencies: "@spectrum-css/vars" "^4.3.1" -"@spectrum-css/pagination@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/pagination/-/pagination-3.0.3.tgz#b204c3ada384c4af751a354bc428346d82eeea65" - integrity sha512-OJ/v9GeNXJOZ9Yr9LDBYPrR2NCiLOWP9wANT/a5sqFuugRnQbn/HYMnRp9TBxwpDY6ihaPo0T/wi7kLiAJFdDw== - -"@spectrum-css/picker@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/picker/-/picker-1.0.1.tgz#98991198576d26bd14160824e7b6f3c278ff930b" - integrity sha512-Rv4/UBOdNW1gs7WVBCJnPD5VFly8MqP++psDX6kcugUIcfJy0GC3acvElotmKRlCDk8Qxks2W2A0jKeSgphTmA== - -"@spectrum-css/popover@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/popover/-/popover-3.0.1.tgz#5863c1efc53f98f9aba2de9186666780041303fc" - integrity sha512-LmOSj/yCwQQ9iGmCYnHiJsJR/HfPiGqI1Jl7pkKxBOCxYBMS/5+ans9vfCN2Qnd0eK7WSbfPg72S6mjye7db2Q== - -"@spectrum-css/progressbar@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/progressbar/-/progressbar-1.0.2.tgz#b5a59432517f9ae6dad49d9504691bc5ac42b424" - integrity sha512-+jExeBLtVCqo3BqtFq5WCtZ028Dzk+oUnX6y4z6ZamKPqOyOELOtFnhYnyhyRndQOqYwKUTXx9zsaWA/lpJOHw== - -"@spectrum-css/progresscircle@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/progresscircle/-/progresscircle-1.0.2.tgz#258ea9170fb70f795edda03e38a61d93bef4487c" - integrity sha512-JLULpyzjIY95lzlWR1yE1gv4l1K6p+scQ+edmuZZUHBzwM3pUtkvHJmUlA9TYdResUYW6Uka60VRdY6lZ8gnFQ== - -"@spectrum-css/radio@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/radio/-/radio-3.0.2.tgz#9c1386894920bbed604e4e174fbbd45d9d762152" - integrity sha512-0TDdzC9omNXnpKHEXNuuGeXdNh4x8jvTKVUqMRLb7vY4hY94hAdt6X01NBqka+jzK35HxGzpDdPADAz62yZLPQ== - -"@spectrum-css/search@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/search/-/search-3.0.2.tgz#70e93e321032d40b399498b2324e3b70e050551e" - integrity sha512-3UbT8yZmNOwrZxq+CUmumE+26ZySZ8OoKNM6U20SLMPLgdx6MrRugVE88r3Bl0sJ0RZX/5bU8nausdiHeX+Jlw== - -"@spectrum-css/sidenav@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/sidenav/-/sidenav-3.0.2.tgz#9d70f408d588ee79c69857751010333671f32713" - integrity sha512-YpIdH/F0jEICYmoduGrnkTmxwJq1kfKxEp0wOs+ZkQOsvKMv1an7nyhsfOKCQqcGNfYzJ9mJAk7/u5+vsxHa8g== - -"@spectrum-css/slider@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/slider/-/slider-3.0.1.tgz#5281e6f47eb5a4fd3d1816c138bf66d01d7f2e49" - integrity sha512-DI2dtMRnQuDM1miVzl3SGyR1khUEKnwdXfO5EHDFwkC3yav43F5QogkfjmjFmWWobMVovdJlAuiaaJ/IHejD0Q== - -"@spectrum-css/statuslight@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/statuslight/-/statuslight-3.0.2.tgz#dc54b6cd113413dcdb909c486b5d7bae60db65c5" - integrity sha512-xodB8g8vGJH20XmUj9ZsPlM1jHrGeRbvmVXkz0q7YvQrYAhim8pP3W+XKKZAletPFAuu8cmUOc6SWn6i4X4z6w== - -"@spectrum-css/stepper@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/stepper/-/stepper-3.0.3.tgz#ae89846886431e3edeee060207b8f81540f73a34" - integrity sha512-prAD61ImlOTs9b6PfB3cB08x4lAfxtvnW+RZiTYky0E8GgZdrc/MfCkL5/oqQaIQUtyQv/3Lb7ELAf/0K8QTXw== - -"@spectrum-css/switch@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/switch/-/switch-1.0.2.tgz#f0b4c69271964573e02b08e90998096e49e1de44" - integrity sha512-zqmHpgWPNg1gEwdUNFYV3CBX5JaeALfIqcJIxE0FLZqr9d1C4+oLE0ItIFzt1bwr4bFAOmkEpvtiY+amluzGxQ== - -"@spectrum-css/table@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/table/-/table-3.0.1.tgz#753e0e2498082c0c36b9600828516aff3ac338cd" - integrity sha512-XQ+srMTv9hK1H0nctWUtqyzitmvyb5TNR+7mjAmKRdkBRSTQQSipDhenxZp72ekzMtMoSYZVZ77kgo0Iw3Fpug== - -"@spectrum-css/tabs@3.2.12": - version "3.2.12" - resolved "https://registry.yarnpkg.com/@spectrum-css/tabs/-/tabs-3.2.12.tgz#9b08f23d5aa881b3441af7757800c7173e5685ff" - integrity sha512-rPFUW9SSW4+3/UJ3UrtY2/l3sQvlqB1fqxHLPDjgykvbfrnMejcCTNV4ZrFNHXpE/6+kGnk+yVViSPtWGwJzkA== - -"@spectrum-css/tag@^3.1.4": - version "3.3.15" - resolved "https://registry.yarnpkg.com/@spectrum-css/tag/-/tag-3.3.15.tgz#971184fd8cb977b85a529f808313851863123278" - integrity sha512-pF6Wh61Z7hmAy20twIlpjdDuivYj6UPtWIzK7giyJKr/qcn20BjVN2ChIeFB1N+vBamJdLsuQOewv4AJ3+LZ2Q== - -"@spectrum-css/tags@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/tags/-/tags-3.0.2.tgz#5bf35fb79c97cd9344de485bd4626ad5b9f07757" - integrity sha512-HbvMk+QHvCDD1/ScvSErpKROcpAbXuMD4Hl/Gz/1A1lQ0fJ/CJeCq/MMsL7zjK1nlItU/ySu8r8KIuRF+6F8SQ== - -"@spectrum-css/textfield@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/textfield/-/textfield-3.0.1.tgz#e875b8e37817378ad08fc4af7d53026df38911e5" - integrity sha512-MUV5q87CVxbkNdSNoxGrFbgyKc51ft/WWf3aVEoPdPw5yBnXqFe1w1YmAit5zYDOOhhs58sCLAlUcCMlOpkgrA== - -"@spectrum-css/toast@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/toast/-/toast-3.0.1.tgz#36f62ea05302761e59b9d53e05f6c04423861796" - integrity sha512-jov++S358BrN2tmMfaoYk1N6u9HojgeuQk61keXrK2m3VE5/n94x7Lg3kIPeSWO0odyDfBlMqT9jacbRey3QTg== - -"@spectrum-css/tooltip@3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/tooltip/-/tooltip-3.0.3.tgz#26b8ca3b3d30e29630244d85eb4fc11d0c841281" - integrity sha512-ztRF7WW1FzyNavXBRc+80z67UoOrY9wl3cMYsVD3MpDnyxdzP8cjza1pCcolKBaFqRTcQKkxKw3GWtGICRKR5A== - -"@spectrum-css/treeview@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/treeview/-/treeview-3.0.2.tgz#d54d8f17290babb1c885f5d9355e225421beb0d2" - integrity sha512-foO7UBJv1JMFaKgDPVt8jBghZSVbqhXR8TaGaxHSnMubv7ygmKkc1AITrWC2STILCn84ju2vchOohMZfW6sYwg== - -"@spectrum-css/typography@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.1.tgz#957dafd9b18c314fa37a88b549042ba2175f5b3f" - integrity sha512-XyR68K2rIZX3u4j7HhMLOqLVHDJZcapp3XUqgYMzMWccBFleA0qPxKpfRWqVIA5DzTMSIw0wEcZPYKWFZ2e6dA== - -"@spectrum-css/typography@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@spectrum-css/typography/-/typography-3.0.2.tgz#ea3ca0a60e18064527819d48c8c4364cab4fcd38" - integrity sha512-5ZOLmQe0edzsDMyhghUd4hBb5uxGsFrxzf+WasfcUw9klSfTsRZ09n1BsaaWbgrLjlMQ+EEHS46v5VNo0Ms2CA== - -"@spectrum-css/underlay@2.0.9": - version "2.0.9" - resolved "https://registry.yarnpkg.com/@spectrum-css/underlay/-/underlay-2.0.9.tgz#fc10f971d1325cc844b727e6260f7217844060e8" - integrity sha512-X86xd0PG4QobmUyXA90BFGnyygaI8kW64dA4ysf4z0cOvUWjNbAAl3a/DB/WRyrnp63Zqv83T/cgNbetagTbWg== - -"@spectrum-css/vars@3.0.1": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.1.tgz#561fd69098f896a647242dd8d6108af603bfa31e" - integrity sha512-l4oRcCOqInChYXZN6OQhpe3isk6l4OE6Ys8cgdlsiKp53suNoQxyyd9p/eGRbCjZgH3xQ8nK0t4DHa7QYC0S6w== - -"@spectrum-css/vars@^3.0.1", "@spectrum-css/vars@^3.0.2": +"@spectrum-css/vars@^3.0.1": version "3.0.2" resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-3.0.2.tgz#ea9062c3c98dfc6ba59e5df14a03025ad8969999" integrity sha512-vzS9KqYXot4J3AEER/u618MXWAS+IoMvYMNrOoscKiLLKYQWenaueakUWulFonToPd/9vIpqtdbwxznqrK5qDw== @@ -1874,11 +1489,6 @@ resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-4.3.1.tgz#d333fa41909f691c8750b5c15ad9ba029df2248e" integrity sha512-rX6Iasu9BsFMVgEN0vGRPm9dmSxva+IK/uqQAa9HM0lliwqUiFrJxrFXHHpiAgNuux/U4srEJwbSpGzfF+CegQ== -"@spectrum-css/vars@^8.0.0": - version "8.0.3" - resolved "https://registry.yarnpkg.com/@spectrum-css/vars/-/vars-8.0.3.tgz#a5da23c58861b36ee48b9cd5983f956d2bb7977f" - integrity sha512-LoSPi5273u21O5ItFr3FuLZS3D0y9dlmJImmat8W66r6dPaFJhHDRAbIB93hGOk5mPxqrQb8guAUx7FmvZrbuQ== - "@sveltejs/vite-plugin-svelte@1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-1.0.1.tgz#7f468f03c933fcdfc60d4773671c73f33b9ef4d6" @@ -1990,18 +1600,6 @@ dependencies: "@babel/types" "^7.3.0" -"@types/codemirror@^5.60.4": - version "5.60.7" - resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-5.60.7.tgz#efbb78e5e79f90c6762c2127c02096648e600808" - integrity sha512-QXIC+RPzt/1BGSuD6iFn6UMC9TDp+9hkOANYNPVsjjrDdzKphfRkwQDKGp2YaC54Yhz0g6P5uYTCCibZZEiMAA== - dependencies: - "@types/tern" "*" - -"@types/estree@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== - "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" @@ -2056,11 +1654,6 @@ expect "^29.0.0" pretty-format "^29.0.0" -"@types/marked@^4.0.7": - version "4.0.8" - resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.0.8.tgz#b316887ab3499d0a8f4c70b7bd8508f92d477955" - integrity sha512-HVNzMT5QlWCOdeuBsgXP8EZzKUf0+AXzN+sLmjvaB3ZlLqO+e4u0uXrdw9ub69wBKFs+c6/pA4r9sy6cCDvImw== - "@types/minimatch@*": version "5.1.2" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" @@ -2106,13 +1699,6 @@ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== -"@types/tern@*": - version "0.23.4" - resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb" - integrity sha512-JAUw1iXGO1qaWwEOzxTKJZ/5JxVeON9kvGZ/osgZaJImBnyjyn0cjovPsf6FNLmyGY8Vw9DoXZCMlfMkMwHRWg== - dependencies: - "@types/estree" "*" - "@types/testing-library__jest-dom@^5.9.1": version "5.14.5" resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz#d113709c90b3c75fdb127ec338dad7d5f86c974f" @@ -2164,7 +1750,7 @@ acorn-walk@^7.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== -acorn-walk@^8.1.1, acorn-walk@^8.2.0: +acorn-walk@^8.1.1: version "8.2.0" resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== @@ -2174,7 +1760,7 @@ acorn@^7.1.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.0: +acorn@^8.2.4, acorn@^8.4.1: version "8.8.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== @@ -2246,18 +1832,6 @@ anymatch@^3.0.3: normalize-path "^3.0.0" picomatch "^2.0.4" -apexcharts@^3.19.2, apexcharts@^3.22.1: - version "3.36.3" - resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.36.3.tgz#debd58ded07163d51e00aeb15827d594e0cc8129" - integrity sha512-8/FXEs0ohXMff07Gv28XjhPwEJphIUdq2/wii/pcvi54Tw6z1mjrV8ydN8rlWi/ve8BAPBefJkLmRWv7UOBsLw== - dependencies: - svg.draggable.js "^2.2.2" - svg.easing.js "^2.0.0" - svg.filter.js "^2.0.2" - svg.pathmorphing.js "^0.1.3" - svg.resize.js "^1.4.3" - svg.select.js "^3.0.1" - arch@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" @@ -2273,7 +1847,7 @@ arg@^5.0.2: resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== -argparse@^1.0.10, argparse@^1.0.7: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -2302,15 +1876,6 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== -array-sort@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a" - integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg== - dependencies: - default-compare "^1.0.0" - get-value "^2.0.6" - kind-of "^5.0.2" - array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -2363,13 +1928,6 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autolinker@~0.28.0: - version "0.28.1" - resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.28.1.tgz#0652b491881879f0775dace0cdca3233942a4e47" - integrity sha512-zQAFO1Dlsn69eXaO6+7YZc+v84aquQKbwpzCE3L0stj56ERn9hutFxPopViLjo9G+rWwjozRhgS5KJ25Xy19cQ== - dependencies: - gulp-header "^1.7.1" - available-typed-arrays@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" @@ -2773,14 +2331,7 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== -codemirror-spell-checker@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e" - integrity sha512-2Tl6n0v+GJRsC9K3MLCdLaMOmvWL0uukajNJseorZJsslaxZyZMgENocPU8R0DyoTAiKsyqiemSOZo7kjGV0LQ== - dependencies: - typo-js "*" - -codemirror@^5.59.0, codemirror@^5.63.1: +codemirror@^5.59.0: version "5.65.11" resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.11.tgz#c818edc3274788c008f636520c5490a1f7009b4f" integrity sha512-Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A== @@ -2864,13 +2415,6 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concat-with-sourcemaps@*: - version "1.1.0" - resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" - integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg== - dependencies: - source-map "^0.6.1" - configent@^2.1.4: version "2.2.0" resolved "https://registry.yarnpkg.com/configent/-/configent-2.2.0.tgz#2de230fc43f22c47cfd99016aa6962d6f9546994" @@ -2900,11 +2444,6 @@ core-util-is@1.0.2: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - create-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" @@ -3037,12 +2576,12 @@ dateformat@^4.5.1: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== -dayjs@^1.10.4, dayjs@^1.10.5, dayjs@^1.11.2: +dayjs@^1.10.4, dayjs@^1.11.2: version "1.11.7" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== -debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: +debug@4, debug@4.3.4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -3111,13 +2650,6 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.0.tgz#65491893ec47756d44719ae520e0e2609233b59b" integrity sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og== -default-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f" - integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ== - dependencies: - kind-of "^5.0.2" - define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" @@ -3190,20 +2722,6 @@ dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9: resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz#5a7429e6066eb3664d911e33fb0e45de8eb08453" integrity sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg== -dom-serializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" - integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.2" - entities "^4.2.0" - -domelementtype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== - domexception@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304" @@ -3211,22 +2729,6 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -domhandler@^5.0.1, domhandler@^5.0.2: - version "5.0.3" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" - integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== - dependencies: - domelementtype "^2.3.0" - -domutils@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" - integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== - dependencies: - dom-serializer "^2.0.0" - domelementtype "^2.3.0" - domhandler "^5.0.1" - dotenv@^8.2.0: version "8.6.0" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" @@ -3242,17 +2744,6 @@ duplexer@~0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -easymde@^2.16.1: - version "2.18.0" - resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.18.0.tgz#ff1397d07329b1a7b9187d2d0c20766fa16b3b1b" - integrity sha512-IxVVUxNWIoXLeqtBU4BLc+eS/ScYhT1Dcb6yF5Wchoj1iXAV+TIIDWx+NCaZhY7RcSHqDPKllbYq7nwGKILnoA== - dependencies: - "@types/codemirror" "^5.60.4" - "@types/marked" "^4.0.7" - codemirror "^5.63.1" - codemirror-spell-checker "1.1.2" - marked "^4.1.0" - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -3283,22 +2774,6 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -engine.io-client@~6.2.3: - version "6.2.3" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz#a8cbdab003162529db85e9de31575097f6d29458" - integrity sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - engine.io-parser "~5.0.3" - ws "~8.2.3" - xmlhttprequest-ssl "~2.0.0" - -engine.io-parser@~5.0.3: - version "5.0.6" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.6.tgz#7811244af173e157295dec9b2718dfe42a64ef45" - integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw== - enquirer@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" @@ -3306,16 +2781,6 @@ enquirer@^2.3.6: dependencies: ansi-colors "^4.1.1" -ent@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== - -entities@^4.2.0, entities@^4.3.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" - integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== - error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" @@ -3486,11 +2951,6 @@ escape-string-regexp@^2.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - escodegen@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" @@ -3786,11 +3246,6 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -flatpickr@^4.5.2: - version "4.6.13" - resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94" - integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw== - fn-name@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-3.0.0.tgz#0596707f635929634d791f452309ab41558e3c5c" @@ -3857,11 +3312,6 @@ from@~0: resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" integrity sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g== -fs-exists-sync@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" - integrity sha512-cR/vflFyPZtrN6b38ZyWxpWdhlXrzZEBawlpBQMq7033xVY7/kg0GDMBK5jg8lDYQckdJ5x/YC88lM3C7VMsLg== - fs-extra@^10.0.0: version "10.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" @@ -3943,14 +3393,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: has "^1.0.3" has-symbols "^1.0.3" -get-object@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c" - integrity sha512-7P6y6k6EzEFmO/XyUyFlXm1YLJy9xeA1x/grNV8276abX5GuwUtYgKFkRFkLixw4hf4Pz9q2vgv/8Ar42R0HuQ== - dependencies: - is-number "^2.0.2" - isobject "^0.2.0" - get-package-type@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" @@ -3980,13 +3422,6 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== -get-value@^3.0.0, get-value@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-3.0.1.tgz#5efd2a157f1d6a516d7524e124ac52d0a39ef5a8" - integrity sha512-mKZj9JLQrwMBtj5wxi6MH8Z5eSKaERpAwjg43dPtlGI1ZVEgH/qC7T8/6R2OBSUA+zzHBZgICsVJaEIV2tKTDA== - dependencies: - isobject "^3.0.1" - getos@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5" @@ -4063,35 +3498,6 @@ growly@^1.3.0: resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" integrity sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw== -gulp-header@^1.7.1: - version "1.8.12" - resolved "https://registry.yarnpkg.com/gulp-header/-/gulp-header-1.8.12.tgz#ad306be0066599127281c4f8786660e705080a84" - integrity sha512-lh9HLdb53sC7XIZOYzTXM4lFuXElv3EVkSDhsd7DoJBj7hm+Ni7D3qYbb+Rr8DuM8nRanBvkVO9d7askreXGnQ== - dependencies: - concat-with-sourcemaps "*" - lodash.template "^4.4.0" - through2 "^2.0.0" - -handlebars-utils@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/handlebars-utils/-/handlebars-utils-1.0.6.tgz#cb9db43362479054782d86ffe10f47abc76357f9" - integrity sha512-d5mmoQXdeEqSKMtQQZ9WkiUcO1E3tPbWxluCK9hVgIDPzQa9WsKo3Lbe/sGflTe7TomHEeZaOgwIkyIr1kfzkw== - dependencies: - kind-of "^6.0.0" - typeof-article "^0.1.1" - -handlebars@^4.7.6, handlebars@^4.7.7: - version "4.7.7" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" - integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== - dependencies: - minimist "^1.2.5" - neo-async "^2.6.0" - source-map "^0.6.1" - wordwrap "^1.0.0" - optionalDependencies: - uglify-js "^3.1.4" - harmony-reflect@^1.4.6: version "1.6.2" resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710" @@ -4149,14 +3555,6 @@ has-value@^1.0.0: has-values "^1.0.0" isobject "^3.0.0" -has-value@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-2.0.2.tgz#d0f12e8780ba8e90e66ad1a21c707fdb67c25658" - integrity sha512-ybKOlcRsK2MqrM3Hmz/lQxXHZ6ejzSPzpNabKB45jb5qDgJvKPa3SdapTsTLwEb9WltgWpOmNax7i+DzNOk4TA== - dependencies: - get-value "^3.0.0" - has-values "^2.0.1" - has-values@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" @@ -4170,13 +3568,6 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has-values@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-2.0.1.tgz#3876200ff86d8a8546a9264a952c17d5fc17579d" - integrity sha512-+QdH3jOmq9P8GfdjFg0eJudqx1FqU62NQJ4P16rOEHeRdl7ckgwn6uqQjzYE0ZoHVV/e5E2esuJ5Gl5+HUW19w== - dependencies: - kind-of "^6.0.2" - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -4184,16 +3575,6 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -helper-md@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/helper-md/-/helper-md-0.2.2.tgz#c1f59d7e55bbae23362fd8a0e971607aec69d41f" - integrity sha512-49TaQzK+Ic7ZVTq4i1UZxRUJEmAilTk8hz7q4I0WNUaTclLR8ArJV5B3A1fe1xF2HtsDTr2gYKLaVTof/Lt84Q== - dependencies: - ent "^2.2.0" - extend-shallow "^2.0.1" - fs-exists-sync "^0.1.0" - remarkable "^1.6.2" - hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -4211,29 +3592,6 @@ html-escaper@^2.0.0: resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg== -html-tag@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/html-tag/-/html-tag-2.0.0.tgz#36c3bc8d816fd30b570d5764a497a641640c2fed" - integrity sha512-XxzooSo6oBoxBEUazgjdXj7VwTn/iSTSZzTYKzYY6I916tkaYzypHxy+pbVU1h+0UQ9JlVf5XkNQyxOAiiQO1g== - dependencies: - is-self-closing "^1.0.1" - kind-of "^6.0.0" - -html5-qrcode@^2.2.1: - version "2.3.4" - resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.4.tgz#7e2b4575a23b10ff5e26d2bf147c8027c1ece389" - integrity sha512-VPZrOTG8XR9HmIAhSSiGtJVPErZxKy/DuGc9cPQLburCWZEbvxQGJP9y4K4P+8vdalLtYB/vM5YP1BdWQKZ8jQ== - -htmlparser2@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" - integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.2" - domutils "^3.0.1" - entities "^4.3.0" - http-proxy-agent@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" @@ -4320,7 +3678,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@~2.0.3: +inherits@2: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -4465,13 +3823,6 @@ is-docker@^2.0.0: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== -is-even@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-even/-/is-even-1.0.0.tgz#76b5055fbad8d294a86b6a949015e1c97b717c06" - integrity sha512-LEhnkAdJqic4Dbqn58A0y52IXoHWlsueqQkKfMfdEnIYG8A1sm/GHidKkS6yvXlMoRrkM34csHnXQtOqcb+Jzg== - dependencies: - is-odd "^0.1.2" - is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -4526,13 +3877,6 @@ is-number-object@^1.0.4: dependencies: has-tostringtag "^1.0.0" -is-number@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha512-QUzH43Gfb9+5yckcrSA0VBDwEtDUchrk4F6tfJZQuNzDJbEDB9cZNzSfXGQ1jqmdDY/kl41lUOWM9syA8z8jlg== - dependencies: - kind-of "^3.0.2" - is-number@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" @@ -4545,13 +3889,6 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-odd@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-0.1.2.tgz#bc573b5ce371ef2aad6e6f49799b72bef13978a7" - integrity sha512-Ri7C2K7o5IrUU9UEI8losXJCCD/UtsaIrkR5sxIcFg4xQ9cRJXlWA5DQvTE0yDc0krvSNLsRGXN11UPS6KyfBw== - dependencies: - is-number "^3.0.0" - is-path-inside@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" @@ -4569,11 +3906,6 @@ is-plain-object@^3.0.0: resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.1.tgz#662d92d24c0aa4302407b0d45d21f2251c85f85b" integrity sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g== -is-plain-object@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" - integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== - is-potential-custom-element-name@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" @@ -4587,13 +3919,6 @@ is-regex@^1.1.4: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-self-closing@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-self-closing/-/is-self-closing-1.0.1.tgz#5f406b527c7b12610176320338af0fa3896416e4" - integrity sha512-E+60FomW7Blv5GXTlYee2KDrnG6srxF7Xt1SjrhWUGUEsTFIqY/nq2y3DaftCsgUMdh89V07IVfhY9KIJhLezg== - dependencies: - self-closing-tags "^1.0.1" - is-set@^2.0.1, is-set@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" @@ -4676,7 +4001,7 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -isarray@1.0.0, isarray@~1.0.0: +isarray@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== @@ -4691,11 +4016,6 @@ isexe@^2.0.0: resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -isobject@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-0.2.0.tgz#a3432192f39b910b5f02cc989487836ec70aa85e" - integrity sha512-VaWq6XYAsbvM0wf4dyBO7WH9D7GosB7ZZlqrawI9BBiTMINBeCyqSKBa35m870MY3O4aM31pYyZi9DfGrYMJrQ== - isobject@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" @@ -5308,7 +4628,7 @@ jsprim@^2.0.2: json-schema "0.4.0" verror "1.10.0" -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0: +kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== @@ -5322,12 +4642,12 @@ kind-of@^4.0.0: dependencies: is-buffer "^1.1.5" -kind-of@^5.0.0, kind-of@^5.0.2: +kind-of@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== -kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: +kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== @@ -5347,11 +4667,6 @@ lazy-ass@1.6.0, lazy-ass@^1.6.0: resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513" integrity sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw== -leaflet@^1.7.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414" - integrity sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ== - leven@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -5396,11 +4711,6 @@ lodash-es@^4.17.11: resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== - lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" @@ -5431,22 +4741,7 @@ lodash.once@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac" integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg== -lodash.template@^4.4.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" - integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.templatesettings "^4.0.0" - -lodash.templatesettings@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" - integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== - dependencies: - lodash._reinterpolate "^3.0.0" - -lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0: +lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -5552,11 +4847,6 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -marked@^4.1.0: - version "4.2.12" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.12.tgz#d69a64e21d71b06250da995dcd065c11083bebb5" - integrity sha512-yr8hSKa3Fv4D3jdZmtMMPghgVt6TWbk86WQaWhDloQjRSQhMMYCAro7jP7VDJrjjdV8pxVxMssXS8B8Y5DZ5aw== - merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -5572,7 +4862,7 @@ methods@^1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== -micromatch@^3.1.4, micromatch@^3.1.5: +micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -5628,7 +4918,7 @@ minimatch@^3.0.4, minimatch@^3.1.1: dependencies: brace-expansion "^1.1.7" -minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.7: +minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.6, minimist@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== @@ -5736,11 +5026,6 @@ ncp@^2.0.0: resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3" integrity sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA== -neo-async@^2.6.0: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -5959,11 +5244,6 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-srcset@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1" - integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q== - parse5@6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" @@ -6053,7 +5333,7 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== -postcss@^8.3.11, postcss@^8.4.18: +postcss@^8.4.18: version "8.4.21" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== @@ -6109,11 +5389,6 @@ pretty-format@^29.0.0, pretty-format@^29.4.1: ansi-styles "^5.0.0" react-is "^18.0.0" -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - prompts@^2.0.1: version "2.4.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069" @@ -6217,19 +5492,6 @@ read-pkg@^5.2.0: parse-json "^5.0.0" type-fest "^0.6.0" -readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - redent@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" @@ -6279,16 +5541,6 @@ regexp.prototype.flags@^1.4.3: define-properties "^1.1.3" functions-have-names "^1.2.2" -regexparam@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa" - integrity sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw== - -regexparam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-1.3.0.tgz#2fe42c93e32a40eff6235d635e0ffa344b92965f" - integrity sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g== - regexpu-core@^5.2.1: version "5.2.2" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.2.tgz#3e4e5d12103b64748711c3aad69934d7718e75fc" @@ -6313,21 +5565,6 @@ regjsparser@^0.9.1: dependencies: jsesc "~0.5.0" -relative@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/relative/-/relative-3.0.2.tgz#0dcd8ec54a5d35a3c15e104503d65375b5a5367f" - integrity sha512-Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA== - dependencies: - isobject "^2.0.0" - -remarkable@^1.6.2: - version "1.7.4" - resolved "https://registry.yarnpkg.com/remarkable/-/remarkable-1.7.4.tgz#19073cb960398c87a7d6546eaa5e50d2022fcd00" - integrity sha512-e6NKUXgX95whv7IgddywbeN/ItCkWbISmc2DiqHJb0wTrqZIexqdco5b8Z3XZoo/48IdNVKM9ZCvTPJ4F5uvhg== - dependencies: - argparse "^1.0.10" - autolinker "~0.28.0" - remixicon@2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/remixicon/-/remixicon-2.5.0.tgz#b5e245894a1550aa23793f95daceadbf96ad1a41" @@ -6480,11 +5717,6 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.2: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -6512,18 +5744,6 @@ sane@^4.0.3: minimist "^1.1.1" walker "~1.0.5" -sanitize-html@^2.7.0: - version "2.8.1" - resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.8.1.tgz#319c4fdba67e1edf35b1fd6d9362210044826d47" - integrity sha512-qK5neD0SaMxGwVv5txOYv05huC3o6ZAA4h5+7nJJgWMNFUNRjcjLO6FpwAtKzfKCZ0jrG6xTk6eVFskbvOGblg== - dependencies: - deepmerge "^4.2.2" - escape-string-regexp "^4.0.0" - htmlparser2 "^8.0.0" - is-plain-object "^5.0.0" - parse-srcset "^1.0.2" - postcss "^8.3.11" - saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" @@ -6531,16 +5751,6 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -screenfull@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238" - integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw== - -self-closing-tags@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/self-closing-tags/-/self-closing-tags-1.0.1.tgz#6c5fa497994bb826b484216916371accee490a5d" - integrity sha512-7t6hNbYMxM+VHXTgJmxwgZgLGktuXtVVD5AivWzNTdJBM4DBjnDKDzkf2SrNjihaArpeJYNjxkELBu1evI4lQA== - "semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -6609,13 +5819,6 @@ shortid@2.2.15: dependencies: nanoid "^2.1.0" -shortid@^2.2.15: - version "2.2.16" - resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" - integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== - dependencies: - nanoid "^2.1.0" - side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -6688,24 +5891,6 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -socket.io-client@^4.5.1: - version "4.5.4" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.4.tgz#d3cde8a06a6250041ba7390f08d2468ccebc5ac9" - integrity sha512-ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.2" - engine.io-client "~6.2.3" - socket.io-parser "~4.2.1" - -socket.io-parser@~4.2.1: - version "4.2.2" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206" - integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" @@ -6875,13 +6060,6 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" @@ -6916,11 +6094,6 @@ strip-indent@^3.0.0: dependencies: min-indent "^1.0.0" -striptags@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052" - integrity sha512-g45ZOGzHDMe2bdYMdIvdAfCQkCTDMGBazSw1ypMowwGIee7ZQ5dU0rBJ8Jqgl+jAKIv4dbeE1jscZq9wid1Tkw== - supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" @@ -6955,25 +6128,11 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -svelte-apexcharts@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/svelte-apexcharts/-/svelte-apexcharts-1.0.2.tgz#4e000f8b8f7c901c05658c845457dfc8314d54c1" - integrity sha512-6qlx4rE+XsonZ0FZudfwqOQ34Pq+3wpxgAD75zgEmGoYhYBJcwmikTuTf3o8ZBsZue9U/pAwhNy3ed1Bkq1gmA== - dependencies: - apexcharts "^3.19.2" - svelte-dnd-action@^0.9.8: version "0.9.22" resolved "https://registry.yarnpkg.com/svelte-dnd-action/-/svelte-dnd-action-0.9.22.tgz#003eee9dddb31d8c782f6832aec8b1507fff194d" integrity sha512-lOQJsNLM1QWv5mdxIkCVtk6k4lHCtLgfE59y8rs7iOM6erchbLC9hMEFYSveZz7biJV0mpg7yDSs4bj/RT/YkA== -svelte-flatpickr@^3.1.0, svelte-flatpickr@^3.2.3: - version "3.3.1" - resolved "https://registry.yarnpkg.com/svelte-flatpickr/-/svelte-flatpickr-3.3.1.tgz#2f2fb60d8190e583ff62d82162a5c2f3fd7824a8" - integrity sha512-cKHET/oFoGA/qIoAX87+XvC5n3KuFrCSYBTzI1gl1TKZsTiVnbQkJOIsIa96S19tbnyyPKn+tdt028vzBA3qyA== - dependencies: - flatpickr "^4.5.2" - svelte-hmr@^0.14.12: version "0.14.12" resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.14.12.tgz#a127aec02f1896500b10148b2d4d21ddde39973f" @@ -6989,78 +6148,16 @@ svelte-loading-spinners@^0.1.1: resolved "https://registry.yarnpkg.com/svelte-loading-spinners/-/svelte-loading-spinners-0.1.7.tgz#3fa6fa0ef67ab635773bf20b07d0b071debbadaa" integrity sha512-EKCId1DjVL2RSUVJJsvtNcqQHox03XIgh4xh/4p7r6ST7d8mut6INY9/LqK4A17PFU64+3quZmqiSfOlf480CA== -svelte-portal@1.0.0, svelte-portal@^1.0.0: +svelte-portal@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/svelte-portal/-/svelte-portal-1.0.0.tgz#36a47c5578b1a4d9b4dc60fa32a904640ec4cdd3" integrity sha512-nHf+DS/jZ6jjnZSleBMSaZua9JlG5rZv9lOGKgJuaZStfevtjIlUJrkLc3vbV8QdBvPPVmvcjTlazAzfKu0v3Q== -svelte-spa-router@^3.0.5: - version "3.3.0" - resolved "https://registry.yarnpkg.com/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz#2fc0967a49dc361dfe4d38dddad6e662eed5b42c" - integrity sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ== - dependencies: - regexparam "2.0.1" - -svelte@^3.46.2, svelte@^3.48.0, svelte@^3.49.0: +svelte@^3.48.0: version "3.55.1" resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.55.1.tgz#6f93b153e5248039906ce5fe196efdb9e05dfce8" integrity sha512-S+87/P0Ve67HxKkEV23iCdAh/SX1xiSfjF1HOglno/YTbSTW7RniICMCofWGdJJbdjw3S+0PfFb1JtGfTXE0oQ== -svg.draggable.js@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz#c514a2f1405efb6f0263e7958f5b68fce50603ba" - integrity sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw== - dependencies: - svg.js "^2.0.1" - -svg.easing.js@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/svg.easing.js/-/svg.easing.js-2.0.0.tgz#8aa9946b0a8e27857a5c40a10eba4091e5691f12" - integrity sha512-//ctPdJMGy22YoYGV+3HEfHbm6/69LJUTAqI2/5qBvaNHZ9uUFVC82B0Pl299HzgH13rKrBgi4+XyXXyVWWthA== - dependencies: - svg.js ">=2.3.x" - -svg.filter.js@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/svg.filter.js/-/svg.filter.js-2.0.2.tgz#91008e151389dd9230779fcbe6e2c9a362d1c203" - integrity sha512-xkGBwU+dKBzqg5PtilaTb0EYPqPfJ9Q6saVldX+5vCRy31P6TlRCP3U9NxH3HEufkKkpNgdTLBJnmhDHeTqAkw== - dependencies: - svg.js "^2.2.5" - -svg.js@>=2.3.x, svg.js@^2.0.1, svg.js@^2.2.5, svg.js@^2.4.0, svg.js@^2.6.5: - version "2.7.1" - resolved "https://registry.yarnpkg.com/svg.js/-/svg.js-2.7.1.tgz#eb977ed4737001eab859949b4a398ee1bb79948d" - integrity sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA== - -svg.pathmorphing.js@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz#c25718a1cc7c36e852ecabc380e758ac09bb2b65" - integrity sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww== - dependencies: - svg.js "^2.4.0" - -svg.resize.js@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/svg.resize.js/-/svg.resize.js-1.4.3.tgz#885abd248e0cd205b36b973c4b578b9a36f23332" - integrity sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw== - dependencies: - svg.js "^2.6.5" - svg.select.js "^2.1.2" - -svg.select.js@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-2.1.2.tgz#e41ce13b1acff43a7441f9f8be87a2319c87be73" - integrity sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ== - dependencies: - svg.js "^2.2.5" - -svg.select.js@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-3.0.1.tgz#a4198e359f3825739226415f82176a90ea5cc917" - integrity sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw== - dependencies: - svg.js "^2.6.5" - symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -7110,14 +6207,6 @@ throttleit@^1.0.0: resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" integrity sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g== -through2@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - through@2, through@^2.3.8, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -7140,11 +6229,6 @@ to-fast-properties@^2.0.0: resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== -to-gfm-code-block@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82" - integrity sha512-LQRZWyn8d5amUKnfR9A9Uu7x9ss7Re8peuWR2gkh1E+ildOfv2aF26JpuDg8JtvCduu5+hOrMIH+XstZtnagqg== - to-object-path@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" @@ -7296,28 +6380,11 @@ typedarray-to-buffer@^3.1.5: dependencies: is-typedarray "^1.0.0" -typeof-article@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/typeof-article/-/typeof-article-0.1.1.tgz#9f07e733c3fbb646ffa9e61c08debacd460e06af" - integrity sha512-Vn42zdX3FhmUrzEmitX3iYyLb+Umwpmv8fkZRIknYh84lmdrwqZA5xYaoKiIj2Rc5i/5wcDrpUmZcbk1U51vTw== - dependencies: - kind-of "^3.1.0" - typescript@4.7.3: version "4.7.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.3.tgz#8364b502d5257b540f9de4c40be84c98e23a129d" integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA== -typo-js@*: - version "1.2.2" - resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b" - integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== - -uglify-js@^3.1.4: - version "3.17.4" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.17.4.tgz#61678cf5fa3f5b7eb789bb345df29afb8257c22c" - integrity sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g== - unicode-canonical-property-names-ecmascript@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" @@ -7412,11 +6479,6 @@ utf-8-validate@^5.0.2: dependencies: node-gyp-build "^4.3.0" -util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - uuid@8.3.1: version "8.3.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31" @@ -7475,14 +6537,6 @@ vite@^3.0.8: optionalDependencies: fsevents "~2.3.2" -vm2@^3.9.4: - version "3.9.13" - resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.13.tgz#774a1a3d73b9b90b1aa45bcc5f25e349f2eef649" - integrity sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q== - dependencies: - acorn "^8.7.0" - acorn-walk "^8.2.0" - w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -7616,11 +6670,6 @@ word-wrap@~1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== - wrap-ansi@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" @@ -7659,11 +6708,6 @@ ws@^7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== -ws@~8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" - integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== - xml-name-validator@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" @@ -7674,16 +6718,6 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xmlhttprequest-ssl@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" - integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== - -xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - y18n@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" @@ -7755,11 +6789,6 @@ yauzl@^2.10.0: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -year@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/year/-/year-0.2.1.tgz#4083ae520a318b23ec86037f3000cb892bdf9bb0" - integrity sha512-9GnJUZ0QM4OgXuOzsKNzTJ5EOkums1Xc+3YQXp+Q+UxFjf7zLucp9dQ8QMIft0Szs1E1hUiXFim1OYfEKFq97w== - yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" diff --git a/packages/server/src/integrations/couchdb.ts b/packages/server/src/integrations/couchdb.ts index 67be21c9d1..8c1e71ef14 100644 --- a/packages/server/src/integrations/couchdb.ts +++ b/packages/server/src/integrations/couchdb.ts @@ -1,11 +1,11 @@ import { - Integration, DatasourceFieldType, - QueryType, + Document, + Integration, IntegrationBase, + QueryType, } from "@budibase/types" - -const PouchDB = require("pouchdb") +import { db as dbCore } from "@budibase/backend-core" interface CouchDBConfig { url: string @@ -39,6 +39,15 @@ const SCHEMA: Integration = { update: { type: QueryType.JSON, }, + get: { + type: QueryType.FIELDS, + fields: { + id: { + type: DatasourceFieldType.STRING, + required: true, + }, + }, + }, delete: { type: QueryType.FIELDS, fields: { @@ -57,7 +66,11 @@ class CouchDBIntegration implements IntegrationBase { constructor(config: CouchDBConfig) { this.config = config - this.client = new PouchDB(`${config.url}/${config.database}`) + this.client = new dbCore.DatabaseImpl( + config.database, + undefined, + config.url + ) } async query( @@ -66,31 +79,48 @@ class CouchDBIntegration implements IntegrationBase { query: { json?: object; id?: string } ) { try { - const response = await this.client[command](query.id || query.json) - await this.client.close() - return response + return await this.client[command](query.id || query.json) } catch (err) { console.error(errorMsg, err) throw err } } - async create(query: { json: object }) { - return this.query("post", "Error writing to couchDB", query) + private parse(query: { json: string | object }) { + return typeof query.json === "string" ? JSON.parse(query.json) : query.json } - async read(query: { json: object }) { + async create(query: { json: string | object }) { + const parsed = this.parse(query) + return this.query("post", "Error writing to couchDB", { json: parsed }) + } + + async read(query: { json: string | object }) { + const parsed = this.parse(query) const result = await this.query("allDocs", "Error querying couchDB", { json: { include_docs: true, - ...query.json, + ...parsed, }, }) return result.rows.map((row: { doc: object }) => row.doc) } - async update(query: { json: object }) { - return this.query("put", "Error updating couchDB document", query) + async update(query: { json: string | object }) { + const parsed: Document = this.parse(query) + if (!parsed?._rev && parsed?._id) { + const oldDoc = await this.get({ id: parsed._id }) + parsed._rev = oldDoc._rev + } + return this.query("put", "Error updating couchDB document", { + json: parsed, + }) + } + + async get(query: { id: string }) { + return this.query("get", "Error retrieving couchDB document by ID", { + id: query.id, + }) } async delete(query: { id: string }) { diff --git a/packages/server/src/integrations/tests/couchdb.spec.ts b/packages/server/src/integrations/tests/couchdb.spec.ts index e05a2bd247..9bbb4fa211 100644 --- a/packages/server/src/integrations/tests/couchdb.spec.ts +++ b/packages/server/src/integrations/tests/couchdb.spec.ts @@ -1,16 +1,19 @@ -jest.mock( - "pouchdb", - () => - function CouchDBMock(this: any) { - this.post = jest.fn() - this.allDocs = jest.fn(() => ({ rows: [] })) - this.put = jest.fn() - this.get = jest.fn() - this.remove = jest.fn() - this.plugin = jest.fn() - this.close = jest.fn() - } -) +jest.mock("@budibase/backend-core", () => { + const core = jest.requireActual("@budibase/backend-core") + return { + ...core, + db: { + ...core.db, + DatabaseImpl: function () { + this.post = jest.fn() + this.allDocs = jest.fn().mockReturnValue({ rows: [] }) + this.put = jest.fn() + this.get = jest.fn().mockReturnValue({ _rev: "a" }) + this.remove = jest.fn() + }, + }, + } +}) import { default as CouchDBIntegration } from "../couchdb" @@ -33,8 +36,8 @@ describe("CouchDB Integration", () => { const doc = { test: 1, } - const response = await config.integration.create({ - json: doc, + await config.integration.create({ + json: JSON.stringify(doc), }) expect(config.integration.client.post).toHaveBeenCalledWith(doc) }) @@ -44,8 +47,8 @@ describe("CouchDB Integration", () => { name: "search", } - const response = await config.integration.read({ - json: doc, + await config.integration.read({ + json: JSON.stringify(doc), }) expect(config.integration.client.allDocs).toHaveBeenCalledWith({ @@ -60,11 +63,14 @@ describe("CouchDB Integration", () => { name: "search", } - const response = await config.integration.update({ - json: doc, + await config.integration.update({ + json: JSON.stringify(doc), }) - expect(config.integration.client.put).toHaveBeenCalledWith(doc) + expect(config.integration.client.put).toHaveBeenCalledWith({ + ...doc, + _rev: "a", + }) }) it("calls the delete method with the correct params", async () => { From abe3e2921fee36b1e87631b500c950101bc9c4e8 Mon Sep 17 00:00:00 2001 From: adrinr Date: Tue, 31 Jan 2023 22:50:52 +0000 Subject: [PATCH 355/387] Race conditions --- .../src/api/routes/tests/{query.spec.js => query.seq.spec.js} | 0 packages/server/src/db/tests/linkController.spec.js | 1 + packages/worker/src/tests/TestConfiguration.ts | 1 + 3 files changed, 2 insertions(+) rename packages/server/src/api/routes/tests/{query.spec.js => query.seq.spec.js} (100%) diff --git a/packages/server/src/api/routes/tests/query.spec.js b/packages/server/src/api/routes/tests/query.seq.spec.js similarity index 100% rename from packages/server/src/api/routes/tests/query.spec.js rename to packages/server/src/api/routes/tests/query.seq.spec.js diff --git a/packages/server/src/db/tests/linkController.spec.js b/packages/server/src/db/tests/linkController.spec.js index 919a104ad2..13f7b34381 100644 --- a/packages/server/src/db/tests/linkController.spec.js +++ b/packages/server/src/db/tests/linkController.spec.js @@ -10,6 +10,7 @@ describe("test the link controller", () => { let table1, table2, appId beforeEach(async () => { + config.modeCloud() const app = await config.init() appId = app.appId const { _id } = await config.createTable() diff --git a/packages/worker/src/tests/TestConfiguration.ts b/packages/worker/src/tests/TestConfiguration.ts index 11ec56c408..74fb2dd477 100644 --- a/packages/worker/src/tests/TestConfiguration.ts +++ b/packages/worker/src/tests/TestConfiguration.ts @@ -147,6 +147,7 @@ class TestConfiguration { await this.createSession(this.tenant1User!) }) } catch (e: any) { + console.log(e) throw new Error(e.message) } } From 6e12c3fa3caf5e2677abc3e6d03d0283de90257c Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Wed, 1 Feb 2023 08:20:46 +0000 Subject: [PATCH 356/387] Remove most traces of data-cy attributes --- .../bbui/src/ActionButton/ActionButton.svelte | 2 -- .../bbui/src/ActionMenu/ActionMenu.svelte | 3 +-- packages/bbui/src/Button/Button.svelte | 2 -- .../bbui/src/Form/Core/EnvDropdown.svelte | 2 -- packages/bbui/src/Form/Core/Switch.svelte | 2 -- packages/bbui/src/Form/Core/TextField.svelte | 2 -- packages/bbui/src/Form/EnvDropdown.svelte | 2 -- packages/bbui/src/Form/Input.svelte | 2 -- packages/bbui/src/Form/InputDropdown.svelte | 2 -- packages/bbui/src/Form/PickerDropdown.svelte | 2 -- packages/bbui/src/Form/Toggle.svelte | 3 +-- packages/bbui/src/Menu/Item.svelte | 2 -- packages/bbui/src/Modal/ModalContent.svelte | 3 +-- packages/bbui/src/Popover/Popover.svelte | 2 -- packages/bbui/src/SideNavigation/Item.svelte | 2 -- .../backend/DataTable/RowFieldControl.svelte | 19 +++---------------- .../DataTable/modals/CreateEditColumn.svelte | 6 +----- .../DataTable/modals/CreateEditUser.svelte | 1 - .../backend/DataTable/modals/EditRow.svelte | 2 +- .../modals/UpdateDatasourceModal.svelte | 1 - .../backend/TableNavigator/ListItem.svelte | 8 +------- .../modals/CreateTableModal.svelte | 1 - .../popovers/EditTablePopover.svelte | 6 +----- .../src/components/common/AppLockModal.svelte | 1 - .../components/common/ConfirmDialog.svelte | 2 -- .../src/components/common/DashCard.svelte | 3 +-- .../components/common/TemplateDisplay.svelte | 2 +- .../bindings/DrawerBindableCombobox.svelte | 6 +----- .../components/common/inputs/CopyInput.svelte | 3 +-- .../src/components/deploy/DeployModal.svelte | 14 ++------------ .../components/deploy/DeployNavigation.svelte | 3 --- .../src/components/deploy/RevertModal.svelte | 1 - .../settings/controls/DataSourceSelect.svelte | 6 +----- .../controls/IconSelect/IconSelect.svelte | 7 +------ .../settings/controls/PropertyControl.svelte | 8 ++------ .../portal/onboarding/TourPopover.svelte | 1 - .../components/settings/ProfileModal.svelte | 12 ++---------- .../src/components/start/AppRow.svelte | 6 +++--- .../app/[application]/data/_layout.svelte | 4 +--- .../[screenId]/_components/AppPreview.svelte | 2 +- .../new/_components/NewComponentPanel.svelte | 1 - .../_components/DatasourceModal.svelte | 2 +- .../screens/_components/NewScreenModal.svelte | 4 ++-- .../src/pages/builder/apps/index.svelte | 2 +- .../portal/_components/UserDropdown.svelte | 18 +++++------------- .../pages/builder/portal/apps/create.svelte | 14 ++------------ .../pages/builder/portal/apps/index.svelte | 15 ++------------- .../portal/overview/[appId]/_layout.svelte | 9 ++------- .../portal/overview/[appId]/overview.svelte | 11 +++-------- .../builder/portal/settings/auth/index.svelte | 5 ----- .../builder/portal/users/users/index.svelte | 7 +------ 51 files changed, 46 insertions(+), 200 deletions(-) diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte index cc4417be2a..bf962d6913 100644 --- a/packages/bbui/src/ActionButton/ActionButton.svelte +++ b/packages/bbui/src/ActionButton/ActionButton.svelte @@ -9,7 +9,6 @@ export let longPressable = false export let disabled = false export let icon = "" - export let dataCy = null export let size = "M" export let active = false export let fullWidth = false @@ -37,7 +36,6 @@
- + diff --git a/packages/bbui/src/Button/Button.svelte b/packages/bbui/src/Button/Button.svelte index b8ffe9f7e6..f8a6004f8f 100644 --- a/packages/bbui/src/Button/Button.svelte +++ b/packages/bbui/src/Button/Button.svelte @@ -13,7 +13,6 @@ export let icon = undefined export let active = false export let tooltip = undefined - export let dataCy export let newStyles = true export let id @@ -33,7 +32,6 @@ class:disabled class="spectrum-Button spectrum-Button--size{size.toUpperCase()}" {disabled} - data-cy={dataCy} on:click|preventDefault on:mouseover={() => (showTooltip = true)} on:focus={() => (showTooltip = true)} diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte index f40d6556e5..019026bf3b 100644 --- a/packages/bbui/src/Form/Core/EnvDropdown.svelte +++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte @@ -11,7 +11,6 @@ export let id = null export let readonly = false export let updateOnChange = true - export let dataCy export let align export let autofocus = false export let variables @@ -123,7 +122,6 @@ disabled={hbsValue.length || disabled} {readonly} {id} - data-cy={dataCy} value={hbsValue.length ? `{{ ${hbsValue[0]} }}` : value} placeholder={placeholder || ""} on:click diff --git a/packages/bbui/src/Form/Core/Switch.svelte b/packages/bbui/src/Form/Core/Switch.svelte index 9e45683382..ffbef6b27d 100644 --- a/packages/bbui/src/Form/Core/Switch.svelte +++ b/packages/bbui/src/Form/Core/Switch.svelte @@ -6,7 +6,6 @@ export let id = null export let text = null export let disabled = false - export let dataCy = null const dispatch = createEventDispatcher() const onChange = event => { @@ -16,7 +15,6 @@
{} export let getSecondaryOptionIcon = () => {} export let quiet = false - export let dataCy export let autofocus export let primaryOptions = [] export let secondaryOptions = [] @@ -98,7 +97,6 @@ { @@ -19,5 +18,5 @@ - + diff --git a/packages/bbui/src/Menu/Item.svelte b/packages/bbui/src/Menu/Item.svelte index dfe61c1736..ed759f5b10 100644 --- a/packages/bbui/src/Menu/Item.svelte +++ b/packages/bbui/src/Menu/Item.svelte @@ -5,7 +5,6 @@ const dispatch = createEventDispatcher() const actionMenu = getContext("actionMenu") - export let dataCy export let icon = undefined export let disabled = undefined export let noClose = false @@ -35,7 +34,6 @@